Merge branch 'develop' into feature

netbox/dcim/models/device_components.py

@@ -784,6 +784,10 @@ class Interface(ModularComponentModel, BaseInterface, LinkTermination, PathEndpo
     def is_lag(self):
         return self.type == InterfaceTypeChoices.TYPE_LAG
 
+    @property
+    def is_bridge(self):
+        return self.type == InterfaceTypeChoices.TYPE_BRIDGE
+
     @property
     def link(self):
         return self.cable or self.wireless_link

netbox/dcim/views.py

@@ -2077,6 +2077,14 @@ class InterfaceView(generic.ObjectView):
             orderable=False
         )
 
+        # Get bridge interfaces
+        bridge_interfaces = Interface.objects.restrict(request.user, 'view').filter(bridge=instance)
+        bridge_interfaces_tables = tables.InterfaceTable(
+            bridge_interfaces,
+            exclude=('device', 'parent'),
+            orderable=False
+        )
+
         # Get child interfaces
         child_interfaces = Interface.objects.restrict(request.user, 'view').filter(parent=instance)
         child_interfaces_tables = tables.InterfaceTable(
@@ -2101,6 +2109,7 @@ class InterfaceView(generic.ObjectView):
 
         return {
             'ipaddress_table': ipaddress_table,
+            'bridge_interfaces_table': bridge_interfaces_tables,
             'child_interfaces_table': child_interfaces_tables,
             'vlan_table': vlan_table,
         }

netbox/extras/admin.py

@@ -23,15 +23,18 @@ class ConfigRevisionAdmin(admin.ModelAdmin):
         }),
         ('Banners', {
             'fields': ('BANNER_LOGIN', 'BANNER_TOP', 'BANNER_BOTTOM'),
+            'classes': ('monospace',),
         }),
         ('Pagination', {
             'fields': ('PAGINATE_COUNT', 'MAX_PAGE_SIZE'),
         }),
         ('Validation', {
             'fields': ('CUSTOM_VALIDATORS',),
+            'classes': ('monospace',),
         }),
         ('NAPALM', {
             'fields': ('NAPALM_USERNAME', 'NAPALM_PASSWORD', 'NAPALM_TIMEOUT', 'NAPALM_ARGS'),
+            'classes': ('monospace',),
         }),
         ('User Preferences', {
             'fields': ('DEFAULT_USER_PREFERENCES',),

netbox/ipam/choices.py

@@ -106,14 +106,22 @@ class FHRPGroupProtocolChoices(ChoiceSet):
     PROTOCOL_HSRP = 'hsrp'
     PROTOCOL_GLBP = 'glbp'
     PROTOCOL_CARP = 'carp'
+    PROTOCOL_CLUSTERXL = 'clusterxl'
     PROTOCOL_OTHER = 'other'
 
     CHOICES = (
-        (PROTOCOL_VRRP2, 'VRRPv2'),
-        (PROTOCOL_VRRP3, 'VRRPv3'),
-        (PROTOCOL_HSRP, 'HSRP'),
-        (PROTOCOL_GLBP, 'GLBP'),
-        (PROTOCOL_CARP, 'CARP'),
+        ('Standard', (
+            (PROTOCOL_VRRP2, 'VRRPv2'),
+            (PROTOCOL_VRRP3, 'VRRPv3'),
+            (PROTOCOL_CARP, 'CARP'),
+        )),
+        ('CheckPoint', (
+            (PROTOCOL_CLUSTERXL, 'ClusterXL'),
+        )),
+        ('Cisco', (
+            (PROTOCOL_HSRP, 'HSRP'),
+            (PROTOCOL_GLBP, 'GLBP'),
+        )),
         (PROTOCOL_OTHER, 'Other'),
     )
 

netbox/ipam/migrations/0001_squashed.py

@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
                 ('status', models.CharField(default='active', max_length=50)),
                 ('role', models.CharField(blank=True, max_length=50)),
                 ('assigned_object_id', models.PositiveIntegerField(blank=True, null=True)),
-                ('dns_name', models.CharField(blank=True, max_length=255, validators=[django.core.validators.RegexValidator(code='invalid', message='Only alphanumeric characters, hyphens, periods, and underscores are allowed in DNS names', regex='^[0-9A-Za-z._-]+$')])),
+                ('dns_name', models.CharField(blank=True, max_length=255, validators=[django.core.validators.RegexValidator(code='invalid', message='Only alphanumeric characters, asterisks, hyphens, periods, and underscores are allowed in DNS names', regex='^([0-9A-Za-z_-]+|\\*)(\\.[0-9A-Za-z_-]+)*\\.?$')])),
                 ('description', models.CharField(blank=True, max_length=200)),
             ],
             options={

netbox/ipam/validators.py

@@ -24,7 +24,7 @@ class MinPrefixLengthValidator(BaseValidator):
 
 
 DNSValidator = RegexValidator(
-    regex='^[0-9A-Za-z._-]+$',
-    message='Only alphanumeric characters, hyphens, periods, and underscores are allowed in DNS names',
+    regex=r'^([0-9A-Za-z_-]+|\*)(\.[0-9A-Za-z_-]+)*\.?$',
+    message='Only alphanumeric characters, asterisks, hyphens, periods, and underscores are allowed in DNS names',
     code='invalid'
 )

netbox/netbox/config/parameters.py

@@ -22,7 +22,9 @@ PARAMS = (
         default='',
         description="Additional content to display on the login page",
         field_kwargs={
-            'widget': forms.Textarea(),
+            'widget': forms.Textarea(
+                attrs={'class': 'vLargeTextField'}
+            ),
         },
     ),
     ConfigParam(
@@ -31,7 +33,9 @@ PARAMS = (
         default='',
         description="Additional content to display at the top of every page",
         field_kwargs={
-            'widget': forms.Textarea(),
+            'widget': forms.Textarea(
+                attrs={'class': 'vLargeTextField'}
+            ),
         },
     ),
     ConfigParam(
@@ -40,7 +44,9 @@ PARAMS = (
         default='',
         description="Additional content to display at the bottom of every page",
         field_kwargs={
-            'widget': forms.Textarea(),
+            'widget': forms.Textarea(
+                attrs={'class': 'vLargeTextField'}
+            ),
         },
     ),
 
@@ -109,7 +115,12 @@ PARAMS = (
         label='Custom validators',
         default={},
         description="Custom validation rules (JSON)",
-        field=forms.JSONField
+        field=forms.JSONField,
+        field_kwargs={
+            'widget': forms.Textarea(
+                attrs={'class': 'vLargeTextField'}
+            ),
+        },
     ),
 
     # NAPALM
@@ -137,7 +148,12 @@ PARAMS = (
         label='NAPALM arguments',
         default={},
         description="Additional arguments to pass when invoking a NAPALM driver (as JSON data)",
-        field=forms.JSONField
+        field=forms.JSONField,
+        field_kwargs={
+            'widget': forms.Textarea(
+                attrs={'class': 'vLargeTextField'}
+            ),
+        },
     ),
 
     # User preferences

netbox/project-static/src/select/api/apiSelect.ts

@@ -557,9 +557,12 @@ export class APISelect {
   private async handleSearch(event: Event) {
     const { value: q } = event.target as HTMLInputElement;
     const url = queryString.stringifyUrl({ url: this.queryUrl, query: { q } });
-    await this.fetchOptions(url, 'merge');
-    this.slim.data.search(q);
-    this.slim.render();
+    if (!url.includes(`{{`)) {
+      await this.fetchOptions(url, 'merge');
+      this.slim.data.search(q);
+      this.slim.render();
+    }
+    return;
   }
 
   /**

netbox/templates/dcim/interface.html

@@ -443,6 +443,13 @@
       {% include 'inc/panel_table.html' with table=vlan_table heading="VLANs" %}
     </div>
   </div>
+  {% if object.is_bridge %}
+    <div class="row mb-3">
+      <div class="col col-md-12">
+        {% include 'inc/panel_table.html' with table=bridge_interfaces_table heading="Bridge Interfaces" %}
+      </div>
+    </div>
+  {% endif %}
   <div class="row mb-3">
     <div class="col col-md-12">
       {% include 'inc/panel_table.html' with table=child_interfaces_table heading="Child Interfaces" %}

netbox/templates/exceptions/import_error.html

@@ -1,19 +1,19 @@
 {% extends '500.html' %}
 
 {% block message %}
-    <p>
-        A module import error occurred during this request. Common causes include the following:
-    </p>
-    <p>
-        <i class="mdi mdi-alert"></i> <strong>Missing required packages</strong> - This installation of NetBox might be
-        missing one or more required Python packages. These packages are listed in <code>requirements.txt</code> and
-        <code>local_requirements.txt</code>, and are normally installed as part of the installation or upgrade process.
-        To verify installed packages, run <code>pip freeze</code> from the console and compare the output to the list of
-        required packages.
-    </p>
-    <p>
-        <i class="mdi mdi-alert"></i> <strong>WSGI service not restarted after upgrade</strong> - If this installation
-        has recently been upgraded, check that the WSGI service (e.g. gunicorn or uWSGI) has been restarted. This
-        ensures that the new code is running.
-    </p>
+  <p>
+    A module import error occurred during this request. Common causes include the following:
+  </p>
+  <p>
+    <i class="mdi mdi-alert"></i> <strong>Missing required packages</strong> - This installation of NetBox might be
+    missing one or more required Python packages. These packages are listed in <code>requirements.txt</code> and
+    <code>local_requirements.txt</code>, and are normally installed as part of the installation or upgrade process. To
+    verify installed packages, run <code>pip freeze</code> from the console and compare the output to the list of
+    required packages.
+  </p>
+  <p>
+    <i class="mdi mdi-alert"></i> <strong>WSGI service not restarted after upgrade</strong> - If this installation has
+    recently been upgraded, check that the WSGI service (e.g. gunicorn or uWSGI) has been restarted. This ensures that
+    the new code is running.
+  </p>
 {% endblock message %}

netbox/templates/exceptions/permission_error.html

@@ -1,12 +1,12 @@
 {% extends '500.html' %}
 
 {% block message %}
-    <p>
-        A file permission error was detected while processing this request. Common causes include the following:
-    </p>
-    <p>
-        <i class="mdi mdi-alert"></i> <strong>Insufficient write permission to the media root</strong> - The configured
-        media root is <code>{{ settings.MEDIA_ROOT }}</code>. Ensure that the user NetBox runs as has access to write
-        files to all locations within this path.
-    </p>
+  <p>
+    A file permission error was detected while processing this request. Common causes include the following:
+  </p>
+  <p>
+    <i class="mdi mdi-alert"></i> <strong>Insufficient write permission to the media root</strong> - The configured
+    media root is <code>{{ settings.MEDIA_ROOT }}</code>. Ensure that the user NetBox runs as has access to write files
+    to all locations within this path.
+  </p>
 {% endblock message %}

netbox/templates/exceptions/programming_error.html

@@ -1,17 +1,17 @@
 {% extends '500.html' %}
 
 {% block message %}
-    <p>
-        A database programming error was detected while processing this request. Common causes include the following:
-    </p>
-    <p>
-        <i class="mdi mdi-alert"></i> <strong>Database migrations missing</strong> - When upgrading to a new NetBox release, the upgrade script must
-        be run to apply any new database migrations. You can run migrations manually by executing
-        <code>python3 manage.py migrate</code> from the command line.
-    </p>
-    <p>
-        <i class="mdi mdi-alert"></i> <strong>Unsupported PostgreSQL version</strong> - Ensure that PostgreSQL version 9.6 or higher is in use. You
-        can check this by connecting to the database using NetBox's credentials and issuing a query for
-        <code>SELECT VERSION()</code>.
-    </p>
+  <p>
+    A database programming error was detected while processing this request. Common causes include the following:
+  </p>
+  <p>
+    <i class="mdi mdi-alert"></i> <strong>Database migrations missing</strong> - When upgrading to a new NetBox release,
+    the upgrade script must be run to apply any new database migrations. You can run migrations manually by executing
+    <code>python3 manage.py migrate</code> from the command line.
+  </p>
+  <p>
+    <i class="mdi mdi-alert"></i> <strong>Unsupported PostgreSQL version</strong> - Ensure that PostgreSQL version 10
+    or later is in use. You can check this by connecting to the database using NetBox's credentials and issuing a query
+    for <code>SELECT VERSION()</code>.
+  </p>
 {% endblock message %}