From 1af9ea9e2d1c20738b9ab43033696a14312c00b5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 15 Nov 2016 12:36:17 -0500 Subject: [PATCH 01/20] Post-release version bump --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index ccc94488b..bac839dd7 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -12,7 +12,7 @@ except ImportError: "the documentation.") -VERSION = '1.7.1' +VERSION = '1.7.2-dev' # Import local configuration for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: From cc79b1136b3b13ac3be351c4f52b98da17e6ffd8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 18 Nov 2016 09:49:04 -0500 Subject: [PATCH 02/20] Fixes #696: Corrected link to VRF in prefix and IP address breadcrumbs --- netbox/templates/ipam/inc/prefix_header.html | 2 +- netbox/templates/ipam/ipaddress.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/templates/ipam/inc/prefix_header.html b/netbox/templates/ipam/inc/prefix_header.html index 7dc7a35a1..105c41a0f 100644 --- a/netbox/templates/ipam/inc/prefix_header.html +++ b/netbox/templates/ipam/inc/prefix_header.html @@ -3,7 +3,7 @@
  1. Prefixes
    2. {% if prefix.vrf %} -
  2. {{ prefix.vrf }}
    3. +
  3. {{ prefix.vrf }}
    4. {% endif %}
  4. {{ prefix }}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index 2392e462b..3135b60be 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -9,7 +9,7 @@
  1. IP Addresses
    2. {% if ipaddress.vrf %} -
  2. {{ ipaddress.vrf }}
    3. +
  3. {{ ipaddress.vrf }}
    4. {% endif %}
  4. {{ ipaddress }}
From 8bff8bcbe2922a7cb6aeb7c9344c34d99563d08f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 29 Nov 2016 13:34:22 -0500 Subject: [PATCH 03/20] Fixes #702: Improved Unicode support for custom fields --- netbox/extras/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 609e878e9..f58a3205c 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -130,7 +130,7 @@ class CustomField(models.Model): if self.type == CF_TYPE_SELECT: # Could be ModelChoiceField or TypedChoiceField return str(value.id) if hasattr(value, 'id') else str(value) - return str(value) + return value def deserialize_value(self, serialized_value): """ From e31fae5ec5dfa8ba9305fc6501d8158f806c1295 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 29 Nov 2016 13:45:31 -0500 Subject: [PATCH 04/20] Fixes #712: Corrected export of tenants which are not assigned to a group --- netbox/templates/tenancy/tenant.html | 10 ++++++++-- netbox/templates/tenancy/tenant_import.html | 2 +- netbox/tenancy/models.py | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index c3e640de1..a1c9f0992 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -8,7 +8,9 @@
  1. Tenants
    2. -
  2. {{ tenant.group }}
    3. + {% if tenant.group %} +
  3. {{ tenant.group }}
    4. + {% endif %}
  4. {{ tenant }}
@@ -50,7 +52,11 @@ Group - {{ tenant.group }} + {% if tenant.group %} + {{ tenant.group }} + {% else %} + None + {% endif %} diff --git a/netbox/templates/tenancy/tenant_import.html b/netbox/templates/tenancy/tenant_import.html index ef76cacb1..eb0c62c99 100644 --- a/netbox/templates/tenancy/tenant_import.html +++ b/netbox/templates/tenancy/tenant_import.html @@ -40,7 +40,7 @@ Group - Tenant group + Tenant group (optional) Customers diff --git a/netbox/tenancy/models.py b/netbox/tenancy/models.py index 8c1bf5fa4..b80a40382 100644 --- a/netbox/tenancy/models.py +++ b/netbox/tenancy/models.py @@ -48,6 +48,6 @@ class Tenant(CreatedUpdatedModel, CustomFieldModel): return ','.join([ self.name, self.slug, - self.group.name, + self.group.name if self.group else '', self.description, ]) From 77ac79f32c24039d3d737145221204640483d94e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 29 Nov 2016 17:29:56 -0500 Subject: [PATCH 05/20] Fixes #713: Include a label for the comments field when editing circuits, providers, or racks in bulk --- netbox/circuits/forms.py | 4 ++-- netbox/dcim/forms.py | 2 +- netbox/utilities/forms.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 288f2255f..c66a8bc40 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -54,7 +54,7 @@ class ProviderBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): portal_url = forms.URLField(required=False, label='Portal') noc_contact = forms.CharField(required=False, widget=SmallTextarea, label='NOC contact') admin_contact = forms.CharField(required=False, widget=SmallTextarea, label='Admin contact') - comments = CommentField() + comments = CommentField(widget=SmallTextarea) class Meta: nullable_fields = ['asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments'] @@ -183,7 +183,7 @@ class CircuitBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False) port_speed = forms.IntegerField(required=False, label='Port speed (Kbps)') commit_rate = forms.IntegerField(required=False, label='Commit rate (Kbps)') - comments = CommentField() + comments = CommentField(widget=SmallTextarea) class Meta: nullable_fields = ['tenant', 'port_speed', 'commit_rate', 'comments'] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 44e30e964..fcda14fb5 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -221,7 +221,7 @@ class RackBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): type = forms.ChoiceField(choices=add_blank_choice(RACK_TYPE_CHOICES), required=False, label='Type') width = forms.ChoiceField(choices=add_blank_choice(RACK_WIDTH_CHOICES), required=False, label='Width') u_height = forms.IntegerField(required=False, label='Height (U)') - comments = CommentField() + comments = CommentField(widget=SmallTextarea) class Meta: nullable_fields = ['group', 'tenant', 'role', 'comments'] diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 74e0749db..7104e34c0 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -234,6 +234,7 @@ class CommentField(forms.CharField): A textarea with support for GitHub-Flavored Markdown. Exists mostly just to add a standard help_text. """ widget = forms.Textarea + default_label = 'Comments' # TODO: Port GFM syntax cheat sheet to internal documentation default_helptext = ' '\ ''\ @@ -241,8 +242,9 @@ class CommentField(forms.CharField): def __init__(self, *args, **kwargs): required = kwargs.pop('required', False) + label = kwargs.pop('label', self.default_label) help_text = kwargs.pop('help_text', self.default_helptext) - super(CommentField, self).__init__(required=required, help_text=help_text, *args, **kwargs) + super(CommentField, self).__init__(required=required, label=label, help_text=help_text, *args, **kwargs) class FlexibleModelChoiceField(forms.ModelChoiceField): From 9ea3383fdef0634d2e250b6d25746fe9e656d174 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 29 Nov 2016 17:33:22 -0500 Subject: [PATCH 06/20] #702: Fix lingering Unicode incompatibility --- netbox/extras/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index f58a3205c..a65e90834 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -165,7 +165,7 @@ class CustomFieldValue(models.Model): unique_together = ['field', 'obj_type', 'obj_id'] def __unicode__(self): - return '{} {}'.format(self.obj, self.field) + return u'{} {}'.format(self.obj, self.field) @property def value(self): From 9b8bae501b29ae238754afcdcbf8116186f33264 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 30 Nov 2016 11:19:28 -0500 Subject: [PATCH 07/20] Fixes #677: Add cffi as an explicit dependency to avoid setuptools error on Debian --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 40b0b707f..a7fef0b9b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +cffi>=1.8 cryptography==1.4 Django==1.10 django-debug-toolbar==1.4 From 2986840755e57f8412a1c21710c746c20e0c4512 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 30 Nov 2016 12:01:45 -0500 Subject: [PATCH 08/20] Specified syntax for code blocks --- docs/installation/docker.md | 8 ++++---- docs/installation/ldap.md | 6 +++--- docs/installation/netbox.md | 33 ++++++++++++++++----------------- docs/installation/postgresql.md | 12 ++++++------ docs/installation/upgrading.md | 12 ++++++------ docs/installation/web-server.md | 22 +++++++++++----------- 6 files changed, 46 insertions(+), 47 deletions(-) diff --git a/docs/installation/docker.md b/docs/installation/docker.md index efc9685a9..25f12fe7f 100644 --- a/docs/installation/docker.md +++ b/docs/installation/docker.md @@ -4,10 +4,10 @@ This guide demonstrates how to build and run NetBox as a Docker container. It as To get NetBox up and running: -``` -git clone -b master https://github.com/digitalocean/netbox.git -cd netbox -docker-compose up -d +```shell +# git clone -b master https://github.com/digitalocean/netbox.git +# cd netbox +# docker-compose up -d ``` The application will be available on http://localhost/ after a few minutes. diff --git a/docs/installation/ldap.md b/docs/installation/ldap.md index 5a90ec5e3..2389464e7 100644 --- a/docs/installation/ldap.md +++ b/docs/installation/ldap.md @@ -7,19 +7,19 @@ built-in Django users in the event of a failure. On Ubuntu: -``` +```shell sudo apt-get install -y python-dev libldap2-dev libsasl2-dev libssl-dev ``` On CentOS: -``` +```shell sudo yum install -y python-devel openldap-devel ``` ## Install django-auth-ldap -``` +```shell sudo pip install django-auth-ldap ``` diff --git a/docs/installation/netbox.md b/docs/installation/netbox.md index 042943cce..5040a27dc 100644 --- a/docs/installation/netbox.md +++ b/docs/installation/netbox.md @@ -8,7 +8,7 @@ **CentOS/RHEL** -``` +```shell # yum install -y epel-release # yum install -y gcc python2 python-devel python-pip libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel ``` @@ -19,7 +19,7 @@ You may opt to install NetBox either from a numbered release or by cloning the m Download the [latest stable release](https://github.com/digitalocean/netbox/releases) from GitHub as a tarball or ZIP archive and extract it to your desired path. In this example, we'll use `/opt/netbox`. -``` +```shell # wget https://github.com/digitalocean/netbox/archive/vX.Y.Z.tar.gz # tar -xzf vX.Y.Z.tar.gz -C /opt # cd /opt/ @@ -31,28 +31,27 @@ Download the [latest stable release](https://github.com/digitalocean/netbox/rele Create the base directory for the NetBox installation. For this guide, we'll use `/opt/netbox`. -``` -# mkdir -p /opt/netbox/ -# cd /opt/netbox/ +```shell +# mkdir -p /opt/netbox/ && cd /opt/netbox/ ``` If `git` is not already installed, install it: **Debian/Ubuntu** -``` +```shell # apt-get install -y git ``` **CentOS/RHEL** -``` +```shell # yum install -y git ``` Next, clone the **master** branch of the NetBox GitHub repository into the current directory: -``` +```shell # git clone -b master https://github.com/digitalocean/netbox.git . Cloning into '.'... remote: Counting objects: 1994, done. @@ -67,7 +66,7 @@ Checking connectivity... done. Install the required Python packages using pip. (If you encounter any compilation errors during this step, ensure that you've installed all of the system dependencies listed above.) -``` +```shell # pip install -r requirements.txt ``` @@ -75,7 +74,7 @@ Install the required Python packages using pip. (If you encounter any compilatio Move into the NetBox configuration directory and make a copy of `configuration.example.py` named `configuration.py`. -``` +```shell # cd netbox/netbox/ # cp configuration.example.py configuration.py ``` @@ -92,7 +91,7 @@ This is a list of the valid hostnames by which this server can be reached. You m Example: -``` +```python ALLOWED_HOSTS = ['netbox.example.com', '192.0.2.123'] ``` @@ -102,7 +101,7 @@ This parameter holds the database configuration details. You must define the use Example: -``` +```python DATABASE = { 'NAME': 'netbox', # Database name 'USER': 'netbox', # PostgreSQL username @@ -125,7 +124,7 @@ You may use the script located at `netbox/generate_secret_key.py` to generate a Before NetBox can run, we need to install the database schema. This is done by running `./manage.py migrate` from the `netbox` directory (`/opt/netbox/netbox/` in our example): -``` +```shell # cd /opt/netbox/netbox/ # ./manage.py migrate Operations to perform: @@ -144,7 +143,7 @@ If this step results in a PostgreSQL authentication error, ensure that the usern NetBox does not come with any predefined user accounts. You'll need to create a super user to be able to log into NetBox: -``` +```shell # ./manage.py createsuperuser Username: admin Email address: admin@example.com @@ -155,7 +154,7 @@ Superuser created successfully. # Collect Static Files -``` +```shell # ./manage.py collectstatic You have requested to collect static files at the destination @@ -176,7 +175,7 @@ NetBox ships with some initial data to help you get started: RIR definitions, co !!! note This step is optional. It's perfectly fine to start using NetBox without using this initial data if you'd rather create everything from scratch. -``` +```shell # ./manage.py loaddata initial_data Installed 43 object(s) from 4 fixture(s) ``` @@ -185,7 +184,7 @@ Installed 43 object(s) from 4 fixture(s) At this point, NetBox should be able to run. We can verify this by starting a development instance: -``` +```shell # ./manage.py runserver 0.0.0.0:8000 --insecure Performing system checks... diff --git a/docs/installation/postgresql.md b/docs/installation/postgresql.md index a4c898bad..71b62c7cc 100644 --- a/docs/installation/postgresql.md +++ b/docs/installation/postgresql.md @@ -4,27 +4,27 @@ NetBox requires a PostgreSQL database to store data. MySQL is not supported, as **Debian/Ubuntu** -``` +```shell # apt-get install -y postgresql libpq-dev python-psycopg2 ``` **CentOS/RHEL** -``` +```shell # yum install -y postgresql postgresql-server postgresql-devel python-psycopg2 # postgresql-setup initdb ``` If using CentOS, modify the PostgreSQL configuration to accept password-based authentication by replacing `ident` with `md5` for all host entries within `/var/lib/pgsql/data/pg_hba.conf`. For example: -``` +```text host all all 127.0.0.1/32 md5 host all all ::1/128 md5 ``` Then, start the service: -``` +```shell # systemctl start postgresql ``` @@ -35,7 +35,7 @@ At a minimum, we need to create a database for NetBox and assign it a username a !!! danger DO NOT USE THE PASSWORD FROM THE EXAMPLE. -``` +```shell # sudo -u postgres psql psql (9.3.13) Type "help" for help. @@ -51,7 +51,7 @@ postgres=# \q You can verify that authentication works issuing the following command and providing the configured password: -``` +```shell # psql -U netbox -h localhost -W ``` diff --git a/docs/installation/upgrading.md b/docs/installation/upgrading.md index 303915dc7..0d28b4eb2 100644 --- a/docs/installation/upgrading.md +++ b/docs/installation/upgrading.md @@ -8,7 +8,7 @@ Download the [latest stable release](https://github.com/digitalocean/netbox/rele Download and extract the latest version: -``` +```shell # wget https://github.com/digitalocean/netbox/archive/vX.Y.Z.tar.gz # tar -xzf vX.Y.Z.tar.gz -C /opt # cd /opt/ @@ -17,13 +17,13 @@ Download and extract the latest version: Copy the 'configuration.py' you created when first installing to the new version: -``` +```shell # cp /opt/netbox-X.Y.Z/netbox/netbox/configuration.py /opt/netbox/netbox/netbox/configuration.py ``` If you followed the original installation guide to set up gunicorn, be sure to copy its configuration as well: -``` +```shell # cp /opt/netbox-X.Y.Z/gunicorn_config.py /opt/netbox/gunicorn_config.py ``` @@ -31,7 +31,7 @@ If you followed the original installation guide to set up gunicorn, be sure to c This guide assumes that NetBox is installed at `/opt/netbox`. Pull down the most recent iteration of the master branch: -``` +```shell # cd /opt/netbox # git checkout master # git pull origin master @@ -42,7 +42,7 @@ This guide assumes that NetBox is installed at `/opt/netbox`. Pull down the most Once the new code is in place, run the upgrade script (which may need to be run as root depending on how your environment is configured). -``` +```shell # ./upgrade.sh ``` @@ -56,6 +56,6 @@ This script: Finally, restart the WSGI service to run the new code. If you followed this guide for the initial installation, this is done using `supervisorctl`: -``` +```shell # sudo supervisorctl restart netbox ``` diff --git a/docs/installation/web-server.md b/docs/installation/web-server.md index 559928888..35a5e8c5d 100644 --- a/docs/installation/web-server.md +++ b/docs/installation/web-server.md @@ -5,7 +5,7 @@ We'll set up a simple WSGI front end using [gunicorn](http://gunicorn.org/) for !!! info Only Debian/Ubuntu instructions are provided here, but the installation process for CentOS/RHEL does not differ much. Please consult the documentation for those distributions for details. -``` +```shell # apt-get install -y gunicorn supervisor ``` @@ -13,13 +13,13 @@ We'll set up a simple WSGI front end using [gunicorn](http://gunicorn.org/) for The following will serve as a minimal nginx configuration. Be sure to modify your server name and installation path appropriately. -``` +```shell # apt-get install -y nginx ``` Once nginx is installed, save the following configuration to `/etc/nginx/sites-available/netbox`. Be sure to replace `netbox.example.com` with the domain name or IP address of your installation. (This should match the value configured for `ALLOWED_HOSTS` in `configuration.py`.) -``` +```nginx server { listen 80; @@ -43,7 +43,7 @@ server { Then, delete `/etc/nginx/sites-enabled/default` and create a symlink in the `sites-enabled` directory to the configuration file you just created. -``` +```shell # cd /etc/nginx/sites-enabled/ # rm default # ln -s /etc/nginx/sites-available/netbox @@ -51,7 +51,7 @@ Then, delete `/etc/nginx/sites-enabled/default` and create a symlink in the `sit Restart the nginx service to use the new configuration. -``` +```shell # service nginx restart ``` @@ -59,13 +59,13 @@ To enable SSL, consider this guide on [securing nginx with Let's Encrypt](https: ## Option B: Apache -``` +```shell # apt-get install -y apache2 ``` Once Apache is installed, proceed with the following configuration (Be sure to modify the `ServerName` appropriately): -``` +```apache ProxyPreserveHost On @@ -90,7 +90,7 @@ Once Apache is installed, proceed with the following configuration (Be sure to m Save the contents of the above example in `/etc/apache2/sites-available/netbox.conf`, enable the `proxy` and `proxy_http` modules, and reload Apache: -``` +```shell # a2enmod proxy # a2enmod proxy_http # a2ensite netbox @@ -103,7 +103,7 @@ To enable SSL, consider this guide on [securing Apache with Let's Encrypt](https Save the following configuration file in the root netbox installation path (in this example, `/opt/netbox/`) as `gunicorn_config.py`. Be sure to verify the location of the gunicorn executable (e.g. `which gunicorn`) and to update the `pythonpath` variable if needed. If using CentOS/RHEL change the username from `www-data` to `nginx` or `apache`. -``` +```text command = '/usr/bin/gunicorn' pythonpath = '/opt/netbox/netbox' bind = '127.0.0.1:8001' @@ -115,7 +115,7 @@ user = 'www-data' Save the following as `/etc/supervisor/conf.d/netbox.conf`. Update the `command` and `directory` paths as needed. -``` +```text [program:netbox] command = gunicorn -c /opt/netbox/gunicorn_config.py netbox.wsgi directory = /opt/netbox/netbox/ @@ -124,7 +124,7 @@ user = www-data Then, restart the supervisor service to detect and run the gunicorn service: -``` +```shell # service supervisor restart ``` From d960481adb5232b63122dcdcddbdb5a7b576af4d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 30 Nov 2016 12:07:51 -0500 Subject: [PATCH 09/20] Ditched syntax highlighting for shell commands --- docs/installation/docker.md | 2 +- docs/installation/ldap.md | 6 +++--- docs/installation/netbox.md | 26 +++++++++++++------------- docs/installation/postgresql.md | 12 ++++++------ docs/installation/upgrading.md | 12 ++++++------ docs/installation/web-server.md | 18 +++++++++--------- 6 files changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/installation/docker.md b/docs/installation/docker.md index 25f12fe7f..00551a096 100644 --- a/docs/installation/docker.md +++ b/docs/installation/docker.md @@ -4,7 +4,7 @@ This guide demonstrates how to build and run NetBox as a Docker container. It as To get NetBox up and running: -```shell +```no-highlight # git clone -b master https://github.com/digitalocean/netbox.git # cd netbox # docker-compose up -d diff --git a/docs/installation/ldap.md b/docs/installation/ldap.md index 2389464e7..6a4994a5c 100644 --- a/docs/installation/ldap.md +++ b/docs/installation/ldap.md @@ -7,19 +7,19 @@ built-in Django users in the event of a failure. On Ubuntu: -```shell +```no-highlight sudo apt-get install -y python-dev libldap2-dev libsasl2-dev libssl-dev ``` On CentOS: -```shell +```no-highlight sudo yum install -y python-devel openldap-devel ``` ## Install django-auth-ldap -```shell +```no-highlight sudo pip install django-auth-ldap ``` diff --git a/docs/installation/netbox.md b/docs/installation/netbox.md index 5040a27dc..bb2297d96 100644 --- a/docs/installation/netbox.md +++ b/docs/installation/netbox.md @@ -8,7 +8,7 @@ **CentOS/RHEL** -```shell +```no-highlight # yum install -y epel-release # yum install -y gcc python2 python-devel python-pip libxml2-devel libxslt-devel libffi-devel graphviz openssl-devel ``` @@ -19,7 +19,7 @@ You may opt to install NetBox either from a numbered release or by cloning the m Download the [latest stable release](https://github.com/digitalocean/netbox/releases) from GitHub as a tarball or ZIP archive and extract it to your desired path. In this example, we'll use `/opt/netbox`. -```shell +```no-highlight # wget https://github.com/digitalocean/netbox/archive/vX.Y.Z.tar.gz # tar -xzf vX.Y.Z.tar.gz -C /opt # cd /opt/ @@ -31,7 +31,7 @@ Download the [latest stable release](https://github.com/digitalocean/netbox/rele Create the base directory for the NetBox installation. For this guide, we'll use `/opt/netbox`. -```shell +```no-highlight # mkdir -p /opt/netbox/ && cd /opt/netbox/ ``` @@ -39,19 +39,19 @@ If `git` is not already installed, install it: **Debian/Ubuntu** -```shell +```no-highlight # apt-get install -y git ``` **CentOS/RHEL** -```shell +```no-highlight # yum install -y git ``` Next, clone the **master** branch of the NetBox GitHub repository into the current directory: -```shell +```no-highlight # git clone -b master https://github.com/digitalocean/netbox.git . Cloning into '.'... remote: Counting objects: 1994, done. @@ -66,7 +66,7 @@ Checking connectivity... done. Install the required Python packages using pip. (If you encounter any compilation errors during this step, ensure that you've installed all of the system dependencies listed above.) -```shell +```no-highlight # pip install -r requirements.txt ``` @@ -74,7 +74,7 @@ Install the required Python packages using pip. (If you encounter any compilatio Move into the NetBox configuration directory and make a copy of `configuration.example.py` named `configuration.py`. -```shell +```no-highlight # cd netbox/netbox/ # cp configuration.example.py configuration.py ``` @@ -124,7 +124,7 @@ You may use the script located at `netbox/generate_secret_key.py` to generate a Before NetBox can run, we need to install the database schema. This is done by running `./manage.py migrate` from the `netbox` directory (`/opt/netbox/netbox/` in our example): -```shell +```no-highlight # cd /opt/netbox/netbox/ # ./manage.py migrate Operations to perform: @@ -143,7 +143,7 @@ If this step results in a PostgreSQL authentication error, ensure that the usern NetBox does not come with any predefined user accounts. You'll need to create a super user to be able to log into NetBox: -```shell +```no-highlight # ./manage.py createsuperuser Username: admin Email address: admin@example.com @@ -154,7 +154,7 @@ Superuser created successfully. # Collect Static Files -```shell +```no-highlight # ./manage.py collectstatic You have requested to collect static files at the destination @@ -175,7 +175,7 @@ NetBox ships with some initial data to help you get started: RIR definitions, co !!! note This step is optional. It's perfectly fine to start using NetBox without using this initial data if you'd rather create everything from scratch. -```shell +```no-highlight # ./manage.py loaddata initial_data Installed 43 object(s) from 4 fixture(s) ``` @@ -184,7 +184,7 @@ Installed 43 object(s) from 4 fixture(s) At this point, NetBox should be able to run. We can verify this by starting a development instance: -```shell +```no-highlight # ./manage.py runserver 0.0.0.0:8000 --insecure Performing system checks... diff --git a/docs/installation/postgresql.md b/docs/installation/postgresql.md index 71b62c7cc..e1d9a49ea 100644 --- a/docs/installation/postgresql.md +++ b/docs/installation/postgresql.md @@ -4,27 +4,27 @@ NetBox requires a PostgreSQL database to store data. MySQL is not supported, as **Debian/Ubuntu** -```shell +```no-highlight # apt-get install -y postgresql libpq-dev python-psycopg2 ``` **CentOS/RHEL** -```shell +```no-highlight # yum install -y postgresql postgresql-server postgresql-devel python-psycopg2 # postgresql-setup initdb ``` If using CentOS, modify the PostgreSQL configuration to accept password-based authentication by replacing `ident` with `md5` for all host entries within `/var/lib/pgsql/data/pg_hba.conf`. For example: -```text +```no-highlight host all all 127.0.0.1/32 md5 host all all ::1/128 md5 ``` Then, start the service: -```shell +```no-highlight # systemctl start postgresql ``` @@ -35,7 +35,7 @@ At a minimum, we need to create a database for NetBox and assign it a username a !!! danger DO NOT USE THE PASSWORD FROM THE EXAMPLE. -```shell +```no-highlight # sudo -u postgres psql psql (9.3.13) Type "help" for help. @@ -51,7 +51,7 @@ postgres=# \q You can verify that authentication works issuing the following command and providing the configured password: -```shell +```no-highlight # psql -U netbox -h localhost -W ``` diff --git a/docs/installation/upgrading.md b/docs/installation/upgrading.md index 0d28b4eb2..afb36f464 100644 --- a/docs/installation/upgrading.md +++ b/docs/installation/upgrading.md @@ -8,7 +8,7 @@ Download the [latest stable release](https://github.com/digitalocean/netbox/rele Download and extract the latest version: -```shell +```no-highlight # wget https://github.com/digitalocean/netbox/archive/vX.Y.Z.tar.gz # tar -xzf vX.Y.Z.tar.gz -C /opt # cd /opt/ @@ -17,13 +17,13 @@ Download and extract the latest version: Copy the 'configuration.py' you created when first installing to the new version: -```shell +```no-highlight # cp /opt/netbox-X.Y.Z/netbox/netbox/configuration.py /opt/netbox/netbox/netbox/configuration.py ``` If you followed the original installation guide to set up gunicorn, be sure to copy its configuration as well: -```shell +```no-highlight # cp /opt/netbox-X.Y.Z/gunicorn_config.py /opt/netbox/gunicorn_config.py ``` @@ -31,7 +31,7 @@ If you followed the original installation guide to set up gunicorn, be sure to c This guide assumes that NetBox is installed at `/opt/netbox`. Pull down the most recent iteration of the master branch: -```shell +```no-highlight # cd /opt/netbox # git checkout master # git pull origin master @@ -42,7 +42,7 @@ This guide assumes that NetBox is installed at `/opt/netbox`. Pull down the most Once the new code is in place, run the upgrade script (which may need to be run as root depending on how your environment is configured). -```shell +```no-highlight # ./upgrade.sh ``` @@ -56,6 +56,6 @@ This script: Finally, restart the WSGI service to run the new code. If you followed this guide for the initial installation, this is done using `supervisorctl`: -```shell +```no-highlight # sudo supervisorctl restart netbox ``` diff --git a/docs/installation/web-server.md b/docs/installation/web-server.md index 35a5e8c5d..10cc4992f 100644 --- a/docs/installation/web-server.md +++ b/docs/installation/web-server.md @@ -5,7 +5,7 @@ We'll set up a simple WSGI front end using [gunicorn](http://gunicorn.org/) for !!! info Only Debian/Ubuntu instructions are provided here, but the installation process for CentOS/RHEL does not differ much. Please consult the documentation for those distributions for details. -```shell +```no-highlight # apt-get install -y gunicorn supervisor ``` @@ -13,7 +13,7 @@ We'll set up a simple WSGI front end using [gunicorn](http://gunicorn.org/) for The following will serve as a minimal nginx configuration. Be sure to modify your server name and installation path appropriately. -```shell +```no-highlight # apt-get install -y nginx ``` @@ -43,7 +43,7 @@ server { Then, delete `/etc/nginx/sites-enabled/default` and create a symlink in the `sites-enabled` directory to the configuration file you just created. -```shell +```no-highlight # cd /etc/nginx/sites-enabled/ # rm default # ln -s /etc/nginx/sites-available/netbox @@ -51,7 +51,7 @@ Then, delete `/etc/nginx/sites-enabled/default` and create a symlink in the `sit Restart the nginx service to use the new configuration. -```shell +```no-highlight # service nginx restart ``` @@ -59,7 +59,7 @@ To enable SSL, consider this guide on [securing nginx with Let's Encrypt](https: ## Option B: Apache -```shell +```no-highlight # apt-get install -y apache2 ``` @@ -90,7 +90,7 @@ Once Apache is installed, proceed with the following configuration (Be sure to m Save the contents of the above example in `/etc/apache2/sites-available/netbox.conf`, enable the `proxy` and `proxy_http` modules, and reload Apache: -```shell +```no-highlight # a2enmod proxy # a2enmod proxy_http # a2ensite netbox @@ -103,7 +103,7 @@ To enable SSL, consider this guide on [securing Apache with Let's Encrypt](https Save the following configuration file in the root netbox installation path (in this example, `/opt/netbox/`) as `gunicorn_config.py`. Be sure to verify the location of the gunicorn executable (e.g. `which gunicorn`) and to update the `pythonpath` variable if needed. If using CentOS/RHEL change the username from `www-data` to `nginx` or `apache`. -```text +```no-highlight command = '/usr/bin/gunicorn' pythonpath = '/opt/netbox/netbox' bind = '127.0.0.1:8001' @@ -115,7 +115,7 @@ user = 'www-data' Save the following as `/etc/supervisor/conf.d/netbox.conf`. Update the `command` and `directory` paths as needed. -```text +```no-highlight [program:netbox] command = gunicorn -c /opt/netbox/gunicorn_config.py netbox.wsgi directory = /opt/netbox/netbox/ @@ -124,7 +124,7 @@ user = www-data Then, restart the supervisor service to detect and run the gunicorn service: -```shell +```no-highlight # service supervisor restart ``` From b275009544be0c5b61255487f8131122b9c483d8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 30 Nov 2016 12:10:46 -0500 Subject: [PATCH 10/20] Fixed missing on command block --- docs/installation/netbox.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/netbox.md b/docs/installation/netbox.md index bb2297d96..5b673e845 100644 --- a/docs/installation/netbox.md +++ b/docs/installation/netbox.md @@ -2,7 +2,7 @@ **Debian/Ubuntu** -``` +```no-highlight # apt-get install -y python2.7 python-dev python-pip libxml2-dev libxslt1-dev libffi-dev graphviz libpq-dev libssl-dev ``` From dc88cb5ac790c9d28ec42e32e4d0bfe4c521279e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Dec 2016 14:54:20 -0500 Subject: [PATCH 11/20] Fixes #718: Restore is_primary field on IP assignment form --- netbox/templates/dcim/ipaddress_assign.html | 3 ++- netbox/templates/ipam/ipaddress_assign.html | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/netbox/templates/dcim/ipaddress_assign.html b/netbox/templates/dcim/ipaddress_assign.html index 538023d08..533317baf 100644 --- a/netbox/templates/dcim/ipaddress_assign.html +++ b/netbox/templates/dcim/ipaddress_assign.html @@ -1,7 +1,7 @@ {% extends '_base.html' %} {% load form_helpers %} -{% block title %}Assign an IP Address{% endblock %} +{% block title %}Assign a New IP Address{% endblock %} {% block content %}
@@ -40,6 +40,7 @@ {% render_field form.interface %} + {% render_field form.set_as_primary %}
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html index 4143dc3ee..10a582a2f 100644 --- a/netbox/templates/ipam/ipaddress_assign.html +++ b/netbox/templates/ipam/ipaddress_assign.html @@ -2,7 +2,7 @@ {% load static from staticfiles %} {% load form_helpers %} -{% block title %}Assign IP Address{% endblock %} +{% block title %}Assign an IP Address{% endblock %} {% block content %} @@ -19,9 +19,25 @@ {% endif %}
- Assign IP Address {{ ipaddress }} ({% if ipaddress.vrf %}VRF {{ ipaddress.vrf }}{% else %}Global Table{% endif %}) + Assign an IP Address
+
+ +
+

{{ ipaddress }}

+
+ +
+

+ {% if ipaddress.vrf %} + {{ ipaddress.vrf }} ({{ ipaddress.vrf.rd }}) + {% else %} + Global + {% endif %} +

+
+
  • Select
    • From 05debf7e409df2b1a0bbbdfccc1c04506343ed99 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Dec 2016 15:16:04 -0500 Subject: [PATCH 12/20] Updated CONTRIBUTING to discourage the use of "+1" comments on issues --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 046f6cd79..85119102b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,8 +43,9 @@ take some time for someone to address your issue. * First, check the GitHub [issues list](https://github.com/digitalocean/netbox/issues) to see if the feature you're requesting is already listed. (Be sure to search closed issues as well, since some feature requests are rejected.) If the feature you'd like to see has already been requested, click "add a reaction" in the top right corner of the issue -and add a thumbs up (+1). This ensures that the issue has a better chance of making it onto the roadmap. Also feel free -to add a comment with any additional justification for the feature. +and add a thumbs up. This ensures that the issue has a better chance of making it onto the roadmap. Also feel free +to add a comment with any additional justification for the feature. (However, note that comments with no substance +other than a "+1" will be deleted as spam. Please use GitHub's reactions feature to indicate your support.) * While suggestions for new features are welcome, it's important to limit the scope of NetBox's feature set to avoid feature creep. For example, the following features would be firmly out of scope for NetBox: From 7d6d7942d91ab7e7060e60c016bc49dbeb735ed9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Dec 2016 16:09:07 -0500 Subject: [PATCH 13/20] Rewrote get_connected_interface() to return first connection if more than one exist (erroneously) --- netbox/dcim/models.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 93cdb95d5..01b373376 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -1173,16 +1173,13 @@ class Interface(models.Model): return None def get_connected_interface(self): - try: - connection = InterfaceConnection.objects.select_related().get(Q(interface_a=self) | Q(interface_b=self)) - if connection.interface_a == self: - return connection.interface_b - else: - return connection.interface_a - except InterfaceConnection.DoesNotExist: - return None - except InterfaceConnection.MultipleObjectsReturned: - raise MultipleObjectsReturned("Multiple connections found for {} interface {}!".format(self.device, self)) + connection = InterfaceConnection.objects.select_related().filter(Q(interface_a=self) | Q(interface_b=self))\ + .first() + if connection and connection.interface_a == self: + return connection.interface_b + elif connection: + return connection.interface_a + return None class InterfaceConnection(models.Model): From 300ee820fa4acafdf566282f3c4934c6837325fc Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 5 Dec 2016 18:11:07 -0500 Subject: [PATCH 14/20] #672: Cleaned up rack elevation CSS --- netbox/project-static/css/base.css | 97 +++++++----------- netbox/project-static/img/tint_20.png | Bin 0 -> 109 bytes .../templates/dcim/inc/_rack_elevation.html | 9 +- 3 files changed, 38 insertions(+), 68 deletions(-) create mode 100644 netbox/project-static/img/tint_20.png diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 635aa7e94..2be592053 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -98,7 +98,7 @@ nav ul.pagination { div.rack_header { margin-left: 36px; text-align: center; - width: 200px; + width: 230px; } ul.rack_legend { float: left; @@ -126,29 +126,16 @@ ul.rack { list-style-type: none; padding: 0; position: absolute; - width: 200px; + width: 230px; } ul.rack li { + border-top: 1px solid #e0e0e0; display: block; font-size: 13px; height: 20px; overflow: hidden; text-align: center; } -ul.rack_empty li { - background-color: #f7f7f7; - border-bottom: 1px solid #dddddd; - height: 20px; -} -ul.rack li.empty:last-child { - border-bottom: 0; -} -ul.rack_far_face { - z-index: 100; -} -ul.rack_near_face { - z-index: 200; -} ul.rack li.h2u { height: 40px; } ul.rack li.h2u a, ul.rack li.h2u span { padding: 10px 0; } ul.rack li.h3u { height: 60px; } @@ -247,22 +234,9 @@ ul.rack li.h49u { height: 980px; } ul.rack li.h49u a, ul.rack li.h49u span { padding: 480px 0; } ul.rack li.h50u { height: 1000px; } ul.rack li.h50u a, ul.rack li.h50u span { padding: 490px 0; } -ul.rack li.occupied a { - color: #ffffff; - display: block; - font-weight: bold; -} -ul.rack li.occupied a:hover { - text-decoration: none; -} -ul.rack li.occupied span { - display: block; -} -ul.rack_near_face li.empty { - border-bottom: 1px solid #e0e0e0; -} -ul.rack_near_face li.occupied { - color: #474747; +ul.rack_far_face { + background-color: #f7f7f7; + z-index: 100; } ul.rack_far_face li.occupied { background: repeating-linear-gradient( @@ -272,7 +246,6 @@ ul.rack_far_face li.occupied { #f0f0f0 7px, #f0f0f0 14px ); - color: #303030; } ul.rack_far_face li.blocked { background: repeating-linear-gradient( @@ -282,20 +255,46 @@ ul.rack_far_face li.blocked { #ffc7c7 7px, #ffc7c7 14px ); - border-bottom: 1px solid #e0e0e0; - color: #303030; } -ul.rack_near_face li.empty a { +ul.rack_near_face { + z-index: 200; +} +ul.rack_near_face li.occupied { + border-top: 1px solid #474747; + color: #474747; +} +ul.rack_near_face li.occupied:hover { + background-image: url('../img/tint_20.png'); +} +ul.rack_near_face li:first-child { + border-top: 0; +} +ul.rack_near_face li.available a { color: #0000ff; display: none; text-decoration: none; } -ul.rack_near_face li.empty:hover { +ul.rack_near_face li.available:hover { background-color: #ffffff; } -ul.rack_near_face li.empty:hover a { +ul.rack_near_face li.available:hover a { display: block; } +ul.rack li.occupied a { + color: #ffffff; + display: block; + font-weight: bold; +} +ul.rack li.occupied a:hover { + text-decoration: none; +} +ul.rack li.occupied span { + cursor: default; + display: block; +} +li.occupied + li.available { + border-top: 1px solid #474747; +} /* Colors (from http://flatuicolors.com) */ .teal { background-color: #1abc9c; } @@ -309,28 +308,6 @@ ul.rack_near_face li.empty:hover a { .medium_gray { background-color: #95a5a6; } .dark_gray { background-color: #34495e; } -/* Rack elevation coloring */ -ul.rack .teal { border-bottom: 1px solid #16a085; } -ul.rack .teal:hover { background-color: #16a085; } -ul.rack .green { border-bottom: 1px solid #27ae60; } -ul.rack .green:hover { background-color: #27ae60; } -ul.rack .blue { border-bottom: 1px solid #2980b9; } -ul.rack .blue:hover { background-color: #2980b9; } -ul.rack .purple { border-bottom: 1px solid #8e44ad; } -ul.rack .purple:hover { background-color: #8e44ad; } -ul.rack .yellow { border-bottom: 1px solid #f39c12; } -ul.rack .yellow:hover { background-color: #f39c12; } -ul.rack .orange { border-bottom: 1px solid #d35400; } -ul.rack .orange:hover { background-color: #d35400; } -ul.rack .red { border-bottom: 1px solid #c0392b; } -ul.rack .red:hover { background-color: #c0392b; } -ul.rack .light_gray { border-bottom: 1px solid #bdc3c7; } -ul.rack .light_gray:hover { background-color: #bdc3c7; } -ul.rack .medium_gray { border-bottom: 1px solid #7f8c8d; } -ul.rack .medium_gray:hover { background-color: #7f8c8d; } -ul.rack .dark_gray { border-bottom: 1px solid #2c3e50; } -ul.rack .dark_gray:hover { background-color: #2c3e50; } - /* Misc */ .banner-bottom { margin-bottom: 50px; diff --git a/netbox/project-static/img/tint_20.png b/netbox/project-static/img/tint_20.png new file mode 100644 index 0000000000000000000000000000000000000000..a03a1f9ac099d444c5e4bd1e5965197bb02d4a9e GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWT1$Wr;B5V z#p&dfgam`M1xg7?3ydU83$7dpWOnD3F)dgj!NG9sF+=put|?c6su?_8{an^LB{Ts5 DV#^)` literal 0 HcmV?d00001 diff --git a/netbox/templates/dcim/inc/_rack_elevation.html b/netbox/templates/dcim/inc/_rack_elevation.html index 1313df8ea..368092166 100644 --- a/netbox/templates/dcim/inc/_rack_elevation.html +++ b/netbox/templates/dcim/inc/_rack_elevation.html @@ -6,13 +6,6 @@
    - -
      - {% for u in rack.units %} -
    • - {% endfor %} -
    -
      {% for u in secondary_face %} @@ -42,7 +35,7 @@ {% endifequal %} {% else %} -
    • +
    • {% if perms.dcim.add_device %} add device {% endif %} From eb4cd0e72306f340e79a4763100706a4d51d4aa9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2016 12:28:29 -0500 Subject: [PATCH 15/20] Fixes #672: Expanded color selection for rack and device roles --- netbox/dcim/fixtures/initial_data.json | 18 +++--- .../migrations/0022_color_names_to_rgb.py | 57 +++++++++++++++++++ netbox/dcim/models.py | 31 ++-------- netbox/dcim/tables.py | 6 +- netbox/project-static/css/base.css | 12 ---- netbox/utilities/fields.py | 19 +++++++ netbox/utilities/forms.py | 47 +++++++++++++++ 7 files changed, 139 insertions(+), 51 deletions(-) create mode 100644 netbox/dcim/migrations/0022_color_names_to_rgb.py diff --git a/netbox/dcim/fixtures/initial_data.json b/netbox/dcim/fixtures/initial_data.json index a26cbfcc5..e765de227 100644 --- a/netbox/dcim/fixtures/initial_data.json +++ b/netbox/dcim/fixtures/initial_data.json @@ -5,7 +5,7 @@ "fields": { "name": "Console Server", "slug": "console-server", - "color": "teal" + "color": "009688" } }, { @@ -14,7 +14,7 @@ "fields": { "name": "Core Switch", "slug": "core-switch", - "color": "blue" + "color": "2196f3" } }, { @@ -23,7 +23,7 @@ "fields": { "name": "Distribution Switch", "slug": "distribution-switch", - "color": "blue" + "color": "2196f3" } }, { @@ -32,7 +32,7 @@ "fields": { "name": "Access Switch", "slug": "access-switch", - "color": "blue" + "color": "2196f3" } }, { @@ -41,7 +41,7 @@ "fields": { "name": "Management Switch", "slug": "management-switch", - "color": "orange" + "color": "ff9800" } }, { @@ -50,7 +50,7 @@ "fields": { "name": "Firewall", "slug": "firewall", - "color": "red" + "color": "f44336" } }, { @@ -59,7 +59,7 @@ "fields": { "name": "Router", "slug": "router", - "color": "purple" + "color": "9c27b0" } }, { @@ -68,7 +68,7 @@ "fields": { "name": "Server", "slug": "server", - "color": "medium_gray" + "color": "9e9e9e" } }, { @@ -77,7 +77,7 @@ "fields": { "name": "PDU", "slug": "pdu", - "color": "dark_gray" + "color": "607d8b" } }, { diff --git a/netbox/dcim/migrations/0022_color_names_to_rgb.py b/netbox/dcim/migrations/0022_color_names_to_rgb.py new file mode 100644 index 000000000..97e5de9ca --- /dev/null +++ b/netbox/dcim/migrations/0022_color_names_to_rgb.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-06 16:35 +from __future__ import unicode_literals + +from django.db import migrations +import utilities.fields + + +COLOR_CONVERSION = { + 'teal': '009688', + 'green': '4caf50', + 'blue': '2196f3', + 'purple': '9c27b0', + 'yellow': 'ffeb3b', + 'orange': 'ff9800', + 'red': 'f44336', + 'light_gray': 'c0c0c0', + 'medium_gray': '9e9e9e', + 'dark_gray': '607d8b', +} + + +def color_names_to_rgb(apps, schema_editor): + RackRole = apps.get_model('dcim', 'RackRole') + DeviceRole = apps.get_model('dcim', 'DeviceRole') + for color_name, color_rgb in COLOR_CONVERSION.items(): + RackRole.objects.filter(color=color_name).update(color=color_rgb) + DeviceRole.objects.filter(color=color_name).update(color=color_rgb) + + +def color_rgb_to_name(apps, schema_editor): + RackRole = apps.get_model('dcim', 'RackRole') + DeviceRole = apps.get_model('dcim', 'DeviceRole') + for color_name, color_rgb in COLOR_CONVERSION.items(): + RackRole.objects.filter(color=color_rgb).update(color=color_name) + DeviceRole.objects.filter(color=color_rgb).update(color=color_name) + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0021_add_ff_flexstack'), + ] + + operations = [ + migrations.RunPython(color_names_to_rgb, color_rgb_to_name), + migrations.AlterField( + model_name='devicerole', + name='color', + field=utilities.fields.ColorField(max_length=6), + ), + migrations.AlterField( + model_name='rackrole', + name='color', + field=utilities.fields.ColorField(max_length=6), + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 01b373376..e8967b0c0 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -3,7 +3,7 @@ from collections import OrderedDict from django.conf import settings from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.fields import GenericRelation -from django.core.exceptions import MultipleObjectsReturned, ValidationError +from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models @@ -12,7 +12,7 @@ from django.db.models import Count, Q, ObjectDoesNotExist from extras.models import CustomFieldModel, CustomField, CustomFieldValue from extras.rpc import RPC_CLIENTS from tenancy.models import Tenant -from utilities.fields import NullableCharField +from utilities.fields import ColorField, NullableCharField from utilities.managers import NaturalOrderByManager from utilities.models import CreatedUpdatedModel @@ -54,29 +54,6 @@ SUBDEVICE_ROLE_CHOICES = ( (SUBDEVICE_ROLE_CHILD, 'Child'), ) -COLOR_TEAL = 'teal' -COLOR_GREEN = 'green' -COLOR_BLUE = 'blue' -COLOR_PURPLE = 'purple' -COLOR_YELLOW = 'yellow' -COLOR_ORANGE = 'orange' -COLOR_RED = 'red' -COLOR_GRAY1 = 'light_gray' -COLOR_GRAY2 = 'medium_gray' -COLOR_GRAY3 = 'dark_gray' -ROLE_COLOR_CHOICES = [ - [COLOR_TEAL, 'Teal'], - [COLOR_GREEN, 'Green'], - [COLOR_BLUE, 'Blue'], - [COLOR_PURPLE, 'Purple'], - [COLOR_YELLOW, 'Yellow'], - [COLOR_ORANGE, 'Orange'], - [COLOR_RED, 'Red'], - [COLOR_GRAY1, 'Light Gray'], - [COLOR_GRAY2, 'Medium Gray'], - [COLOR_GRAY3, 'Dark Gray'], -] - # Virtual IFACE_FF_VIRTUAL = 0 # Ethernet @@ -345,7 +322,7 @@ class RackRole(models.Model): """ name = models.CharField(max_length=50, unique=True) slug = models.SlugField(unique=True) - color = models.CharField(max_length=30, choices=ROLE_COLOR_CHOICES) + color = ColorField() class Meta: ordering = ['name'] @@ -761,7 +738,7 @@ class DeviceRole(models.Model): """ name = models.CharField(max_length=50, unique=True) slug = models.SlugField(unique=True) - color = models.CharField(max_length=30, choices=ROLE_COLOR_CHOICES) + color = ColorField() class Meta: ordering = ['name'] diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 6c138b446..c81c24f82 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -11,7 +11,7 @@ from .models import ( COLOR_LABEL = """ - + """ DEVICE_LINK = """ @@ -34,7 +34,7 @@ RACKROLE_ACTIONS = """ RACK_ROLE = """ {% if record.role %} - + {% else %} — {% endif %} @@ -59,7 +59,7 @@ PLATFORM_ACTIONS = """ """ DEVICE_ROLE = """ - + """ STATUS_ICON = """ diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 2be592053..ff9eb98c1 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -296,18 +296,6 @@ li.occupied + li.available { border-top: 1px solid #474747; } -/* Colors (from http://flatuicolors.com) */ -.teal { background-color: #1abc9c; } -.green { background-color: #2ecc71; } -.blue { background-color: #3498db; } -.purple { background-color: #9b59b6; } -.yellow { background-color: #f1c40f; } -.orange { background-color: #e67e22; } -.red { background-color: #e74c3c; } -.light_gray { background-color: #dce2e3; } -.medium_gray { background-color: #95a5a6; } -.dark_gray { background-color: #34495e; } - /* Misc */ .banner-bottom { margin-bottom: 50px; diff --git a/netbox/utilities/fields.py b/netbox/utilities/fields.py index 017ceb275..14d1c7d8f 100644 --- a/netbox/utilities/fields.py +++ b/netbox/utilities/fields.py @@ -1,5 +1,11 @@ +from django.core.validators import RegexValidator from django.db import models +from .forms import ColorSelect + + +validate_color = RegexValidator('^[0-9a-f]{6}$', 'Enter a valid hexadecimal RGB color code.', 'invalid') + class NullableCharField(models.CharField): description = "Stores empty values as NULL rather than ''" @@ -11,3 +17,16 @@ class NullableCharField(models.CharField): def get_prep_value(self, value): return value or None + + +class ColorField(models.CharField): + default_validators = [validate_color] + description = "A hexadecimal RGB color code" + + def __init__(self, *args, **kwargs): + kwargs['max_length'] = 6 + super(ColorField, self).__init__(*args, **kwargs) + + def formfield(self, **kwargs): + kwargs['widget'] = ColorSelect + return super(ColorField, self).formfield(**kwargs) diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 7104e34c0..979706ace 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -11,6 +11,32 @@ from django.utils.html import format_html from django.utils.safestring import mark_safe +COLOR_CHOICES = ( + ('aa1409', 'Dark red'), + ('f44336', 'Red'), + ('e91e63', 'Pink'), + ('ff66ff', 'Fuschia'), + ('9c27b0', 'Purple'), + ('673ab7', 'Dark purple'), + ('3f51b5', 'Indigo'), + ('2196f3', 'Blue'), + ('03a9f4', 'Light blue'), + ('00bcd4', 'Cyan'), + ('009688', 'Teal'), + ('2f6a31', 'Dark green'), + ('4caf50', 'Green'), + ('8bc34a', 'Light green'), + ('cddc39', 'Lime'), + ('ffeb3b', 'Yellow'), + ('ffc107', 'Amber'), + ('ff9800', 'Orange'), + ('ff5722', 'Dark orange'), + ('795548', 'Brown'), + ('c0c0c0', 'Light grey'), + ('9e9e9e', 'Grey'), + ('607d8b', 'Dark grey'), + ('111111', 'Black'), +) NUMERIC_EXPANSION_PATTERN = '\[(\d+-\d+)\]' IP4_EXPANSION_PATTERN = '\[([0-9]{1,3}-[0-9]{1,3})\]' IP6_EXPANSION_PATTERN = '\[([0-9a-f]{1,4}-[0-9a-f]{1,4})\]' @@ -71,6 +97,27 @@ class SmallTextarea(forms.Textarea): pass +class ColorSelect(forms.Select): + + def __init__(self, *args, **kwargs): + kwargs['choices'] = COLOR_CHOICES + super(ColorSelect, self).__init__(*args, **kwargs) + + def render_option(self, selected_choices, option_value, option_label): + if option_value is None: + option_value = '' + option_value = force_text(option_value) + if option_value in selected_choices: + selected_html = mark_safe(' selected') + if not self.allow_multiple_selected: + # Only allow for a single selection. + selected_choices.remove(option_value) + else: + selected_html = '' + return format_html('', + option_value, selected_html, option_value, force_text(option_label)) + + class SelectWithDisabled(forms.Select): """ Modified the stock Select widget to accept choices using a dict() for a label. The dict for each option must include From 6e5950be770daa33f130018a6b61375775a9ec15 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2016 13:16:42 -0500 Subject: [PATCH 16/20] Fixes #720: Display user action links properly in admin UI --- netbox/extras/admin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/extras/admin.py b/netbox/extras/admin.py index b7ed94c21..2a06b3f2f 100644 --- a/netbox/extras/admin.py +++ b/netbox/extras/admin.py @@ -1,5 +1,6 @@ from django import forms from django.contrib import admin +from django.utils.safestring import mark_safe from .models import CustomField, CustomFieldChoice, Graph, ExportTemplate, TopologyMap, UserAction @@ -54,4 +55,7 @@ class TopologyMapAdmin(admin.ModelAdmin): @admin.register(UserAction) class UserActionAdmin(admin.ModelAdmin): actions = None - list_display = ['user', 'action', 'content_type', 'object_id', 'message'] + list_display = ['user', 'action', 'content_type', 'object_id', '_message'] + + def _message(self, obj): + return mark_safe(obj.message) From f007b0dbde243126a0955252f355c1a4a4ca29f2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2016 13:59:13 -0500 Subject: [PATCH 17/20] Closes #695: Added is_private field to RIR --- netbox/ipam/admin.py | 2 +- netbox/ipam/api/serializers.py | 4 ++-- netbox/ipam/filters.py | 7 +++++++ netbox/ipam/fixtures/initial_data.json | 18 +++++++++++------ netbox/ipam/forms.py | 10 +++++++++- .../migrations/0011_rir_add_is_private.py | 20 +++++++++++++++++++ netbox/ipam/models.py | 2 ++ netbox/ipam/tables.py | 4 +++- netbox/ipam/views.py | 2 ++ netbox/templates/ipam/rir_list.html | 13 +++++++----- 10 files changed, 66 insertions(+), 16 deletions(-) create mode 100644 netbox/ipam/migrations/0011_rir_add_is_private.py diff --git a/netbox/ipam/admin.py b/netbox/ipam/admin.py index 56113a44e..f3f914129 100644 --- a/netbox/ipam/admin.py +++ b/netbox/ipam/admin.py @@ -28,7 +28,7 @@ class RIRAdmin(admin.ModelAdmin): prepopulated_fields = { 'slug': ['name'], } - list_display = ['name', 'slug'] + list_display = ['name', 'slug', 'is_private'] @admin.register(Aggregate) diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index f7cf20636..742eba9ea 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -58,13 +58,13 @@ class RIRSerializer(serializers.ModelSerializer): class Meta: model = RIR - fields = ['id', 'name', 'slug'] + fields = ['id', 'name', 'slug', 'is_private'] class RIRNestedSerializer(RIRSerializer): class Meta(RIRSerializer.Meta): - pass + fields = ['id', 'name', 'slug'] # diff --git a/netbox/ipam/filters.py b/netbox/ipam/filters.py index e7e150b34..bb04ca78e 100644 --- a/netbox/ipam/filters.py +++ b/netbox/ipam/filters.py @@ -46,6 +46,13 @@ class VRFFilter(CustomFieldFilterSet, django_filters.FilterSet): fields = ['name', 'rd'] +class RIRFilter(django_filters.FilterSet): + + class Meta: + model = RIR + fields = ['is_private'] + + class AggregateFilter(CustomFieldFilterSet, django_filters.FilterSet): q = django_filters.MethodFilter( action='search', diff --git a/netbox/ipam/fixtures/initial_data.json b/netbox/ipam/fixtures/initial_data.json index 5e7659422..da6b4a9ca 100644 --- a/netbox/ipam/fixtures/initial_data.json +++ b/netbox/ipam/fixtures/initial_data.json @@ -43,7 +43,8 @@ "pk": 1, "fields": { "name": "ARIN", - "slug": "arin" + "slug": "arin", + "is_private": false } }, { @@ -51,7 +52,8 @@ "pk": 2, "fields": { "name": "RIPE", - "slug": "ripe" + "slug": "ripe", + "is_private": false } }, { @@ -59,7 +61,8 @@ "pk": 3, "fields": { "name": "APNIC", - "slug": "apnic" + "slug": "apnic", + "is_private": false } }, { @@ -67,7 +70,8 @@ "pk": 4, "fields": { "name": "LACNIC", - "slug": "lacnic" + "slug": "lacnic", + "is_private": false } }, { @@ -75,7 +79,8 @@ "pk": 5, "fields": { "name": "AFRINIC", - "slug": "afrinic" + "slug": "afrinic", + "is_private": false } }, { @@ -83,7 +88,8 @@ "pk": 6, "fields": { "name": "RFC 1918", - "slug": "rfc-1918" + "slug": "rfc-1918", + "is_private": true } }, { diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 1a9e25db3..08bb5db04 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -75,7 +75,15 @@ class RIRForm(forms.ModelForm, BootstrapMixin): class Meta: model = RIR - fields = ['name', 'slug'] + fields = ['name', 'slug', 'is_private'] + + +class RIRFilterForm(forms.Form, BootstrapMixin): + is_private = forms.NullBooleanField(required=False, label='Private', widget=forms.Select(choices=[ + ('', '---------'), + ('True', 'Yes'), + ('False', 'No'), + ])) # diff --git a/netbox/ipam/migrations/0011_rir_add_is_private.py b/netbox/ipam/migrations/0011_rir_add_is_private.py new file mode 100644 index 000000000..ad7732653 --- /dev/null +++ b/netbox/ipam/migrations/0011_rir_add_is_private.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-06 18:27 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0010_ipaddress_help_texts'), + ] + + operations = [ + migrations.AddField( + model_name='rir', + name='is_private', + field=models.BooleanField(default=False, help_text=b'IP space managed by this RIR is considered private', verbose_name=b'Private'), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 1538251cf..5f28acaed 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -103,6 +103,8 @@ class RIR(models.Model): """ name = models.CharField(max_length=50, unique=True) slug = models.SlugField(unique=True) + is_private = models.BooleanField(default=False, verbose_name='Private', + help_text='IP space managed by this RIR is considered private') class Meta: ordering = ['name'] diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index f58dc6673..81953a348 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -126,6 +126,7 @@ class VRFTable(BaseTable): class RIRTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn(verbose_name='Name') + is_private = tables.BooleanColumn(verbose_name='Private') aggregate_count = tables.Column(verbose_name='Aggregates') stats_total = tables.Column(accessor='stats.total', verbose_name='Total', footer=lambda table: sum(r.stats['total'] for r in table.data)) @@ -142,7 +143,8 @@ class RIRTable(BaseTable): class Meta(BaseTable.Meta): model = RIR - fields = ('pk', 'name', 'aggregate_count', 'stats_total', 'stats_active', 'stats_reserved', 'stats_deprecated', 'stats_available', 'utilization', 'actions') + fields = ('pk', 'name', 'is_private', 'aggregate_count', 'stats_total', 'stats_active', 'stats_reserved', + 'stats_deprecated', 'stats_available', 'utilization', 'actions') # diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 78bb1c148..0be5b225e 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -154,6 +154,8 @@ class VRFBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class RIRListView(ObjectListView): queryset = RIR.objects.annotate(aggregate_count=Count('aggregates')) + filter = filters.RIRFilter + filter_form = forms.RIRFilterForm table = tables.RIRTable edit_permissions = ['ipam.change_rir', 'ipam.delete_rir'] template_name = 'ipam/rir_list.html' diff --git a/netbox/templates/ipam/rir_list.html b/netbox/templates/ipam/rir_list.html index 756e91d7f..4d71431a2 100644 --- a/netbox/templates/ipam/rir_list.html +++ b/netbox/templates/ipam/rir_list.html @@ -12,7 +12,7 @@ IPv4 Stats {% else %} - + IPv6 Stats @@ -26,11 +26,14 @@

    RIRs

    -
    +
    {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:rir_bulk_delete' %} + {% if request.GET.family == '6' %} +
    Note: Numbers shown indicate /64 prefixes.
    + {% endif %}
    +
    + {% include 'inc/filter_panel.html' %} +
    -{% if request.GET.family == '6' %} -
    Note: Numbers shown indicate /64 prefixes.
    -{% endif %} {% endblock %} From 28b586aca7bf6698480279ce09709aae07e8cbe9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2016 14:08:25 -0500 Subject: [PATCH 18/20] Fixes #723: API documentation is now accessible when using BASE_PATH --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index bac839dd7..5820bd854 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -188,7 +188,7 @@ REST_FRAMEWORK = { # Swagger settings (API docs) SWAGGER_SETTINGS = { - 'base_path': '{}/api/docs'.format(ALLOWED_HOSTS[0]), + 'base_path': '{}/{}api/docs'.format(ALLOWED_HOSTS[0], BASE_PATH), } From 3262262a8a2d4a15f9f096b155bb07699290ad8c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2016 14:45:01 -0500 Subject: [PATCH 19/20] Closes #663: Added MAC address search field to device list --- netbox/dcim/filters.py | 11 +++++++++++ netbox/dcim/forms.py | 1 + 2 files changed, 12 insertions(+) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 65831a974..69bccd253 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1,4 +1,5 @@ import django_filters +from netaddr.core import AddrFormatError from django.db.models import Q @@ -146,6 +147,10 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): action='search', label='Search', ) + mac_address = django_filters.MethodFilter( + action='_mac_address', + label='MAC address', + ) site_id = django_filters.ModelMultipleChoiceFilter( name='rack__site', queryset=Site.objects.all(), @@ -254,6 +259,12 @@ class DeviceFilter(CustomFieldFilterSet, django_filters.FilterSet): Q(comments__icontains=value) ).distinct() + def _mac_address(self, queryset, value): + try: + return queryset.filter(interfaces__mac_address=value.strip()).distinct() + except AddrFormatError: + return queryset.none() + class ConsolePortFilter(django_filters.FilterSet): device_id = django_filters.ModelMultipleChoiceFilter( diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index fcda14fb5..23da437a7 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -612,6 +612,7 @@ class DeviceFilterForm(BootstrapMixin, CustomFieldFilterForm): platform = FilterChoiceField(queryset=Platform.objects.annotate(filter_count=Count('devices')), to_field_name='slug', null_option=(0, 'None')) status = forms.NullBooleanField(required=False, widget=forms.Select(choices=FORM_STATUS_CHOICES)) + mac_address = forms.CharField(label='MAC address') # From 2171dcee7fed0f6999de74012b32b36642a34134 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 6 Dec 2016 14:53:43 -0500 Subject: [PATCH 20/20] Release v1.7.2 --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 5820bd854..ee8c475ce 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -12,7 +12,7 @@ except ImportError: "the documentation.") -VERSION = '1.7.2-dev' +VERSION = '1.7.2' # Import local configuration for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: