Define UI layout for Module view

docs/configuration/required-parameters.md

@@ -200,48 +200,6 @@ REDIS = {
 !!! note
     It is permissible to use Sentinel for only one database and not the other.
 
-### SSL Configuration
-
-If you need to configure SSL/TLS for Redis beyond the basic `SSL`, `CA_CERT_PATH`, and `INSECURE_SKIP_TLS_VERIFY` options (for example, client certificates, a specific TLS version, or custom ciphers), you can pass additional parameters via the `KWARGS` key in either the `tasks` or `caching` subsection.
-
-NetBox already maps `CA_CERT_PATH` to `ssl_ca_certs` and (for caching) `INSECURE_SKIP_TLS_VERIFY` to `ssl_cert_reqs`; only add `KWARGS` when you need to override or extend those settings (for example, to supply client certificates or restrict TLS version or ciphers).
-
-* `KWARGS` - Optional dictionary of additional SSL/TLS (or other) parameters passed to the Redis client. These are passed directly to the underlying Redis client: for `tasks` to [redis-py](https://redis-py.readthedocs.io/en/stable/connections.html), and for `caching` to the [django-redis](https://github.com/jazzband/django-redis#configure-as-cache-backend) connection pool.
-
-Example:
-
-```python
-REDIS = {
-    'tasks': {
-        'HOST': 'redis.example.com',
-        'PORT': 1234,
-        'SSL': True,
-        'CA_CERT_PATH': '/etc/ssl/certs/ca.crt',
-        'KWARGS': {
-            'ssl_certfile': '/path/to/client-cert.pem',
-            'ssl_keyfile': '/path/to/client-key.pem',
-            'ssl_min_version': ssl.TLSVersion.TLSv1_2,
-            'ssl_ciphers': 'HIGH:!aNULL',
-        },
-    },
-    'caching': {
-        'HOST': 'redis.example.com',
-        'PORT': 1234,
-        'SSL': True,
-        'CA_CERT_PATH': '/etc/ssl/certs/ca.crt',
-        'KWARGS': {
-            'ssl_certfile': '/path/to/client-cert.pem',
-            'ssl_keyfile': '/path/to/client-key.pem',
-            'ssl_min_version': ssl.TLSVersion.TLSv1_2,
-            'ssl_ciphers': 'HIGH:!aNULL',
-        },
-    }
-}
-```
-
-!!! note
-    If you use `ssl.TLSVersion` in your configuration (e.g. `ssl_min_version`), add `import ssl` at the top of your configuration file.
-
 ---
 
 ## SECRET_KEY

netbox/circuits/filtersets.py

@@ -99,13 +99,11 @@ class ProviderFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
 class ProviderAccountFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
@@ -129,13 +127,11 @@ class ProviderAccountFilterSet(PrimaryModelFilterSet, ContactModelFilterSet):
 class ProviderNetworkFilterSet(PrimaryModelFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
@@ -167,26 +163,22 @@ class CircuitTypeFilterSet(OrganizationalModelFilterSet):
 class CircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
     provider_account_id = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         label=_('Provider account (ID)'),
     )
     provider_account = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account__account',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='account',
         label=_('Provider account (account)'),
     )
@@ -197,19 +189,16 @@ class CircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilt
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitType.objects.all(),
-        distinct=False,
         label=_('Circuit type (ID)'),
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
         queryset=CircuitType.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Circuit type (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=CircuitStatusChoices,
-        distinct=False,
         null_value=None
     )
     region_id = TreeNodeMultipleChoiceFilter(
@@ -256,12 +245,10 @@ class CircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilt
     )
     termination_a_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitTermination.objects.all(),
-        distinct=False,
         label=_('Termination A (ID)'),
     )
     termination_z_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitTermination.objects.all(),
-        distinct=False,
         label=_('Termination A (ID)'),
     )
 
@@ -292,7 +279,6 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
     )
     circuit_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Circuit.objects.all(),
-        distinct=False,
         label=_('Circuit'),
     )
     termination_type = ContentTypeFilter()
@@ -324,14 +310,12 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
-        distinct=False,
         field_name='_site',
         label=_('Site (ID)'),
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='_site__slug',
         queryset=Site.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Site (slug)'),
     )
@@ -350,20 +334,17 @@ class CircuitTerminationFilterSet(NetBoxModelFilterSet, CabledObjectFilterSet):
     )
     provider_network_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
-        distinct=False,
         field_name='_provider_network',
         label=_('ProviderNetwork (ID)'),
     )
     provider_id = django_filters.ModelMultipleChoiceFilter(
         field_name='circuit__provider_id',
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='circuit__provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
@@ -433,13 +414,11 @@ class CircuitGroupAssignmentFilterSet(NetBoxModelFilterSet):
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=CircuitGroup.objects.all(),
-        distinct=False,
         label=_('Circuit group (ID)'),
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
         queryset=CircuitGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Circuit group (slug)'),
     )
@@ -509,49 +488,41 @@ class VirtualCircuitFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
     provider_id = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_network__provider',
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_network__provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
     provider_account_id = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         label=_('Provider account (ID)'),
     )
     provider_account = django_filters.ModelMultipleChoiceFilter(
         field_name='provider_account__account',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='account',
         label=_('Provider account (account)'),
     )
     provider_network_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
-        distinct=False,
         label=_('Provider network (ID)'),
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VirtualCircuitType.objects.all(),
-        distinct=False,
         label=_('Virtual circuit type (ID)'),
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
         queryset=VirtualCircuitType.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Virtual circuit type (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=CircuitStatusChoices,
-        distinct=False,
         null_value=None
     )
 
@@ -577,49 +548,41 @@ class VirtualCircuitTerminationFilterSet(NetBoxModelFilterSet):
     )
     virtual_circuit_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VirtualCircuit.objects.all(),
-        distinct=False,
         label=_('Virtual circuit'),
     )
     role = django_filters.MultipleChoiceFilter(
         choices=VirtualCircuitTerminationRoleChoices,
-        distinct=False,
         null_value=None
     )
     provider_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_network__provider',
         queryset=Provider.objects.all(),
-        distinct=False,
         label=_('Provider (ID)'),
     )
     provider = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_network__provider__slug',
         queryset=Provider.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Provider (slug)'),
     )
     provider_account_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         label=_('Provider account (ID)'),
     )
     provider_account = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_circuit__provider_account__account',
         queryset=ProviderAccount.objects.all(),
-        distinct=False,
         to_field_name='account',
         label=_('Provider account (account)'),
     )
     provider_network_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ProviderNetwork.objects.all(),
-        distinct=False,
         field_name='virtual_circuit__provider_network',
         label=_('Provider network (ID)'),
     )
     interface_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Interface.objects.all(),
-        distinct=False,
         field_name='interface',
         label=_('Interface (ID)'),
     )

netbox/core/filtersets.py

@@ -25,17 +25,14 @@ __all__ = (
 class DataSourceFilterSet(PrimaryModelFilterSet):
     type = django_filters.MultipleChoiceFilter(
         choices=get_data_backend_choices,
-        distinct=False,
         null_value=None
     )
     status = django_filters.MultipleChoiceFilter(
         choices=DataSourceStatusChoices,
-        distinct=False,
         null_value=None
     )
     sync_interval = django_filters.MultipleChoiceFilter(
         choices=JobIntervalChoices,
-        distinct=False,
         null_value=None
     )
 
@@ -60,13 +57,11 @@ class DataFileFilterSet(ChangeLoggedModelFilterSet):
     )
     source_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data source (ID)'),
     )
     source = django_filters.ModelMultipleChoiceFilter(
         field_name='source__name',
         queryset=DataSource.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Data source (name)'),
     )
@@ -91,7 +86,6 @@ class JobFilterSet(BaseFilterSet):
     )
     object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ObjectType.objects.with_feature('jobs'),
-        distinct=False,
         field_name='object_type_id',
     )
     object_type = ContentTypeFilter()
@@ -133,7 +127,6 @@ class JobFilterSet(BaseFilterSet):
     )
     status = django_filters.MultipleChoiceFilter(
         choices=JobStatusChoices,
-        distinct=False,
         null_value=None
     )
     queue_name = django_filters.CharFilter()
@@ -189,19 +182,16 @@ class ObjectChangeFilterSet(BaseFilterSet):
     time = django_filters.DateTimeFromToRangeFilter()
     changed_object_type = ContentTypeFilter()
     changed_object_type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ContentType.objects.all(),
-        distinct=False,
+        queryset=ContentType.objects.all()
     )
     related_object_type = ContentTypeFilter()
     user_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
-        distinct=False,
         label=_('User (ID)'),
     )
     user = django_filters.ModelMultipleChoiceFilter(
         field_name='user__username',
         queryset=User.objects.all(),
-        distinct=False,
         to_field_name='username',
         label=_('User name'),
     )

netbox/core/views.py

@@ -1,7 +1,6 @@
 import json
 import platform
 
-from copy import deepcopy
 from django import __version__ as django_version
 from django.conf import settings
 from django.contrib import messages
@@ -311,22 +310,6 @@ class ConfigRevisionListView(generic.ObjectListView):
 class ConfigRevisionView(generic.ObjectView):
     queryset = ConfigRevision.objects.all()
 
-    def get_extra_context(self, request, instance):
-        """
-        Retrieve additional context for a given request and instance.
-        """
-        # Copy the revision data to avoid modifying the original
-        config = deepcopy(instance.data or {})
-
-        # Serialize any JSON-based classes
-        for attr in ['CUSTOM_VALIDATORS', 'DEFAULT_USER_PREFERENCES', 'PROTECTION_RULES']:
-            if attr in config:
-                config[attr] = json.dumps(config[attr], cls=ConfigJSONEncoder, indent=4)
-
-        return {
-            'config': config,
-        }
-
 
 @register_model_view(ConfigRevision, 'add', detail=False)
 class ConfigRevisionEditView(generic.ObjectEditView):
@@ -634,8 +617,8 @@ class SystemView(UserPassesTestMixin, View):
             response['Content-Disposition'] = 'attachment; filename="netbox.json"'
             return response
 
-        # Serialize any JSON-based classes
-        for attr in ['CUSTOM_VALIDATORS', 'DEFAULT_USER_PREFERENCES', 'PROTECTION_RULES']:
+        # Serialize any CustomValidator classes
+        for attr in ['CUSTOM_VALIDATORS', 'PROTECTION_RULES']:
             if hasattr(config, attr) and getattr(config, attr, None):
                 setattr(config, attr, json.dumps(getattr(config, attr), cls=ConfigJSONEncoder, indent=4))
 

netbox/dcim/base_filtersets.py

@@ -43,14 +43,12 @@ class ScopedFilterSet(BaseFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
-        distinct=False,
         field_name='_site',
         label=_('Site (ID)'),
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='_site__slug',
         queryset=Site.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Site (slug)'),
     )

netbox/dcim/tables/devices.py

@@ -887,36 +887,24 @@ class DeviceBayTable(DeviceComponentTable):
             'args': [Accessor('device_id')],
         }
     )
+    role = columns.ColoredLabelColumn(
+        accessor=Accessor('installed_device__role'),
+        verbose_name=_('Role')
+    )
+    device_type = tables.Column(
+        accessor=Accessor('installed_device__device_type'),
+        linkify=True,
+        verbose_name=_('Type')
+    )
     status = tables.TemplateColumn(
         verbose_name=_('Status'),
         template_code=DEVICEBAY_STATUS,
         order_by=Accessor('installed_device__status')
     )
     installed_device = tables.Column(
-        verbose_name=_('Installed Device'),
+        verbose_name=_('Installed device'),
         linkify=True
     )
-    installed_role = columns.ColoredLabelColumn(
-        accessor=Accessor('installed_device__role'),
-        verbose_name=_('Installed Role')
-    )
-    installed_device_type = tables.Column(
-        accessor=Accessor('installed_device__device_type'),
-        linkify=True,
-        verbose_name=_('Installed Type')
-    )
-    installed_description = tables.Column(
-        accessor=Accessor('installed_device__description'),
-        verbose_name=_('Installed Description')
-    )
-    installed_serial = tables.Column(
-        accessor=Accessor('installed_device__serial'),
-        verbose_name=_('Installed Serial')
-    )
-    installed_asset_tag = tables.Column(
-        accessor=Accessor('installed_device__asset_tag'),
-        verbose_name=_('Installed Asset Tag')
-    )
     tags = columns.TagColumn(
         url_name='dcim:devicebay_list'
     )
@@ -924,9 +912,8 @@ class DeviceBayTable(DeviceComponentTable):
     class Meta(DeviceComponentTable.Meta):
         model = models.DeviceBay
         fields = (
-            'pk', 'id', 'name', 'device', 'label', 'status', 'description', 'installed_device', 'installed_role',
-            'installed_device_type', 'installed_description', 'installed_serial', 'installed_asset_tag', 'tags',
-            'created', 'last_updated',
+            'pk', 'id', 'name', 'device', 'label', 'status', 'role', 'device_type', 'installed_device', 'description',
+            'tags', 'created', 'last_updated',
         )
 
         default_columns = ('pk', 'name', 'device', 'label', 'status', 'installed_device', 'description')

netbox/dcim/ui/panels.py

@@ -90,6 +90,7 @@ class DevicePanel(panels.ObjectAttributesPanel):
     parent_device = attrs.TemplatedAttr('parent_bay', template_name='dcim/device/attrs/parent_device.html')
     gps_coordinates = attrs.GPSCoordinatesAttr()
     tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
+    device_type = attrs.RelatedObjectAttr('device_type', linkify=True, grouped_by='manufacturer')
     description = attrs.TextAttr('description')
     airflow = attrs.ChoiceAttr('airflow')
     serial = attrs.TextAttr('serial', label=_('Serial number'), style='font-monospace', copy_button=True)
@@ -121,22 +122,19 @@ class DeviceManagementPanel(panels.ObjectAttributesPanel):
     cluster = attrs.RelatedObjectAttr('cluster', linkify=True)
 
 
-class DeviceDeviceTypePanel(panels.ObjectAttributesPanel):
-    title = _('Device Type')
-
-    manufacturer = attrs.RelatedObjectAttr('device_type.manufacturer', linkify=True)
-    model = attrs.RelatedObjectAttr('device_type', linkify=True)
-    height = attrs.TextAttr('device_type.u_height', format_string='{}U')
-    front_image = attrs.ImageAttr('device_type.front_image')
-    rear_image = attrs.ImageAttr('device_type.rear_image')
-
-
 class DeviceDimensionsPanel(panels.ObjectAttributesPanel):
     title = _('Dimensions')
 
+    height = attrs.TextAttr('device_type.u_height', format_string='{}U')
     total_weight = attrs.TemplatedAttr('total_weight', template_name='dcim/device/attrs/total_weight.html')
 
 
+class DeviceRolePanel(panels.NestedGroupObjectPanel):
+    color = attrs.ColorAttr('color')
+    vm_role = attrs.BooleanAttr('vm_role', label=_('VM role'))
+    config_template = attrs.RelatedObjectAttr('config_template', linkify=True)
+
+
 class DeviceTypePanel(panels.ObjectAttributesPanel):
     manufacturer = attrs.RelatedObjectAttr('manufacturer', linkify=True)
     model = attrs.TextAttr('model')
@@ -153,11 +151,36 @@ class DeviceTypePanel(panels.ObjectAttributesPanel):
     rear_image = attrs.ImageAttr('rear_image')
 
 
+class ModulePanel(panels.ObjectAttributesPanel):
+    device = attrs.RelatedObjectAttr('device', linkify=True)
+    device_type = attrs.RelatedObjectAttr('device.device_type', linkify=True, grouped_by='manufacturer')
+    module_bay = attrs.NestedObjectAttr('module_bay')
+    status = attrs.ChoiceAttr('status')
+    description = attrs.TextAttr('description')
+    serial = attrs.TextAttr('serial', label=_('Serial number'), style='font-monospace', copy_button=True)
+    asset_tag = attrs.TextAttr('asset_tag', style='font-monospace', copy_button=True)
+
+
 class ModuleTypeProfilePanel(panels.ObjectAttributesPanel):
     name = attrs.TextAttr('name')
     description = attrs.TextAttr('description')
 
 
+class ModuleTypePanel(panels.ObjectAttributesPanel):
+    profile = attrs.RelatedObjectAttr('profile', linkify=True)
+    manufacturer = attrs.RelatedObjectAttr('manufacturer', linkify=True)
+    model = attrs.TextAttr('name')
+    part_number = attrs.TextAttr('part_number')
+    description = attrs.TextAttr('description')
+    airflow = attrs.ChoiceAttr('airflow')
+    weight = attrs.NumericAttr('weight', unit_accessor='get_weight_unit_display')
+
+
+class PlatformPanel(panels.NestedGroupObjectPanel):
+    manufacturer = attrs.RelatedObjectAttr('manufacturer', linkify=True)
+    config_template = attrs.RelatedObjectAttr('config_template', linkify=True)
+
+
 class VirtualChassisMembersPanel(panels.ObjectPanel):
     """
     A panel which lists all members of a virtual chassis.

netbox/dcim/views.py

@@ -13,6 +13,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import View
 
 from circuits.models import Circuit, CircuitTermination
+from dcim.ui import panels
 from extras.ui.panels import CustomFieldsPanel, ImageAttachmentsPanel, TagsPanel
 from extras.views import ObjectConfigContextView, ObjectRenderConfigView
 from ipam.models import ASN, IPAddress, Prefix, VLAN, VLANGroup
@@ -20,8 +21,8 @@ from ipam.tables import InterfaceVLANTable, VLANTranslationRuleTable
 from netbox.object_actions import *
 from netbox.ui import actions, layout
 from netbox.ui.panels import (
-    CommentsPanel, JSONPanel, NestedGroupObjectPanel, ObjectsTablePanel, OrganizationalObjectPanel, RelatedObjectsPanel,
-    TemplatePanel,
+    CommentsPanel, JSONPanel, NestedGroupObjectPanel, ObjectsTablePanel, OrganizationalObjectPanel, Panel,
+    RelatedObjectsPanel, TemplatePanel,
 )
 from netbox.views import generic
 from utilities.forms import ConfirmationForm
@@ -43,7 +44,6 @@ from .choices import DeviceFaceChoices, InterfaceModeChoices
 from .models import *
 from .models.device_components import PortMapping
 from .object_actions import BulkAddComponents, BulkDisconnect
-from .ui import panels
 
 CABLE_TERMINATION_TYPES = {
     'dcim.consoleport': ConsolePort,
@@ -1657,6 +1657,22 @@ class ModuleTypeListView(generic.ObjectListView):
 @register_model_view(ModuleType)
 class ModuleTypeView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = ModuleType.objects.all()
+    layout = layout.SimpleLayout(
+        left_panels=[
+            panels.ModuleTypePanel(),
+            TagsPanel(),
+            CommentsPanel(),
+        ],
+        right_panels=[
+            Panel(
+                title=_('Attributes'),
+                template_name='dcim/panels/module_type_attributes.html',
+            ),
+            RelatedObjectsPanel(),
+            CustomFieldsPanel(),
+            ImageAttachmentsPanel(),
+        ],
+    )
 
     def get_extra_context(self, request, instance):
         return {
@@ -2296,6 +2312,27 @@ class DeviceRoleListView(generic.ObjectListView):
 @register_model_view(DeviceRole)
 class DeviceRoleView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = DeviceRole.objects.all()
+    layout = layout.SimpleLayout(
+        left_panels=[
+            panels.DeviceRolePanel(),
+            TagsPanel(),
+        ],
+        right_panels=[
+            RelatedObjectsPanel(),
+            CustomFieldsPanel(),
+            CommentsPanel(),
+        ],
+        bottom_panels=[
+            ObjectsTablePanel(
+                model='dcim.DeviceRole',
+                title=_('Child Device Roles'),
+                filters={'parent_id': lambda ctx: ctx['object'].pk},
+                actions=[
+                    actions.AddObject('dcim.DeviceRole', url_params={'parent': lambda ctx: ctx['object'].pk}),
+                ],
+            ),
+        ]
+    )
 
     def get_extra_context(self, request, instance):
         return {
@@ -2375,6 +2412,27 @@ class PlatformListView(generic.ObjectListView):
 @register_model_view(Platform)
 class PlatformView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = Platform.objects.all()
+    layout = layout.SimpleLayout(
+        left_panels=[
+            panels.PlatformPanel(),
+            TagsPanel(),
+        ],
+        right_panels=[
+            RelatedObjectsPanel(),
+            CustomFieldsPanel(),
+            CommentsPanel(),
+        ],
+        bottom_panels=[
+            ObjectsTablePanel(
+                model='dcim.Platform',
+                title=_('Child Platforms'),
+                filters={'parent_id': lambda ctx: ctx['object'].pk},
+                actions=[
+                    actions.AddObject('dcim.Platform', url_params={'parent': lambda ctx: ctx['object'].pk}),
+                ],
+            ),
+        ]
+    )
 
     def get_extra_context(self, request, instance):
         return {
@@ -2470,7 +2528,6 @@ class DeviceView(generic.ObjectView):
                 ],
             ),
             ImageAttachmentsPanel(),
-            panels.DeviceDeviceTypePanel(),
             panels.DeviceDimensionsPanel(),
             TemplatePanel('dcim/panels/device_rack_elevations.html'),
         ],
@@ -2767,6 +2824,21 @@ class ModuleListView(generic.ObjectListView):
 @register_model_view(Module)
 class ModuleView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = Module.objects.all()
+    layout = layout.SimpleLayout(
+        left_panels=[
+            panels.ModulePanel(),
+            TagsPanel(),
+            CommentsPanel(),
+        ],
+        right_panels=[
+            Panel(
+                title=_('Module Type'),
+                template_name='dcim/panels/module_type.html',
+            ),
+            RelatedObjectsPanel(),
+            CustomFieldsPanel(),
+        ],
+    )
 
     def get_extra_context(self, request, instance):
         return {

netbox/extras/filtersets.py

@@ -49,7 +49,6 @@ class ScriptFilterSet(BaseFilterSet):
     )
     module_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ScriptModule.objects.all(),
-        distinct=False,
         label=_('Script module (ID)'),
     )
 
@@ -72,8 +71,7 @@ class WebhookFilterSet(OwnerFilterMixin, NetBoxModelFilterSet):
         label=_('Search'),
     )
     http_method = django_filters.MultipleChoiceFilter(
-        choices=WebhookHttpMethodChoices,
-        distinct=False,
+        choices=WebhookHttpMethodChoices
     )
     payload_url = MultiValueCharFilter(
         lookup_expr='icontains'
@@ -113,8 +111,7 @@ class EventRuleFilterSet(OwnerFilterMixin, NetBoxModelFilterSet):
         method='filter_event_type'
     )
     action_type = django_filters.MultipleChoiceFilter(
-        choices=EventRuleActionChoices,
-        distinct=False,
+        choices=EventRuleActionChoices
     )
     action_object_type = ContentTypeFilter()
     action_object_id = MultiValueNumberFilter()
@@ -145,8 +142,7 @@ class CustomFieldFilterSet(OwnerFilterMixin, ChangeLoggedModelFilterSet):
         label=_('Search'),
     )
     type = django_filters.MultipleChoiceFilter(
-        choices=CustomFieldTypeChoices,
-        distinct=False,
+        choices=CustomFieldTypeChoices
     )
     object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ObjectType.objects.all(),
@@ -157,18 +153,15 @@ class CustomFieldFilterSet(OwnerFilterMixin, ChangeLoggedModelFilterSet):
     )
     related_object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ObjectType.objects.all(),
-        distinct=False,
         field_name='related_object_type'
     )
     related_object_type = ContentTypeFilter()
     choice_set_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=CustomFieldChoiceSet.objects.all(),
-        distinct=False,
+        queryset=CustomFieldChoiceSet.objects.all()
     )
     choice_set = django_filters.ModelMultipleChoiceFilter(
         field_name='choice_set__name',
         queryset=CustomFieldChoiceSet.objects.all(),
-        distinct=False,
         to_field_name='name'
     )
 
@@ -267,12 +260,10 @@ class ExportTemplateFilterSet(OwnerFilterMixin, ChangeLoggedModelFilterSet):
     )
     data_source_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data source (ID)'),
     )
     data_file_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data file (ID)'),
     )
 
@@ -308,13 +299,11 @@ class SavedFilterFilterSet(OwnerFilterMixin, ChangeLoggedModelFilterSet):
     )
     user_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
-        distinct=False,
         label=_('User (ID)'),
     )
     user = django_filters.ModelMultipleChoiceFilter(
         field_name='user__username',
         queryset=User.objects.all(),
-        distinct=False,
         to_field_name='username',
         label=_('User (name)'),
     )
@@ -356,7 +345,6 @@ class TableConfigFilterSet(ChangeLoggedModelFilterSet):
     )
     object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ObjectType.objects.all(),
-        distinct=False,
         field_name='object_type'
     )
     object_type = ContentTypeFilter(
@@ -364,13 +352,11 @@ class TableConfigFilterSet(ChangeLoggedModelFilterSet):
     )
     user_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
-        distinct=False,
         label=_('User (ID)'),
     )
     user = django_filters.ModelMultipleChoiceFilter(
         field_name='user__username',
         queryset=User.objects.all(),
-        distinct=False,
         to_field_name='username',
         label=_('User (name)'),
     )
@@ -412,13 +398,11 @@ class BookmarkFilterSet(BaseFilterSet):
     object_type = ContentTypeFilter()
     user_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
-        distinct=False,
         label=_('User (ID)'),
     )
     user = django_filters.ModelMultipleChoiceFilter(
         field_name='user__username',
         queryset=User.objects.all(),
-        distinct=False,
         to_field_name='username',
         label=_('User (name)'),
     )
@@ -499,24 +483,20 @@ class JournalEntryFilterSet(NetBoxModelFilterSet):
     created = django_filters.DateTimeFromToRangeFilter()
     assigned_object_type = ContentTypeFilter()
     assigned_object_type_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=ContentType.objects.all(),
-        distinct=False,
+        queryset=ContentType.objects.all()
     )
     created_by_id = django_filters.ModelMultipleChoiceFilter(
         queryset=User.objects.all(),
-        distinct=False,
         label=_('User (ID)'),
     )
     created_by = django_filters.ModelMultipleChoiceFilter(
         field_name='created_by__username',
         queryset=User.objects.all(),
-        distinct=False,
         to_field_name='username',
         label=_('User (name)'),
     )
     kind = django_filters.MultipleChoiceFilter(
-        choices=JournalEntryKindChoices,
-        distinct=False,
+        choices=JournalEntryKindChoices
     )
 
     class Meta:
@@ -601,17 +581,14 @@ class TaggedItemFilterSet(BaseFilterSet):
     )
     object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ContentType.objects.all(),
-        distinct=False,
         field_name='content_type_id'
     )
     tag_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Tag.objects.all(),
-        distinct=False,
+        queryset=Tag.objects.all()
     )
     tag = django_filters.ModelMultipleChoiceFilter(
         field_name='tag__slug',
         queryset=Tag.objects.all(),
-        distinct=False,
         to_field_name='slug',
     )
 
@@ -637,12 +614,10 @@ class ConfigContextProfileFilterSet(PrimaryModelFilterSet):
     )
     data_source_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data source (ID)'),
     )
     data_file_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data file (ID)'),
     )
 
@@ -670,13 +645,11 @@ class ConfigContextFilterSet(OwnerFilterMixin, ChangeLoggedModelFilterSet):
     )
     profile_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ConfigContextProfile.objects.all(),
-        distinct=False,
         label=_('Profile (ID)'),
     )
     profile = django_filters.ModelMultipleChoiceFilter(
         field_name='profile__name',
         queryset=ConfigContextProfile.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Profile (name)'),
     )
@@ -813,12 +786,10 @@ class ConfigContextFilterSet(OwnerFilterMixin, ChangeLoggedModelFilterSet):
     )
     data_source_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data source (ID)'),
     )
     data_file_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data file (ID)'),
     )
 
@@ -844,12 +815,10 @@ class ConfigTemplateFilterSet(OwnerFilterMixin, ChangeLoggedModelFilterSet):
     )
     data_source_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data source (ID)'),
     )
     data_file_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DataSource.objects.all(),
-        distinct=False,
         label=_('Data file (ID)'),
     )
     tag = TagFilter()

netbox/extras/tables/tables.py

@@ -39,20 +39,9 @@ __all__ = (
 )
 
 IMAGEATTACHMENT_IMAGE = """
-{% load thumbnail %}
 {% if record.image %}
-  {% thumbnail record.image "400x400" as tn %}
-    <a href="{{ record.get_absolute_url }}"
-       class="image-preview"
-       data-preview-url="{{ tn.url }}"
-       data-bs-placement="left"
-       title="{{ record.filename }}"
-       rel="noopener noreferrer"
-       target="_blank"
-       aria-label="{{ record.filename }}">
-      <i class="mdi mdi-image"></i>
-    </a>
-  {% endthumbnail %}
+  <a href="{{ record.image.url }}" target="_blank" class="image-preview" data-bs-placement="top">
+    <i class="mdi mdi-image"></i></a>
 {% endif %}
 <a href="{{ record.get_absolute_url }}">{{ record.filename|truncate_middle:16 }}</a>
 """

netbox/ipam/filtersets.py

@@ -166,13 +166,11 @@ class AggregateFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFi
     )
     rir_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RIR.objects.all(),
-        distinct=False,
         label=_('RIR (ID)'),
     )
     rir = django_filters.ModelMultipleChoiceFilter(
         field_name='rir__slug',
         queryset=RIR.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('RIR (slug)'),
     )
@@ -208,13 +206,11 @@ class AggregateFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFi
 class ASNRangeFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
     rir_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RIR.objects.all(),
-        distinct=False,
         label=_('RIR (ID)'),
     )
     rir = django_filters.ModelMultipleChoiceFilter(
         field_name='rir__slug',
         queryset=RIR.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('RIR (slug)'),
     )
@@ -236,13 +232,11 @@ class ASNRangeFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
 class ASNFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
     rir_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RIR.objects.all(),
-        distinct=False,
         label=_('RIR (ID)'),
     )
     rir = django_filters.ModelMultipleChoiceFilter(
         field_name='rir__slug',
         queryset=RIR.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('RIR (slug)'),
     )
@@ -348,13 +342,11 @@ class PrefixFilterSet(PrimaryModelFilterSet, ScopedFilterSet, TenancyFilterSet,
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VRF.objects.all(),
-        distinct=False,
         label=_('VRF'),
     )
     vrf = django_filters.ModelMultipleChoiceFilter(
         field_name='vrf__rd',
         queryset=VRF.objects.all(),
-        distinct=False,
         to_field_name='rd',
         label=_('VRF (RD)'),
     )
@@ -372,20 +364,17 @@ class PrefixFilterSet(PrimaryModelFilterSet, ScopedFilterSet, TenancyFilterSet,
     vlan_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='vlan__group',
         queryset=VLANGroup.objects.all(),
-        distinct=False,
         to_field_name='id',
         label=_('VLAN Group (ID)'),
     )
     vlan_group = django_filters.ModelMultipleChoiceFilter(
         field_name='vlan__group__slug',
         queryset=VLANGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('VLAN Group (slug)'),
     )
     vlan_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VLAN.objects.all(),
-        distinct=False,
         label=_('VLAN (ID)'),
     )
     vlan_vid = django_filters.NumberFilter(
@@ -394,19 +383,16 @@ class PrefixFilterSet(PrimaryModelFilterSet, ScopedFilterSet, TenancyFilterSet,
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Role.objects.all(),
-        distinct=False,
         label=_('Role (ID)'),
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
         queryset=Role.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Role (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=PrefixStatusChoices,
-        distinct=False,
         null_value=None
     )
 
@@ -500,31 +486,26 @@ class IPRangeFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilt
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VRF.objects.all(),
-        distinct=False,
         label=_('VRF'),
     )
     vrf = django_filters.ModelMultipleChoiceFilter(
         field_name='vrf__rd',
         queryset=VRF.objects.all(),
-        distinct=False,
         to_field_name='rd',
         label=_('VRF (RD)'),
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Role.objects.all(),
-        distinct=False,
         label=_('Role (ID)'),
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
         queryset=Role.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Role (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=IPRangeStatusChoices,
-        distinct=False,
         null_value=None
     )
     parent = MultiValueCharFilter(
@@ -607,13 +588,11 @@ class IPAddressFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFi
     )
     vrf_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VRF.objects.all(),
-        distinct=False,
         label=_('VRF'),
     )
     vrf = django_filters.ModelMultipleChoiceFilter(
         field_name='vrf__rd',
         queryset=VRF.objects.all(),
-        distinct=False,
         to_field_name='rd',
         label=_('VRF (RD)'),
     )
@@ -686,12 +665,10 @@ class IPAddressFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFi
     )
     status = django_filters.MultipleChoiceFilter(
         choices=IPAddressStatusChoices,
-        distinct=False,
         null_value=None
     )
     role = django_filters.MultipleChoiceFilter(
-        choices=IPAddressRoleChoices,
-        distinct=False,
+        choices=IPAddressRoleChoices
     )
     service_id = django_filters.ModelMultipleChoiceFilter(
         field_name='services',
@@ -701,7 +678,6 @@ class IPAddressFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFi
     nat_inside_id = django_filters.ModelMultipleChoiceFilter(
         field_name='nat_inside',
         queryset=IPAddress.objects.all(),
-        distinct=False,
         label=_('NAT inside IP address (ID)'),
     )
 
@@ -823,12 +799,10 @@ class IPAddressFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFi
 @register_filterset
 class FHRPGroupFilterSet(PrimaryModelFilterSet):
     protocol = django_filters.MultipleChoiceFilter(
-        choices=FHRPGroupProtocolChoices,
-        distinct=False,
+        choices=FHRPGroupProtocolChoices
     )
     auth_type = django_filters.MultipleChoiceFilter(
-        choices=FHRPGroupAuthTypeChoices,
-        distinct=False,
+        choices=FHRPGroupAuthTypeChoices
     )
     related_ip = django_filters.ModelMultipleChoiceFilter(
         queryset=IPAddress.objects.all(),
@@ -875,7 +849,6 @@ class FHRPGroupAssignmentFilterSet(ChangeLoggedModelFilterSet):
     interface_type = ContentTypeFilter()
     group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=FHRPGroup.objects.all(),
-        distinct=False,
         label=_('Group (ID)'),
     )
     device = MultiValueCharFilter(
@@ -1006,43 +979,36 @@ class VLANFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
-        distinct=False,
         label=_('Site (ID)'),
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
         queryset=Site.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Site (slug)'),
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VLANGroup.objects.all(),
-        distinct=False,
         label=_('Group (ID)'),
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
         queryset=VLANGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Group'),
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Role.objects.all(),
-        distinct=False,
         label=_('Role (ID)'),
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
         queryset=Role.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Role (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=VLANStatusChoices,
-        distinct=False,
         null_value=None
     )
     available_at_site = django_filters.ModelChoiceFilter(
@@ -1058,12 +1024,10 @@ class VLANFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
         method='get_for_virtualmachine'
     )
     qinq_role = django_filters.MultipleChoiceFilter(
-        choices=VLANQinQRoleChoices,
-        distinct=False,
+        choices=VLANQinQRoleChoices
     )
     qinq_svlan_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VLAN.objects.all(),
-        distinct=False,
         label=_('Q-in-Q SVLAN (ID)'),
     )
     qinq_svlan_vid = MultiValueNumberFilter(
@@ -1158,13 +1122,11 @@ class VLANTranslationPolicyFilterSet(PrimaryModelFilterSet):
 class VLANTranslationRuleFilterSet(NetBoxModelFilterSet):
     policy_id = django_filters.ModelMultipleChoiceFilter(
         queryset=VLANTranslationPolicy.objects.all(),
-        distinct=False,
         label=_('VLAN Translation Policy (ID)'),
     )
     policy = django_filters.ModelMultipleChoiceFilter(
         field_name='policy__name',
         queryset=VLANTranslationPolicy.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('VLAN Translation Policy (name)'),
     )
@@ -1303,26 +1265,22 @@ class PrimaryIPFilterSet(django_filters.FilterSet):
     primary_ip4_id = django_filters.ModelMultipleChoiceFilter(
         field_name='primary_ip4',
         queryset=IPAddress.objects.all(),
-        distinct=False,
         label=_('Primary IPv4 (ID)'),
     )
     primary_ip4 = django_filters.ModelMultipleChoiceFilter(
         field_name='primary_ip4__address',
         queryset=IPAddress.objects.all(),
-        distinct=False,
         to_field_name='address',
         label=_('Primary IPv4 (address)'),
     )
     primary_ip6_id = django_filters.ModelMultipleChoiceFilter(
         field_name='primary_ip6',
         queryset=IPAddress.objects.all(),
-        distinct=False,
         label=_('Primary IPv6 (ID)'),
     )
     primary_ip6 = django_filters.ModelMultipleChoiceFilter(
         field_name='primary_ip6__address',
         queryset=IPAddress.objects.all(),
-        distinct=False,
         to_field_name='address',
         label=_('Primary IPv6 (address)'),
     )

netbox/netbox/settings.py

@@ -408,11 +408,6 @@ if CACHING_REDIS_CA_CERT_PATH:
     CACHES['default']['OPTIONS'].setdefault('CONNECTION_POOL_KWARGS', {})
     CACHES['default']['OPTIONS']['CONNECTION_POOL_KWARGS']['ssl_ca_certs'] = CACHING_REDIS_CA_CERT_PATH
 
-# Merge in KWARGS for additional parameters
-if caching_redis_kwargs := REDIS['caching'].get('KWARGS'):
-    CACHES['default']['OPTIONS'].setdefault('CONNECTION_POOL_KWARGS', {})
-    CACHES['default']['OPTIONS']['CONNECTION_POOL_KWARGS'].update(caching_redis_kwargs)
-
 
 #
 # Sessions
@@ -778,7 +773,7 @@ SPECTACULAR_SETTINGS = {
     'COMPONENT_SPLIT_REQUEST': True,
     'REDOC_DIST': 'SIDECAR',
     'SERVERS': [{
-        'url': '',
+        'url': BASE_PATH,
         'description': 'NetBox',
     }],
     'SWAGGER_UI_DIST': 'SIDECAR',
@@ -822,11 +817,6 @@ if TASKS_REDIS_CA_CERT_PATH:
     RQ_PARAMS.setdefault('REDIS_CLIENT_KWARGS', {})
     RQ_PARAMS['REDIS_CLIENT_KWARGS']['ssl_ca_certs'] = TASKS_REDIS_CA_CERT_PATH
 
-# Merge in KWARGS for additional parameters
-if tasks_redis_kwargs := TASKS_REDIS.get('KWARGS'):
-    RQ_PARAMS.setdefault('REDIS_CLIENT_KWARGS', {})
-    RQ_PARAMS['REDIS_CLIENT_KWARGS'].update(tasks_redis_kwargs)
-
 # Define named RQ queues
 RQ_QUEUES = {
     RQ_QUEUE_HIGH: RQ_PARAMS,

netbox/netbox/ui/panels.py

@@ -43,15 +43,18 @@ class Panel:
     Parameters:
         title (str): The human-friendly title of the panel
         actions (list): An iterable of PanelActions to include in the panel header
+        template_name (str): Overrides the default template name, if defined
     """
     template_name = None
     title = None
     actions = None
 
-    def __init__(self, title=None, actions=None):
+    def __init__(self, title=None, actions=None, template_name=None):
         if title is not None:
             self.title = title
         self.actions = actions or self.actions or []
+        if template_name is not None:
+            self.template_name = template_name
 
     def get_context(self, context):
         """
@@ -316,9 +319,8 @@ class TemplatePanel(Panel):
     Parameters:
         template_name (str): The name of the template to render
     """
-    def __init__(self, template_name, **kwargs):
-        super().__init__(**kwargs)
-        self.template_name = template_name
+    def __init__(self, template_name):
+        super().__init__(template_name=template_name)
 
     def render(self, context):
         # Pass the entire context to the template

netbox/project-static/src/bs.ts

@@ -150,22 +150,20 @@ function initSidebarAccordions(): void {
  */
 function initImagePreview(): void {
   for (const element of getElements<HTMLAnchorElement>('a.image-preview')) {
-    // Prefer a thumbnail URL for the popover (so we don't preload full-size images),
-    // but fall back to the link target if no thumbnail was provided.
-    const previewUrl = element.dataset.previewUrl ?? element.href;
-    const image = createElement('img', { src: previewUrl });
+    // Generate a max-width that's a quarter of the screen's width (note - the actual element
+    // width will be slightly larger due to the popover body's padding).
+    const maxWidth = `${Math.round(window.innerWidth / 4)}px`;
 
-    // Ensure lazy loading and async decoding
-    image.loading = 'lazy';
-    image.decoding = 'async';
+    // Create an image element that uses the linked image as its `src`.
+    const image = createElement('img', { src: element.href });
+    image.style.maxWidth = maxWidth;
 
     // Create a container for the image.
     const content = createElement('div', null, null, [image]);
 
     // Initialize the Bootstrap Popper instance.
     new Popover(element, {
-      // Attach this custom class to the popover so that its styling
-      // can be controlled via CSS.
+      // Attach this custom class to the popover so that it styling can be controlled via CSS.
       customClass: 'image-preview-popover',
       trigger: 'hover',
       html: true,

netbox/project-static/styles/custom/_misc.scss

@@ -89,29 +89,6 @@ img.plugin-icon {
   }
 }
 
-// Image preview popover (rendered for <a.image-preview> by initImagePreview())
-.image-preview-popover {
-  --bs-popover-max-width: clamp(240px, 25vw, 640px);
-
-  .popover-header {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .popover-body {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  img {
-    display: block;
-    max-width: 100%;
-    max-height: clamp(160px, 33vh, 640px);
-    height: auto;
-  }
-}
-
-
 body[data-bs-theme=dark] {
   // Assuming icon is black/white line art, invert it and tone down brightness
   img.plugin-icon {

netbox/project-static/styles/overrides/_tabler.scss

@@ -5,16 +5,6 @@
   font-variant-ligatures: none;
 }
 
-// TODO: Remove when Tabler releases fix for https://github.com/tabler/tabler/issues/2271
-// and NetBox upgrades to that version. Fix merged to Tabler dev branch in PR #2548.
-:root,
-:host {
-  @include media-breakpoint-up(lg) {
-    margin-left: 0;
-    scrollbar-gutter: stable;
-  }
-}
-
 // Restore default foreground & background colors for <pre> blocks
 pre {
   background-color: transparent;

netbox/templates/core/configrevision.html

@@ -33,7 +33,7 @@
     <div class="col col-md-12">
       <div class="card">
         <h2 class="card-header">{% trans "Configuration Data" %}</h2>
-        {% include 'core/inc/config_data.html' %}
+        {% include 'core/inc/config_data.html' with config=object.data %}
       </div>
 
       <div class="card">

netbox/templates/core/inc/config_data.html

@@ -95,7 +95,7 @@
   <tr>
     <th scope="row" class="ps-3">{% trans "Custom validators" %}</th>
     {% if config.CUSTOM_VALIDATORS %}
-      <td><pre class="p-0">{{ config.CUSTOM_VALIDATORS }}</pre></td>
+      <td><pre>{{ config.CUSTOM_VALIDATORS }}</pre></td>
     {% else %}
       <td>{{ ''|placeholder }}</td>
     {% endif %}
@@ -103,7 +103,7 @@
   <tr>
     <th scope="row" class="border-0 ps-3">{% trans "Protection rules" %}</th>
     {% if config.PROTECTION_RULES %}
-      <td class="border-0"><pre class="p-0">{{ config.PROTECTION_RULES }}</pre></td>
+      <td class="border-0"><pre>{{ config.PROTECTION_RULES }}</pre></td>
     {% else %}
       <td class="border-0">{{ ''|placeholder }}</td>
     {% endif %}
@@ -116,7 +116,7 @@
   <tr>
     <th scope="row" class="border-0 ps-3">{% trans "Default preferences" %}</th>
     {% if config.DEFAULT_USER_PREFERENCES %}
-      <td class="border-0"><pre class="p-0">{{ config.DEFAULT_USER_PREFERENCES }}</pre></td>
+      <td class="border-0"><pre>{{ config.DEFAULT_USER_PREFERENCES|json }}</pre></td>
     {% else %}
       <td class="border-0">{{ ''|placeholder }}</td>
     {% endif %}

netbox/templates/dcim/devicerole.html

@@ -15,67 +15,3 @@
     </a>
   {% endif %}
 {% endblock extra_controls %}
-
-{% block content %}
-<div class="row mb-3">
-	<div class="col col-12 col-md-6">
-    <div class="card">
-      <h2 class="card-header">{% trans "Device Role" %}</h2>
-      <table class="table table-hover attr-table">
-        <tr>
-          <th scope="row">{% trans "Name" %}</th>
-          <td>{{ object.name }}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Description" %}</th>
-          <td>{{ object.description|placeholder }}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Parent" %}</th>
-          <td>{{ object.parent|linkify|placeholder }}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Color" %}</th>
-          <td>
-            <span class="badge color-label" style="background-color: #{{ object.color }}">&nbsp;</span>
-          </td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "VM Role" %}</th>
-          <td>{% checkmark object.vm_role %}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Config Template" %}</th>
-          <td>{{ object.config_template|linkify|placeholder }}</td>
-        </tr>
-      </table>
-    </div>
-    {% include 'inc/panels/tags.html' %}
-    {% plugin_left_page object %}
-	</div>
-	<div class="col col-12 col-md-6">
-    {% include 'inc/panels/related_objects.html' %}
-    {% include 'inc/panels/custom_fields.html' %}
-    {% include 'inc/panels/comments.html' %}
-    {% plugin_right_page object %}
-  </div>
-</div>
-<div class="row mb-3">
-	<div class="col col-md-12">
-    <div class="card">
-      <h2 class="card-header">
-        {% trans "Child Device Roles" %}
-        {% if perms.dcim.add_devicerole %}
-          <div class="card-actions">
-            <a href="{% url 'dcim:devicerole_add' %}?parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-ghost-primary btn-sm">
-              <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Device Role" %}
-            </a>
-          </div>
-        {% endif %}
-      </h2>
-      {% htmx_table 'dcim:devicerole_list' parent_id=object.pk %}
-    </div>
-    {% plugin_full_width_page object %}
-  </div>
-</div>
-{% endblock %}

netbox/templates/dcim/module.html

@@ -47,7 +47,7 @@
   {% endif %}
 {% endblock %}
 
-{% block content %}
+{% block contentx %}
 <div class="row">
 	<div class="col col-12 col-md-6">
     <div class="card">

netbox/templates/dcim/moduletype.html

@@ -1,7 +1,4 @@
 {% extends 'generic/object.html' %}
-{% load buttons %}
-{% load helpers %}
-{% load plugins %}
 {% load i18n %}
 
 {% block title %}{{ object.manufacturer }} {{ object.model }}{% endblock %}
@@ -14,92 +11,5 @@
 {% endblock %}
 
 {% block extra_controls %}
-  {%  include 'dcim/inc/moduletype_buttons.html' %}
-{% endblock %}
-
-{% block content %}
-  <div class="row">
-    <div class="col col-12 col-md-6">
-      <div class="card">
-        <h2 class="card-header">{% trans "Module Type" %}</h2>
-        <table class="table table-hover attr-table">
-          <tr>
-            <th scope="row">{% trans "Profile" %}</th>
-            <td>{{ object.profile|linkify|placeholder }}</td>
-          </tr>
-          <tr>
-            <th scope="row">{% trans "Manufacturer" %}</th>
-            <td>{{ object.manufacturer|linkify }}</td>
-          </tr>
-          <tr>
-            <th scope="row">{% trans "Model Name" %}</th>
-            <td>{{ object.model }}</td>
-          </tr>
-          <tr>
-            <th scope="row">{% trans "Part Number" %}</th>
-            <td>{{ object.part_number|placeholder }}</td>
-          </tr>
-          <tr>
-            <th scope="row">{% trans "Description" %}</th>
-            <td>{{ object.description|placeholder }}</td>
-          </tr>
-          <tr>
-            <th scope="row">{% trans "Airflow" %}</th>
-            <td>{{ object.get_airflow_display|placeholder }}</td>
-          </tr>
-          <tr>
-            <th scope="row">{% trans "Weight" %}</th>
-            <td>
-            {% if object.weight %}
-              {{ object.weight|floatformat }} {{ object.get_weight_unit_display }}
-            {% else %}
-              {{ ''|placeholder }}
-            {% endif %}
-            </td>
-          </tr>
-        </table>
-      </div>
-      {% include 'inc/panels/tags.html' %}
-      {% include 'inc/panels/comments.html' %}
-      {% plugin_left_page object %}
-    </div>
-    <div class="col col-12 col-md-6">
-      <div class="card">
-        <h2 class="card-header">{% trans "Attributes" %}</h2>
-        {% if not object.profile %}
-          <div class="card-body text-muted">
-            {% trans "No profile assigned" %}
-          </div>
-        {% elif object.attributes %}
-          <table class="table table-hover attr-table">
-            {% for k, v in object.attributes.items %}
-              <tr>
-                <th scope="row">{{ k }}</th>
-                <td>
-                  {% if v is True or v is False %}
-                    {% checkmark v %}
-                  {% else %}
-                    {{ v|placeholder }}
-                  {% endif %}
-                </td>
-              </tr>
-            {% endfor %}
-          </table>
-        {% else %}
-          <div class="card-body text-muted">
-            {% trans "None" %}
-          </div>
-        {% endif %}
-      </div>
-      {% include 'inc/panels/related_objects.html' %}
-      {% include 'inc/panels/custom_fields.html' %}
-      {% include 'inc/panels/image_attachments.html' %}
-      {% plugin_right_page object %}
-    </div>
-  </div>
-  <div class="row">
-    <div class="col col-md-12">
-      {% plugin_full_width_page object %}
-    </div>
-  </div>
+  {% include 'dcim/inc/moduletype_buttons.html' %}
 {% endblock %}

netbox/templates/dcim/panels/module_type.html

@@ -0,0 +1,27 @@
+{% extends "ui/panels/_base.html" %}
+{% load helpers i18n %}
+
+{% block panel_content %}
+  <table class="table table-hover attr-table">
+    <tr>
+      <th scope="row">{% trans "Manufacturer" %}</th>
+      <td>{{ object.module_type.manufacturer|linkify }}</td>
+    </tr>
+    <tr>
+      <th scope="row">{% trans "Model" %}</th>
+      <td>{{ object.module_type|linkify }}</td>
+    </tr>
+    {% for k, v in object.module_type.attributes.items %}
+      <tr>
+        <th scope="row">{{ k }}</th>
+        <td>
+          {% if v is True or v is False %}
+            {% checkmark v %}
+          {% else %}
+            {{ v|placeholder }}
+          {% endif %}
+        </td>
+      </tr>
+    {% endfor %}
+  </table>
+{% endblock panel_content %}

netbox/templates/dcim/panels/module_type_attributes.html

@@ -0,0 +1,29 @@
+{% extends "ui/panels/_base.html" %}
+{% load helpers i18n %}
+
+{% block panel_content %}
+  {% if not object.profile %}
+    <div class="card-body text-muted">
+      {% trans "No profile assigned" %}
+    </div>
+  {% elif object.attributes %}
+    <table class="table table-hover attr-table">
+      {% for k, v in object.attributes.items %}
+        <tr>
+          <th scope="row">{{ k }}</th>
+          <td>
+            {% if v is True or v is False %}
+              {% checkmark v %}
+            {% else %}
+              {{ v|placeholder }}
+            {% endif %}
+          </td>
+        </tr>
+      {% endfor %}
+    </table>
+  {% else %}
+    <div class="card-body text-muted">
+      {% trans "None" %}
+    </div>
+  {% endif %}
+{% endblock panel_content %}

netbox/templates/dcim/platform.html

@@ -18,61 +18,3 @@
     </a>
   {% endif %}
 {% endblock extra_controls %}
-
-{% block content %}
-<div class="row mb-3">
-	<div class="col col-12 col-md-6">
-    <div class="card">
-      <h2 class="card-header">{% trans "Platform" %}</h2>
-      <table class="table table-hover attr-table">
-        <tr>
-          <th scope="row">{% trans "Name" %}</th>
-          <td>{{ object.name }}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Description" %}</th>
-          <td>{{ object.description|placeholder }}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Parent" %}</th>
-          <td>{{ object.parent|linkify|placeholder }}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Manufacturer" %}</th>
-          <td>{{ object.manufacturer|linkify|placeholder }}</td>
-        </tr>
-        <tr>
-          <th scope="row">{% trans "Config Template" %}</th>
-          <td>{{ object.config_template|linkify|placeholder }}</td>
-        </tr>
-      </table>
-    </div>
-    {% include 'inc/panels/tags.html' %}
-    {% plugin_left_page object %}
-	</div>
-	<div class="col col-12 col-md-6">
-    {% include 'inc/panels/related_objects.html' %}
-    {% include 'inc/panels/custom_fields.html' %}
-    {% include 'inc/panels/comments.html' %}
-    {% plugin_right_page object %}
-  </div>
-</div>
-<div class="row mb-3">
-	<div class="col col-md-12">
-    <div class="card">
-      <h2 class="card-header">
-        {% trans "Child Platforms" %}
-        {% if perms.dcim.add_platform %}
-          <div class="card-actions">
-            <a href="{% url 'dcim:platform_add' %}?parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-ghost-primary btn-sm">
-              <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Platform" %}
-            </a>
-          </div>
-        {% endif %}
-      </h2>
-      {% htmx_table 'dcim:platform_list' parent_id=object.pk %}
-    </div>
-    {% plugin_full_width_page object %}
-  </div>
-</div>
-{% endblock %}

netbox/templates/virtualization/panels/virtual_machine_resources.html

@@ -1,34 +0,0 @@
-{% load helpers %}
-{% load i18n %}
-
-<div class="card">
-  <h2 class="card-header">{% trans "Resources" %}</h2>
-  <table class="table table-hover attr-table">
-    <tr>
-      <th scope="row"><i class="mdi mdi-gauge"></i> {% trans "Virtual CPUs" %}</th>
-      <td>{{ object.vcpus|placeholder }}</td>
-    </tr>
-    <tr>
-      <th scope="row"><i class="mdi mdi-chip"></i> {% trans "Memory" %}</th>
-      <td>
-        {% if object.memory %}
-          <span title={{ object.memory }}>{{ object.memory|humanize_ram_megabytes }}</span>
-        {% else %}
-          {{ ''|placeholder }}
-        {% endif %}
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">
-        <i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}
-      </th>
-      <td>
-        {% if object.disk %}
-          {{ object.disk|humanize_disk_megabytes }}
-        {% else %}
-          {{ ''|placeholder }}
-        {% endif %}
-      </td>
-    </tr>
-  </table>
-</div>

netbox/templates/virtualization/virtualmachine.html

@@ -1 +1,199 @@
 {% extends 'virtualization/virtualmachine/base.html' %}
+{% load buttons %}
+{% load static %}
+{% load helpers %}
+{% load plugins %}
+{% load i18n %}
+
+{% block content %}
+<div class="row my-3">
+	<div class="col col-12 col-md-6">
+        <div class="card">
+            <h2 class="card-header">{% trans "Virtual Machine" %}</h2>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">{% trans "Name" %}</th>
+                    <td>{{ object }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Status" %}</th>
+                    <td>{% badge object.get_status_display bg_color=object.get_status_color %}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Start on boot" %}</th>
+                    <td>{% badge object.get_start_on_boot_display bg_color=object.get_start_on_boot_color %}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Role" %}</th>
+                    <td>{{ object.role|linkify|placeholder }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Platform" %}</th>
+                    <td>{{ object.platform|linkify|placeholder }}</td>
+                </tr>
+                <tr>
+                  <th scope="row">{% trans "Description" %}</th>
+                  <td>{{ object.description|placeholder }}</td>
+                </tr>
+                <tr>
+                  <th scope="row">{% trans "Serial Number" %}</th>
+                  <td>{{ object.serial|placeholder }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Tenant" %}</th>
+                    <td>
+                        {% if object.tenant.group %}
+                            {{ object.tenant.group|linkify }} /
+                        {% endif %}
+                        {{ object.tenant|linkify|placeholder }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Config Template" %}</th>
+                    <td>{{ object.config_template|linkify|placeholder }}</td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Primary IPv4" %}</th>
+                    <td>
+                      {% if object.primary_ip4 %}
+                        <a href="{% url 'ipam:ipaddress' pk=object.primary_ip4.pk %}" id="primary_ip4">{{ object.primary_ip4.address.ip }}</a>
+                        {% if object.primary_ip4.nat_inside %}
+                          ({% trans "NAT for" %} <a href="{{ object.primary_ip4.nat_inside.get_absolute_url }}">{{ object.primary_ip4.nat_inside.address.ip }}</a>)
+                        {% elif object.primary_ip4.nat_outside.exists %}
+                          ({% trans "NAT" %}: {% for nat in object.primary_ip4.nat_outside.all %}<a href="{{ nat.get_absolute_url }}">{{ nat.address.ip }}</a>{% if not forloop.last %}, {% endif %}{% endfor %})
+                        {% endif %}
+                        {% copy_content "primary_ip4" %}
+                      {% else %}
+                        {{ ''|placeholder }}
+                      {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Primary IPv6" %}</th>
+                    <td>
+                      {% if object.primary_ip6 %}
+                        <a href="{% url 'ipam:ipaddress' pk=object.primary_ip6.pk %}" id="primary_ip6">{{ object.primary_ip6.address.ip }}</a>
+                        {% if object.primary_ip6.nat_inside %}
+                          ({% trans "NAT for" %} <a href="{{ object.primary_ip6.nat_inside.get_absolute_url }}">{{ object.primary_ip6.nat_inside.address.ip }}</a>)
+                        {% elif object.primary_ip6.nat_outside.exists %}
+                          ({% trans "NAT" %}: {% for nat in object.primary_ip6.nat_outside.all %}<a href="{{ nat.get_absolute_url }}">{{ nat.address.ip }}</a>{% if not forloop.last %}, {% endif %}{% endfor %})
+                        {% endif %}
+                        {% copy_content "primary_ip6" %}
+                      {% else %}
+                        {{ ''|placeholder }}
+                      {% endif %}
+                    </td>
+                </tr>
+            </table>
+        </div>
+        {% include 'inc/panels/custom_fields.html' %}
+        {% include 'inc/panels/tags.html' %}
+        {% include 'inc/panels/comments.html' %}
+        {% plugin_left_page object %}
+    </div>
+	<div class="col col-12 col-md-6">
+        <div class="card">
+            <h2 class="card-header">{% trans "Cluster" %}</h2>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row">{% trans "Site" %}</th>
+                    <td>
+                        {{ object.site|linkify|placeholder }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Cluster" %}</th>
+                    <td>
+                        {% if object.cluster.group %}
+                            {{ object.cluster.group|linkify }} /
+                        {% endif %}
+                        {{ object.cluster|linkify|placeholder }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Cluster Type" %}</th>
+                    <td>
+                        {{ object.cluster.type|linkify|placeholder }}
+                    </td>
+                </tr>
+                <tr>
+                    <th scope="row">{% trans "Device" %}</th>
+                    <td>
+                        {{ object.device|linkify|placeholder }}
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div class="card">
+            <h2 class="card-header">{% trans "Resources" %}</h2>
+            <table class="table table-hover attr-table">
+                <tr>
+                    <th scope="row"><i class="mdi mdi-gauge"></i> {% trans "Virtual CPUs" %}</th>
+                    <td>{{ object.vcpus|placeholder }}</td>
+                </tr>
+                <tr>
+                    <th scope="row"><i class="mdi mdi-chip"></i> {% trans "Memory" %}</th>
+                    <td>
+                        {% if object.memory %}
+                            <span title={{ object.memory }}>{{ object.memory|humanize_ram_megabytes }}</span>
+                        {% else %}
+                            {{ ''|placeholder }}
+                        {% endif %}
+                    </td>
+                </tr>
+                <tr>
+                  <th scope="row">
+                    <i class="mdi mdi-harddisk"></i> {% trans "Disk Space" %}
+                  </th>
+                  <td>
+                    {% if object.disk %}
+                      {{ object.disk|humanize_disk_megabytes }}
+                    {% else %}
+                      {{ ''|placeholder }}
+                    {% endif %}
+                  </td>
+                </tr>
+            </table>
+        </div>
+        <div class="card">
+          <h2 class="card-header">
+            {% trans "Application Services" %}
+            {% if perms.ipam.add_service %}
+              <div class="card-actions">
+                <a href="{% url 'ipam:service_add' %}?parent_object_type={{ object|content_type_id }}&parent={{ object.pk }}" class="btn btn-ghost-primary btn-sm">
+                  <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add an application service" %}
+                </a>
+              </div>
+            {% endif %}
+          </h2>
+          {% htmx_table 'ipam:service_list' virtual_machine_id=object.pk %}
+        </div>
+        {% include 'inc/panels/image_attachments.html' %}
+        {% plugin_right_page object %}
+    </div>
+</div>
+
+<div class="row">
+  <div class="col col-md-12">
+    <div class="card">
+      <h2 class="card-header">
+        {% trans "Virtual Disks" %}
+        {% if perms.virtualization.add_virtualdisk %}
+          <div class="card-actions">
+            <a href="{% url 'virtualization:virtualdisk_add' %}?device={{ object.device.pk }}&virtual_machine={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-ghost-primary btn-sm">
+              <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Virtual Disk" %}
+            </a>
+          </div>
+        {% endif %}
+      </h2>
+      {% htmx_table 'virtualization:virtualdisk_list' virtual_machine_id=object.pk %}
+    </div>
+  </div>
+</div>
+
+<div class="row">
+    <div class="col col-md-12">
+        {% plugin_full_width_page object %}
+    </div>
+</div>
+{% endblock %}

netbox/templates/virtualization/virtualmachine/attrs/ipaddress.html

@@ -1,10 +0,0 @@
-{% load i18n %}
-<a href="{{ value.get_absolute_url }}"{% if name %} id="attr_{{ name }}"{% endif %}>{{ value.address.ip }}</a>
-{% if value.nat_inside %}
-  ({% trans "NAT for" %} <a href="{{ value.nat_inside.get_absolute_url }}">{{ value.nat_inside.address.ip }}</a>)
-{% elif value.nat_outside.exists %}
-  ({% trans "NAT" %}: {% for nat in value.nat_outside.all %}<a href="{{ nat.get_absolute_url }}">{{ nat.address.ip }}</a>{% if not forloop.last %}, {% endif %}{% endfor %})
-{% endif %}
-<a class="btn btn-sm btn-primary copy-content" data-clipboard-target="#attr_{{ name }}" title="{% trans "Copy to clipboard" %}">
-  <i class="mdi mdi-content-copy"></i>
-</a>

netbox/tenancy/filtersets.py

@@ -29,13 +29,11 @@ __all__ = (
 class ContactGroupFilterSet(NestedGroupModelFilterSet):
     parent_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ContactGroup.objects.all(),
-        distinct=False,
         label=_('Parent contact group (ID)'),
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
         queryset=ContactGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Parent contact group (slug)'),
     )
@@ -115,7 +113,6 @@ class ContactAssignmentFilterSet(NetBoxModelFilterSet):
     object_type = ContentTypeFilter()
     contact_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Contact.objects.all(),
-        distinct=False,
         label=_('Contact (ID)'),
     )
     group_id = TreeNodeMultipleChoiceFilter(
@@ -133,13 +130,11 @@ class ContactAssignmentFilterSet(NetBoxModelFilterSet):
     )
     role_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ContactRole.objects.all(),
-        distinct=False,
         label=_('Contact role (ID)'),
     )
     role = django_filters.ModelMultipleChoiceFilter(
         field_name='role__slug',
         queryset=ContactRole.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Contact role (slug)'),
     )
@@ -184,13 +179,11 @@ class ContactModelFilterSet(django_filters.FilterSet):
 class TenantGroupFilterSet(NestedGroupModelFilterSet):
     parent_id = django_filters.ModelMultipleChoiceFilter(
         queryset=TenantGroup.objects.all(),
-        distinct=False,
         label=_('Parent tenant group (ID)'),
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
         queryset=TenantGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Parent tenant group (slug)'),
     )
@@ -263,12 +256,10 @@ class TenancyFilterSet(django_filters.FilterSet):
     )
     tenant_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Tenant.objects.all(),
-        distinct=False,
         label=_('Tenant (ID)'),
     )
     tenant = django_filters.ModelMultipleChoiceFilter(
         queryset=Tenant.objects.all(),
-        distinct=False,
         field_name='tenant__slug',
         to_field_name='slug',
         label=_('Tenant (slug)'),

netbox/users/filterset_mixins.py

@@ -14,26 +14,22 @@ class OwnerFilterMixin(django_filters.FilterSet):
     """
     owner_group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=OwnerGroup.objects.all(),
-        distinct=False,
         field_name='owner__group',
         label=_('Owner Group (ID)'),
     )
     owner_group = django_filters.ModelMultipleChoiceFilter(
         queryset=OwnerGroup.objects.all(),
-        distinct=False,
         field_name='owner__group__name',
         to_field_name='name',
         label=_('Owner Group (name)'),
     )
     owner_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Owner.objects.all(),
-        distinct=False,
         label=_('Owner (ID)'),
     )
     owner = django_filters.ModelMultipleChoiceFilter(
         field_name='owner__name',
         queryset=Owner.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Owner (name)'),
     )

netbox/users/filtersets.py

@@ -131,13 +131,11 @@ class TokenFilterSet(BaseFilterSet):
     user_id = django_filters.ModelMultipleChoiceFilter(
         field_name='user',
         queryset=User.objects.all(),
-        distinct=False,
         label=_('User'),
     )
     user = django_filters.ModelMultipleChoiceFilter(
         field_name='user__username',
         queryset=User.objects.all(),
-        distinct=False,
         to_field_name='username',
         label=_('User (name)'),
     )
@@ -282,13 +280,11 @@ class OwnerFilterSet(BaseFilterSet):
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=OwnerGroup.objects.all(),
-        distinct=False,
         label=_('Group (ID)'),
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__name',
         queryset=OwnerGroup.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Group (name)'),
     )

netbox/users/tables.py

@@ -24,7 +24,6 @@ class TokenTable(NetBoxTable):
     token = columns.TemplateColumn(
         verbose_name=_('token'),
         template_code=TOKEN,
-        orderable=False,
     )
     enabled = columns.BooleanColumn(
         verbose_name=_('Enabled')

netbox/users/tests/test_tables.py

@@ -1,24 +0,0 @@
-from django.test import RequestFactory, tag, TestCase
-
-from users.models import Token
-from users.tables import TokenTable
-
-
-class TokenTableTest(TestCase):
-    @tag('regression')
-    def test_every_orderable_field_does_not_throw_exception(self):
-        tokens = Token.objects.all()
-        disallowed = {'actions'}
-
-        orderable_columns = [
-            column.name for column in TokenTable(tokens).columns
-            if column.orderable and column.name not in disallowed
-        ]
-        fake_request = RequestFactory().get("/")
-
-        for col in orderable_columns:
-            for direction in ('-', ''):
-                with self.subTest(col=col, direction=direction):
-                    table = TokenTable(tokens)
-                    table.order_by = f'{direction}{col}'
-                    table.as_html(fake_request)

netbox/virtualization/filtersets.py

@@ -47,31 +47,26 @@ class ClusterGroupFilterSet(OrganizationalModelFilterSet, ContactModelFilterSet)
 class ClusterFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ScopedFilterSet, ContactModelFilterSet):
     group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ClusterGroup.objects.all(),
-        distinct=False,
         label=_('Parent group (ID)'),
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
         queryset=ClusterGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Parent group (slug)'),
     )
     type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ClusterType.objects.all(),
-        distinct=False,
         label=_('Cluster type (ID)'),
     )
     type = django_filters.ModelMultipleChoiceFilter(
         field_name='type__slug',
         queryset=ClusterType.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Cluster type (slug)'),
     )
     status = django_filters.MultipleChoiceFilter(
         choices=ClusterStatusChoices,
-        distinct=False,
         null_value=None
     )
 
@@ -99,61 +94,51 @@ class VirtualMachineFilterSet(
 ):
     status = django_filters.MultipleChoiceFilter(
         choices=VirtualMachineStatusChoices,
-        distinct=False,
         null_value=None
     )
     start_on_boot = django_filters.MultipleChoiceFilter(
         choices=VirtualMachineStartOnBootChoices,
-        distinct=False,
         null_value=None
     )
     cluster_group_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__group',
         queryset=ClusterGroup.objects.all(),
-        distinct=False,
         label=_('Cluster group (ID)'),
     )
     cluster_group = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__group__slug',
         queryset=ClusterGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Cluster group (slug)'),
     )
     cluster_type_id = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__type',
         queryset=ClusterType.objects.all(),
-        distinct=False,
         label=_('Cluster type (ID)'),
     )
     cluster_type = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__type__slug',
         queryset=ClusterType.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Cluster type (slug)'),
     )
     cluster_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Cluster.objects.all(),
-        distinct=False,
         label=_('Cluster (ID)'),
     )
     cluster = django_filters.ModelMultipleChoiceFilter(
         field_name='cluster__name',
         queryset=Cluster.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Cluster'),
     )
     device_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Device.objects.all(),
-        distinct=False,
         label=_('Device (ID)'),
     )
     device = django_filters.ModelMultipleChoiceFilter(
         field_name='device__name',
         queryset=Device.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Device'),
     )
@@ -185,13 +170,11 @@ class VirtualMachineFilterSet(
     )
     site_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Site.objects.all(),
-        distinct=False,
         label=_('Site (ID)'),
     )
     site = django_filters.ModelMultipleChoiceFilter(
         field_name='site__slug',
         queryset=Site.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Site (slug)'),
     )
@@ -233,7 +216,6 @@ class VirtualMachineFilterSet(
     )
     config_template_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ConfigTemplate.objects.all(),
-        distinct=False,
         label=_('Config template (ID)'),
     )
 
@@ -268,39 +250,33 @@ class VMInterfaceFilterSet(CommonInterfaceFilterSet, OwnerFilterMixin, NetBoxMod
     cluster_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__cluster',
         queryset=Cluster.objects.all(),
-        distinct=False,
         label=_('Cluster (ID)'),
     )
     cluster = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__cluster__name',
         queryset=Cluster.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Cluster'),
     )
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine',
         queryset=VirtualMachine.objects.all(),
-        distinct=False,
         label=_('Virtual machine (ID)'),
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__name',
         queryset=VirtualMachine.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Virtual machine'),
     )
     parent_id = django_filters.ModelMultipleChoiceFilter(
         field_name='parent',
         queryset=VMInterface.objects.all(),
-        distinct=False,
         label=_('Parent interface (ID)'),
     )
     bridge_id = django_filters.ModelMultipleChoiceFilter(
         field_name='bridge',
         queryset=VMInterface.objects.all(),
-        distinct=False,
         label=_('Bridged interface (ID)'),
     )
     mac_address = MultiValueMACAddressFilter(
@@ -310,13 +286,11 @@ class VMInterfaceFilterSet(CommonInterfaceFilterSet, OwnerFilterMixin, NetBoxMod
     primary_mac_address_id = django_filters.ModelMultipleChoiceFilter(
         field_name='primary_mac_address',
         queryset=MACAddress.objects.all(),
-        distinct=False,
         label=_('Primary MAC address (ID)'),
     )
     primary_mac_address = django_filters.ModelMultipleChoiceFilter(
         field_name='primary_mac_address__mac_address',
         queryset=MACAddress.objects.all(),
-        distinct=False,
         to_field_name='mac_address',
         label=_('Primary MAC address'),
     )
@@ -339,13 +313,11 @@ class VirtualDiskFilterSet(OwnerFilterMixin, NetBoxModelFilterSet):
     virtual_machine_id = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine',
         queryset=VirtualMachine.objects.all(),
-        distinct=False,
         label=_('Virtual machine (ID)'),
     )
     virtual_machine = django_filters.ModelMultipleChoiceFilter(
         field_name='virtual_machine__name',
         queryset=VirtualMachine.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Virtual machine'),
     )

netbox/virtualization/ui/panels.py

@@ -1,34 +0,0 @@
-from django.utils.translation import gettext_lazy as _
-
-from netbox.ui import attrs, panels
-
-
-class VirtualMachinePanel(panels.ObjectAttributesPanel):
-    name = attrs.TextAttr('name')
-    status = attrs.ChoiceAttr('status')
-    start_on_boot = attrs.ChoiceAttr('start_on_boot')
-    role = attrs.RelatedObjectAttr('role', linkify=True)
-    platform = attrs.NestedObjectAttr('platform', linkify=True, max_depth=3)
-    description = attrs.TextAttr('description')
-    serial = attrs.TextAttr('serial', label=_('Serial number'), style='font-monospace', copy_button=True)
-    tenant = attrs.RelatedObjectAttr('tenant', linkify=True, grouped_by='group')
-    config_template = attrs.RelatedObjectAttr('config_template', linkify=True)
-    primary_ip4 = attrs.TemplatedAttr(
-        'primary_ip4',
-        label=_('Primary IPv4'),
-        template_name='virtualization/virtualmachine/attrs/ipaddress.html',
-    )
-    primary_ip6 = attrs.TemplatedAttr(
-        'primary_ip6',
-        label=_('Primary IPv6'),
-        template_name='virtualization/virtualmachine/attrs/ipaddress.html',
-    )
-
-
-class VirtualMachineClusterPanel(panels.ObjectAttributesPanel):
-    title = _('Cluster')
-
-    site = attrs.RelatedObjectAttr('site', linkify=True, grouped_by='group')
-    cluster = attrs.RelatedObjectAttr('cluster', linkify=True)
-    cluster_type = attrs.RelatedObjectAttr('cluster.type', linkify=True)
-    device = attrs.RelatedObjectAttr('device', linkify=True)

netbox/virtualization/views.py

@@ -10,15 +10,12 @@ from dcim.filtersets import DeviceFilterSet
 from dcim.forms import DeviceFilterForm
 from dcim.models import Device
 from dcim.tables import DeviceTable
-from extras.ui.panels import CustomFieldsPanel, ImageAttachmentsPanel, TagsPanel
 from extras.views import ObjectConfigContextView, ObjectRenderConfigView
 from ipam.models import IPAddress, VLANGroup
 from ipam.tables import InterfaceVLANTable, VLANTranslationRuleTable
 from netbox.object_actions import (
     AddObject, BulkDelete, BulkEdit, BulkExport, BulkImport, BulkRename, DeleteObject, EditObject,
 )
-from netbox.ui import actions, layout
-from netbox.ui.panels import CommentsPanel, ObjectsTablePanel, TemplatePanel
 from netbox.views import generic
 from utilities.query import count_related
 from utilities.query_functions import CollateAsChar
@@ -26,7 +23,6 @@ from utilities.views import GetRelatedModelsMixin, ViewTab, register_model_view
 from . import filtersets, forms, tables
 from .models import *
 from .object_actions import BulkAddComponents
-from .ui import panels
 
 
 #
@@ -340,7 +336,6 @@ class ClusterAddDevicesView(generic.ObjectEditView):
 # Virtual machines
 #
 
-
 @register_model_view(VirtualMachine, 'list', path='', detail=False)
 class VirtualMachineListView(generic.ObjectListView):
     queryset = VirtualMachine.objects.prefetch_related('primary_ip4', 'primary_ip6')
@@ -353,44 +348,6 @@ class VirtualMachineListView(generic.ObjectListView):
 @register_model_view(VirtualMachine)
 class VirtualMachineView(generic.ObjectView):
     queryset = VirtualMachine.objects.all()
-    layout = layout.SimpleLayout(
-        left_panels=[
-            panels.VirtualMachinePanel(),
-            CustomFieldsPanel(),
-            TagsPanel(),
-            CommentsPanel(),
-        ],
-        right_panels=[
-            panels.VirtualMachineClusterPanel(),
-            TemplatePanel('virtualization/panels/virtual_machine_resources.html'),
-            ObjectsTablePanel(
-                model='ipam.Service',
-                title=_('Application Services'),
-                filters={'virtual_machine_id': lambda ctx: ctx['object'].pk},
-                actions=[
-                    actions.AddObject(
-                        'ipam.Service',
-                        url_params={
-                            'parent_object_type': lambda ctx: ContentType.objects.get_for_model(ctx['object']).pk,
-                            'parent': lambda ctx: ctx['object'].pk,
-                        },
-                    ),
-                ],
-            ),
-            ImageAttachmentsPanel(),
-        ],
-        bottom_panels=[
-            ObjectsTablePanel(
-                model='virtualization.VirtualDisk',
-                filters={'virtual_machine_id': lambda ctx: ctx['object'].pk},
-                actions=[
-                    actions.AddObject(
-                        'virtualization.VirtualDisk', url_params={'virtual_machine': lambda ctx: ctx['object'].pk}
-                    ),
-                ],
-            ),
-        ],
-    )
 
 
 @register_model_view(VirtualMachine, 'interfaces')

netbox/vpn/filtersets.py

@@ -38,34 +38,28 @@ class TunnelGroupFilterSet(OrganizationalModelFilterSet, ContactModelFilterSet):
 @register_filterset
 class TunnelFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
     status = django_filters.MultipleChoiceFilter(
-        choices=TunnelStatusChoices,
-        distinct=False,
+        choices=TunnelStatusChoices
     )
     group_id = django_filters.ModelMultipleChoiceFilter(
         queryset=TunnelGroup.objects.all(),
-        distinct=False,
         label=_('Tunnel group (ID)'),
     )
     group = django_filters.ModelMultipleChoiceFilter(
         field_name='group__slug',
         queryset=TunnelGroup.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('Tunnel group (slug)'),
     )
     encapsulation = django_filters.MultipleChoiceFilter(
-        choices=TunnelEncapsulationChoices,
-        distinct=False,
+        choices=TunnelEncapsulationChoices
     )
     ipsec_profile_id = django_filters.ModelMultipleChoiceFilter(
         queryset=IPSecProfile.objects.all(),
-        distinct=False,
         label=_('IPSec profile (ID)'),
     )
     ipsec_profile = django_filters.ModelMultipleChoiceFilter(
         field_name='ipsec_profile__name',
         queryset=IPSecProfile.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('IPSec profile (name)'),
     )
@@ -89,19 +83,16 @@ class TunnelTerminationFilterSet(NetBoxModelFilterSet):
     tunnel_id = django_filters.ModelMultipleChoiceFilter(
         field_name='tunnel',
         queryset=Tunnel.objects.all(),
-        distinct=False,
         label=_('Tunnel (ID)'),
     )
     tunnel = django_filters.ModelMultipleChoiceFilter(
         field_name='tunnel__name',
         queryset=Tunnel.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('Tunnel (name)'),
     )
     role = django_filters.MultipleChoiceFilter(
-        choices=TunnelTerminationRoleChoices,
-        distinct=False,
+        choices=TunnelTerminationRoleChoices
     )
     termination_type = ContentTypeFilter()
     interface = django_filters.ModelMultipleChoiceFilter(
@@ -129,7 +120,6 @@ class TunnelTerminationFilterSet(NetBoxModelFilterSet):
     outside_ip_id = django_filters.ModelMultipleChoiceFilter(
         field_name='outside_ip',
         queryset=IPAddress.objects.all(),
-        distinct=False,
         label=_('Outside IP (ID)'),
     )
 
@@ -152,20 +142,16 @@ class IKEProposalFilterSet(PrimaryModelFilterSet):
         label=_('IKE policy (name)'),
     )
     authentication_method = django_filters.MultipleChoiceFilter(
-        choices=AuthenticationMethodChoices,
-        distinct=False,
+        choices=AuthenticationMethodChoices
     )
     encryption_algorithm = django_filters.MultipleChoiceFilter(
-        choices=EncryptionAlgorithmChoices,
-        distinct=False,
+        choices=EncryptionAlgorithmChoices
     )
     authentication_algorithm = django_filters.MultipleChoiceFilter(
-        choices=AuthenticationAlgorithmChoices,
-        distinct=False,
+        choices=AuthenticationAlgorithmChoices
     )
     group = django_filters.MultipleChoiceFilter(
-        choices=DHGroupChoices,
-        distinct=False,
+        choices=DHGroupChoices
     )
 
     class Meta:
@@ -185,12 +171,10 @@ class IKEProposalFilterSet(PrimaryModelFilterSet):
 @register_filterset
 class IKEPolicyFilterSet(PrimaryModelFilterSet):
     version = django_filters.MultipleChoiceFilter(
-        choices=IKEVersionChoices,
-        distinct=False,
+        choices=IKEVersionChoices
     )
     mode = django_filters.MultipleChoiceFilter(
-        choices=IKEModeChoices,
-        distinct=False,
+        choices=IKEModeChoices
     )
     ike_proposal_id = django_filters.ModelMultipleChoiceFilter(
         field_name='proposals',
@@ -230,12 +214,10 @@ class IPSecProposalFilterSet(PrimaryModelFilterSet):
         label=_('IPSec policy (name)'),
     )
     encryption_algorithm = django_filters.MultipleChoiceFilter(
-        choices=EncryptionAlgorithmChoices,
-        distinct=False,
+        choices=EncryptionAlgorithmChoices
     )
     authentication_algorithm = django_filters.MultipleChoiceFilter(
-        choices=AuthenticationAlgorithmChoices,
-        distinct=False,
+        choices=AuthenticationAlgorithmChoices
     )
 
     class Meta:
@@ -255,8 +237,7 @@ class IPSecProposalFilterSet(PrimaryModelFilterSet):
 @register_filterset
 class IPSecPolicyFilterSet(PrimaryModelFilterSet):
     pfs_group = django_filters.MultipleChoiceFilter(
-        choices=DHGroupChoices,
-        distinct=False,
+        choices=DHGroupChoices
     )
     ipsec_proposal_id = django_filters.ModelMultipleChoiceFilter(
         field_name='proposals',
@@ -285,30 +266,25 @@ class IPSecPolicyFilterSet(PrimaryModelFilterSet):
 @register_filterset
 class IPSecProfileFilterSet(PrimaryModelFilterSet):
     mode = django_filters.MultipleChoiceFilter(
-        choices=IPSecModeChoices,
-        distinct=False,
+        choices=IPSecModeChoices
     )
     ike_policy_id = django_filters.ModelMultipleChoiceFilter(
         queryset=IKEPolicy.objects.all(),
-        distinct=False,
         label=_('IKE policy (ID)'),
     )
     ike_policy = django_filters.ModelMultipleChoiceFilter(
         field_name='ike_policy__name',
         queryset=IKEPolicy.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('IKE policy (name)'),
     )
     ipsec_policy_id = django_filters.ModelMultipleChoiceFilter(
         queryset=IPSecPolicy.objects.all(),
-        distinct=False,
         label=_('IPSec policy (ID)'),
     )
     ipsec_policy = django_filters.ModelMultipleChoiceFilter(
         field_name='ipsec_policy__name',
         queryset=IPSecPolicy.objects.all(),
-        distinct=False,
         to_field_name='name',
         label=_('IPSec policy (name)'),
     )
@@ -331,12 +307,10 @@ class IPSecProfileFilterSet(PrimaryModelFilterSet):
 class L2VPNFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilterSet):
     type = django_filters.MultipleChoiceFilter(
         choices=L2VPNTypeChoices,
-        distinct=False,
         null_value=None
     )
     status = django_filters.MultipleChoiceFilter(
         choices=L2VPNStatusChoices,
-        distinct=False,
     )
     import_target_id = django_filters.ModelMultipleChoiceFilter(
         field_name='import_targets',
@@ -380,13 +354,11 @@ class L2VPNFilterSet(PrimaryModelFilterSet, TenancyFilterSet, ContactModelFilter
 class L2VPNTerminationFilterSet(NetBoxModelFilterSet):
     l2vpn_id = django_filters.ModelMultipleChoiceFilter(
         queryset=L2VPN.objects.all(),
-        distinct=False,
         label=_('L2VPN (ID)'),
     )
     l2vpn = django_filters.ModelMultipleChoiceFilter(
         field_name='l2vpn__slug',
         queryset=L2VPN.objects.all(),
-        distinct=False,
         to_field_name='slug',
         label=_('L2VPN (slug)'),
     )
@@ -471,7 +443,6 @@ class L2VPNTerminationFilterSet(NetBoxModelFilterSet):
     )
     assigned_object_type_id = django_filters.ModelMultipleChoiceFilter(
         queryset=ObjectType.objects.all(),
-        distinct=False,
         field_name='assigned_object_type'
     )
     assigned_object_type = ContentTypeFilter()

netbox/wireless/filtersets.py

@@ -22,13 +22,11 @@ __all__ = (
 @register_filterset
 class WirelessLANGroupFilterSet(NestedGroupModelFilterSet):
     parent_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=WirelessLANGroup.objects.all(),
-        distinct=False,
+        queryset=WirelessLANGroup.objects.all()
     )
     parent = django_filters.ModelMultipleChoiceFilter(
         field_name='parent__slug',
         queryset=WirelessLANGroup.objects.all(),
-        distinct=False,
         to_field_name='slug'
     )
     ancestor_id = TreeNodeMultipleChoiceFilter(
@@ -62,24 +60,20 @@ class WirelessLANFilterSet(PrimaryModelFilterSet, ScopedFilterSet, TenancyFilter
         to_field_name='slug'
     )
     status = django_filters.MultipleChoiceFilter(
-        choices=WirelessLANStatusChoices,
-        distinct=False,
+        choices=WirelessLANStatusChoices
     )
     vlan_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=VLAN.objects.all(),
-        distinct=False,
+        queryset=VLAN.objects.all()
     )
     interface_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Interface.objects.all(),
         field_name='interfaces'
     )
     auth_type = django_filters.MultipleChoiceFilter(
-        choices=WirelessAuthTypeChoices,
-        distinct=False,
+        choices=WirelessAuthTypeChoices
     )
     auth_cipher = django_filters.MultipleChoiceFilter(
-        choices=WirelessAuthCipherChoices,
-        distinct=False,
+        choices=WirelessAuthCipherChoices
     )
 
     class Meta:
@@ -99,24 +93,19 @@ class WirelessLANFilterSet(PrimaryModelFilterSet, ScopedFilterSet, TenancyFilter
 @register_filterset
 class WirelessLinkFilterSet(PrimaryModelFilterSet, TenancyFilterSet):
     interface_a_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Interface.objects.all(),
-        distinct=False,
+        queryset=Interface.objects.all()
     )
     interface_b_id = django_filters.ModelMultipleChoiceFilter(
-        queryset=Interface.objects.all(),
-        distinct=False,
+        queryset=Interface.objects.all()
     )
     status = django_filters.MultipleChoiceFilter(
-        choices=LinkStatusChoices,
-        distinct=False,
+        choices=LinkStatusChoices
     )
     auth_type = django_filters.MultipleChoiceFilter(
-        choices=WirelessAuthTypeChoices,
-        distinct=False,
+        choices=WirelessAuthTypeChoices
     )
     auth_cipher = django_filters.MultipleChoiceFilter(
-        choices=WirelessAuthCipherChoices,
-        distinct=False,
+        choices=WirelessAuthCipherChoices
     )
 
     class Meta: