Merge branch 'netbox-community:develop' into 8365-filering-for-child-devices-by-parent-device

README.md

@@ -2,8 +2,6 @@
   <img src="https://raw.githubusercontent.com/netbox-community/netbox/develop/docs/netbox_logo.svg" width="400" alt="NetBox logo" />
 </div>
 
-:loudspeaker: The **[2022 NetBox community survey](https://forms.gle/KR8YbR8GiJ9EYXM28)** is now open! We collect this feedback and demographic data from NetBox users around the world to help shape the project's long-term development goals. Please take a few minutes to share your responses!
-
 ![Master branch build status](https://github.com/netbox-community/netbox/workflows/CI/badge.svg?branch=master)
 
 NetBox is an infrastructure resource modeling (IRM) tool designed to empower

docs/index.md

@@ -1,7 +1,5 @@
 ![NetBox](netbox_logo.svg "NetBox logo"){style="height: 100px; margin-bottom: 3em"}
 
-:loudspeaker: The **[2022 NetBox community survey](https://forms.gle/KR8YbR8GiJ9EYXM28)** is now open! We collect this feedback and demographic data from NetBox users around the world to help shape the project's long-term development goals. Please take a few minutes to share your responses!
-
 # What is NetBox?
 
 NetBox is an infrastructure resource modeling (IRM) application designed to empower network automation. Initially conceived by the network engineering team at [DigitalOcean](https://www.digitalocean.com/), NetBox was developed specifically to address the needs of network and infrastructure engineers. NetBox is made available as open source under the Apache 2 license. It encompasses the following aspects of network management:

docs/installation/upgrading.md

@@ -6,7 +6,7 @@ Prior to upgrading your NetBox instance, be sure to carefully review all [releas
 
 ## Update Dependencies to Required Versions
 
-NetBox v3.0 and later requires the following:
+NetBox v3.0 and later require the following:
 
 | Dependency | Minimum Version |
 |------------|-----------------|
@@ -67,6 +67,11 @@ sudo git checkout master
 sudo git pull origin master
 ```
 
+!!! info "Checking out an older release"
+    If you need to upgrade to an older version rather than the current stable release, you can check out any valid [git tag](https://github.com/netbox-community/netbox/tags), each of which represents a release. For example, to checkout the code for NetBox v2.11.11, do:
+
+        sudo git checkout v2.11.11
+
 ## Run the Upgrade Script
 
 Once the new code is in place, verify that any optional Python packages required by your deployment (e.g. `napalm` or `django-auth-ldap`) are listed in `local_requirements.txt`. Then, run the upgrade script:

docs/models/extras/customlink.md

@@ -2,7 +2,7 @@
 
 Custom links allow users to display arbitrary hyperlinks to external content within NetBox object views. These are helpful for cross-referencing related records in systems outside NetBox. For example, you might create a custom link on the device view which links to the current device in a Network Monitoring System (NMS).
 
-Custom links are created by navigating to Customization > Custom Links. Each link is associated with a particular NetBox object type (site, device, prefix, etc.) and will be displayed on relevant views. Each link has display text and a URL, and data from the Netbox item being viewed can be included in the link using [Jinja2 template code](https://jinja2docs.readthedocs.io/en/stable/) through the variable `obj`, and custom fields through `obj.cf`.
+Custom links are created by navigating to Customization > Custom Links. Each link is associated with a particular NetBox object type (site, device, prefix, etc.) and will be displayed on relevant views. Each link has display text and a URL, and data from the NetBox item being viewed can be included in the link using [Jinja2 template code](https://jinja2docs.readthedocs.io/en/stable/) through the variable `obj`, and custom fields through `obj.cf`.
 
 For example, you might define a link like this:
 
@@ -32,6 +32,10 @@ The following context data is available within the template when rendering a cus
 | `user`     | The current user (if authenticated) |
 | `perms`    | The [permissions](https://docs.djangoproject.com/en/stable/topics/auth/default/#permissions) assigned to the user |
 
+While most of the context variables listed above will have consistent attributes, the object will be an instance of the specific object being viewed when the link is rendered. Different models have different fields and properties, so you may need to some research to determine the attributes available for use within your template for a specific object type.
+
+Checking the REST API representation of an object is generally a convenient way to determine what attributes are available. You can also reference the NetBox source code directly for a comprehensive list.
+
 ## Conditional Rendering
 
 Only links which render with non-empty text are included on the page. You can employ conditional Jinja2 logic to control the conditions under which a link gets rendered.

docs/models/users/token.md

@@ -3,7 +3,7 @@
 A token is a unique identifier mapped to a NetBox user account. Each user may have one or more tokens which he or she can use for authentication when making REST API requests. To create a token, navigate to the API tokens page under your user profile.
 
 !!! note
-    The creation and modification of API tokens can be restricted per user by an administrator. If you don't see an option to create an API token, ask an administrator to grant you access.
+    All users can create and manage REST API tokens under the user control panel in the UI. The ability to view, add, change, or delete tokens via the REST API itself is controlled by the relevant model permissions, assigned to users and/or groups in the admin UI. These permissions should be used with great care to avoid accidentally permitting a user to create tokens for other user accounts.
 
 Each token contains a 160-bit key represented as 40 hexadecimal characters. When creating a token, you'll typically leave the key field blank so that a random key will be automatically generated. However, NetBox allows you to specify a key in case you need to restore a previously deleted token to operation.
 

docs/release-notes/version-3.1.md

@@ -4,9 +4,17 @@
 
 ### Enhancements
 
+* [#8163](https://github.com/netbox-community/netbox/issues/8163) - Show bridge interface members under interface view
 * [#8785](https://github.com/netbox-community/netbox/issues/8785) - Permit wildcard values in IP address DNS names
+* [#8790](https://github.com/netbox-community/netbox/issues/8790) - Include site and prefixes columns in VLAN group VLANs table
 * [#8830](https://github.com/netbox-community/netbox/issues/8830) - Add Checkpoint ClusterXL protocol for FHRP groups
 * [#8974](https://github.com/netbox-community/netbox/issues/8974) - Use monospace font for text areas in config revision form
+* [#9012](https://github.com/netbox-community/netbox/issues/9012) - Linkify circuits count in providers list
+
+### Bug Fixes
+
+* [#8866](https://github.com/netbox-community/netbox/issues/8866) - Prevent exception when searching for a rack position with no rack specified under device edit view
+* [#9009](https://github.com/netbox-community/netbox/issues/9009) - Fix device count for racks in global search results
 
 ---
 

netbox/circuits/tables.py

@@ -2,7 +2,9 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from tenancy.tables import TenantColumn
-from utilities.tables import BaseTable, ButtonsColumn, ChoiceFieldColumn, MarkdownColumn, TagColumn, ToggleColumn
+from utilities.tables import (
+    BaseTable, ButtonsColumn, ChoiceFieldColumn, LinkedCountColumn, MarkdownColumn, TagColumn, ToggleColumn,
+)
 from .models import *
 
 
@@ -53,8 +55,10 @@ class ProviderTable(BaseTable):
     name = tables.Column(
         linkify=True
     )
-    circuit_count = tables.Column(
+    circuit_count = LinkedCountColumn(
         accessor=Accessor('count_circuits'),
+        viewname='circuits:circuit_list',
+        url_params={'provider_id': 'pk'},
         verbose_name='Circuits'
     )
     comments = MarkdownColumn()

netbox/dcim/models/device_components.py

@@ -762,6 +762,10 @@ class Interface(ComponentModel, BaseInterface, LinkTermination, PathEndpoint):
     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

@@ -1776,6 +1776,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(
@@ -1800,6 +1808,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/ipam/views.py

@@ -795,7 +795,7 @@ class VLANGroupView(generic.ObjectView):
         vlans_count = vlans.count()
         vlans = add_available_vlans(vlans, vlan_group=instance)
 
-        vlans_table = tables.VLANTable(vlans, exclude=('site', 'group', 'prefixes'))
+        vlans_table = tables.VLANTable(vlans, exclude=('group',))
         if request.user.has_perm('ipam.change_vlan') or request.user.has_perm('ipam.delete_vlan'):
             vlans_table.columns.show('pk')
         paginate_table(vlans_table, request)

netbox/netbox/constants.py

@@ -65,7 +65,9 @@ DCIM_TYPES = OrderedDict(
             'url': 'dcim:site_list',
         }),
         ('rack', {
-            'queryset': Rack.objects.prefetch_related('site', 'location', 'tenant', 'role'),
+            'queryset': Rack.objects.prefetch_related('site', 'location', 'tenant', 'role').annotate(
+                device_count=count_related(Device, 'rack')
+            ),
             'filterset': RackFilterSet,
             'table': RackTable,
             'url': 'dcim:rack_list',

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

@@ -467,6 +467,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 %}

netbox/templates/virtualization/cluster.html

@@ -33,6 +33,9 @@
                     <th scope="row">Tenant</th>
                     <td>
                         {% if object.tenant %}
+                            {% if object.tenant.group %}
+                                <a href="{{ object.tenant.group.get_absolute_url }}">{{ object.tenant.group }}</a> /
+                            {% endif %}
                             <a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
                         {% else %}
                             <span class="text-muted">None</span>