nautobot 2.2.0b1__py3-none-any.whl → 2.2.1__py3-none-any.whl

nautobot/__init__.py

@@ -1,4 +1,35 @@
 from importlib import metadata
+import logging
+import os
+
+import django
 
 # Primary package version
 __version__ = metadata.version(__name__)
+
+# Sentinel to make sure we only initialize once.
+__initialized = False
+
+logger = logging.getLogger(__name__)
+
+
+def setup(config_path=None):
+    """Similar to `django.setup()`, this configures Django with the appropriate Nautobot settings data."""
+    from nautobot.core.cli import get_config_path, load_settings
+
+    global __initialized
+
+    if __initialized:
+        return
+
+    if config_path is None:
+        config_path = get_config_path()
+
+    # Point Django to our 'nautobot_config' pseudo-module that we'll load from the provided config path
+    os.environ["DJANGO_SETTINGS_MODULE"] = "nautobot_config"
+
+    load_settings(config_path)
+    django.setup()
+
+    logger.info("Nautobot initialized!")
+    __initialized = True

nautobot/apps/api.py

@@ -19,7 +19,7 @@ from nautobot.core.api.fields import (
 )
 from nautobot.core.api.mixins import WritableSerializerMixin
 from nautobot.core.api.parsers import NautobotCSVParser
-from nautobot.core.api.routers import OrderedDefaultRouter
+from nautobot.core.api.routers import AuthenticatedAPIRootView as APIRootView, OrderedDefaultRouter
 from nautobot.core.api.schema import NautobotAutoSchema
 from nautobot.core.api.serializers import (
     OptInFieldsMixin,
@@ -36,7 +36,6 @@ from nautobot.core.api.utils import (
     versioned_serializer_selector,
 )
 from nautobot.core.api.views import (
-    APIRootView,
     BulkDestroyModelMixin,
     BulkUpdateModelMixin,
     GetObjectCountsView,

nautobot/apps/utils.py

@@ -32,6 +32,8 @@ from nautobot.core.utils.lookup import (
     get_related_class_for_model,
     get_route_for_model,
     get_table_for_model,
+    get_url_for_url_pattern,
+    get_url_patterns,
     get_view_for_model,
 )
 from nautobot.core.utils.migrations import migrate_content_type_references_to_new_model
@@ -113,6 +115,8 @@ __all__ = (
     "get_settings_or_config",
     "get_table_for_model",
     "get_view_for_model",
+    "get_url_for_url_pattern",
+    "get_url_patterns",
     "get_worker_count",
     "GitRepo",
     "hex_to_rgb",

nautobot/apps/views.py

@@ -8,6 +8,7 @@ from nautobot.core.views.generic import (
     BulkImportView,  # 3.0 TODO: deprecated, will be removed in 3.0
     BulkRenameView,
     ComponentCreateView,
+    GenericView,
     ObjectDeleteView,
     ObjectEditView,
     ObjectImportView,
@@ -57,6 +58,7 @@ __all__ = (
     "csv_format",
     "EnhancedPage",
     "EnhancedPaginator",
+    "GenericView",
     "get_csv_form_fields_from_serializer_class",
     "get_paginate_count",
     "GetReturnURLMixin",

nautobot/circuits/api/urls.py

@@ -2,8 +2,7 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter()
-router.APIRootView = views.CircuitsRootView
+router = OrderedDefaultRouter(view_name="Circuits")
 
 # Providers
 router.register("providers", views.ProviderViewSet)

nautobot/circuits/api/views.py

@@ -1,5 +1,3 @@
-from rest_framework.routers import APIRootView
-
 from nautobot.circuits import filters
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.models.querysets import count_related
@@ -8,16 +6,6 @@ from nautobot.extras.api.views import NautobotModelViewSet
 
 from . import serializers
 
-
-class CircuitsRootView(APIRootView):
-    """
-    Circuits API root view
-    """
-
-    def get_view_name(self):
-        return "Circuits"
-
-
 #
 # Providers
 #

nautobot/circuits/apps.py

@@ -5,8 +5,8 @@ class CircuitsConfig(NautobotConfig):
     name = "nautobot.circuits"
     verbose_name = "Circuits"
     searchable_models = [
-        "provider",
         "circuit",
+        "provider",
         "providernetwork",
     ]
 

nautobot/circuits/tests/test_filters.py

@@ -57,7 +57,7 @@ class ProviderTestCase(FilterTestCases.NameOnlyFilterTestCase, FilterTestCases.F
     def test_location(self):
         expected = self.queryset.filter(
             circuits__circuit_terminations__location__in=[self.locations[0].pk, self.locations[1].pk]
-        )
+        ).distinct()
         params = {"location": [self.locations[0].pk, self.locations[1].pk]}
         self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, expected)
         params = {"location": [self.locations[0].name, self.locations[1].name]}

nautobot/core/api/routers.py

@@ -1,12 +1,23 @@
-from collections import OrderedDict
+import logging
 
 from rest_framework.routers import DefaultRouter
 
+from nautobot.core.api.views import AuthenticatedAPIRootView
+
+logger = logging.getLogger(__name__)
+
 
 class OrderedDefaultRouter(DefaultRouter):
-    def __init__(self, *args, **kwargs):
+    APIRootView = AuthenticatedAPIRootView
+
+    def __init__(self, *args, view_name=None, view_description=None, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self.view_name = view_name
+        if view_name and not view_description:
+            view_description = f"{view_name} API root view"
+        self.view_description = view_description
+
         # Extend the list view mappings to support the DELETE operation
         self.routes[0].mapping.update(
             {
@@ -16,13 +27,49 @@ class OrderedDefaultRouter(DefaultRouter):
             }
         )
 
+    def register(self, prefix, viewset, basename=None):
+        """
+        Override DRF's BaseRouter.register() to bypass an unnecessary restriction added in version 3.15.0.
+
+        (Reference: https://github.com/encode/django-rest-framework/pull/8438)
+        """
+        if basename is None:
+            basename = self.get_default_basename(viewset)
+
+        # DRF:
+        # if self.is_already_registered(basename):
+        #     msg = (f'Router with basename "{basename}" is already registered. '
+        #            f'Please provide a unique basename for viewset "{viewset}"')
+        #     raise ImproperlyConfigured(msg)
+        #
+        # We bypass this because we have at least one use case (/api/extras/jobs/) where we are *intentionally*
+        # registering two viewsets with the same basename, but have carefully defined them so as not to conflict.
+
+        # resuming standard DRF code...
+        self.registry.append((prefix, viewset, basename))
+
+        # invalidate the urls cache
+        if hasattr(self, "_urls"):
+            del self._urls
+
     def get_api_root_view(self, api_urls=None):
         """
         Wrap DRF's DefaultRouter to return an alphabetized list of endpoints.
         """
-        api_root_dict = OrderedDict()
+        api_root_dict = {}
         list_name = self.routes[0].name
+
         for prefix, _viewset, basename in sorted(self.registry, key=lambda x: x[0]):
             api_root_dict[prefix] = list_name.format(basename=basename)
 
+        if issubclass(self.APIRootView, AuthenticatedAPIRootView):
+            return self.APIRootView.as_view(
+                api_root_dict=api_root_dict, name=self.view_name, description=self.view_description
+            )
+        # Fallback for the established practice of overriding self.APIRootView with a custom class
+        logger.warning(
+            "Something has changed an OrderedDefaultRouter's APIRootView attribute to a custom class. "
+            "Please verify that class %s implements appropriate authentication controls.",
+            self.APIRootView.__name__,
+        )
         return self.APIRootView.as_view(api_root_dict=api_root_dict)

nautobot/core/api/utils.py

@@ -178,6 +178,10 @@ def get_view_name(view, suffix=None):
 
     else:
         # Replicate DRF's built-in behavior.
+        name = getattr(view, "name", None)
+        if name is not None:
+            return view.name
+
         name = view.__class__.__name__
         name = formatting.remove_trailing_string(name, "View")
         name = formatting.remove_trailing_string(name, "ViewSet")

nautobot/core/api/views.py

@@ -24,9 +24,9 @@ from graphql import get_default_backend
 from graphql.execution import ExecutionResult
 from graphql.execution.middleware import MiddlewareManager
 from graphql.type.schema import GraphQLSchema
-from rest_framework import status
+from rest_framework import routers, status
 from rest_framework.exceptions import ParseError, PermissionDenied
-from rest_framework.permissions import AllowAny, IsAuthenticated
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.views import APIView
@@ -347,15 +347,25 @@ class ReadOnlyModelViewSet(NautobotAPIVersionMixin, ModelViewSetMixin, ReadOnlyM
 #
 
 
-class APIRootView(NautobotAPIVersionMixin, APIView):
+class AuthenticatedAPIRootView(NautobotAPIVersionMixin, routers.APIRootView):
     """
-    This is the root of the REST API. API endpoints are arranged by app and model name; e.g. `/api/dcim/locations/`.
+    Extends DRF's base APIRootView class to enforce user authentication.
     """
 
-    _ignore_model_permissions = True
+    permission_classes = [IsAuthenticated]
+
+    name = None
+    description = None
+
+
+class APIRootView(AuthenticatedAPIRootView):
+    """
+    This is the root of the REST API.
 
-    def get_view_name(self):
-        return "API Root"
+    API endpoints are arranged by app and model name; e.g. `/api/dcim/locations/`.
+    """
+
+    name = "API Root"
 
     @extend_schema(exclude=True)
     def get(self, request, format=None):  # pylint: disable=redefined-builtin
@@ -504,11 +514,6 @@ class NautobotSpectacularSwaggerView(APIVersioningGetSchemaURLMixin, Spectacular
     @extend_schema(exclude=True)
     def get(self, request, *args, **kwargs):
         """Fix up the rendering of the Swagger UI to work with Nautobot's UI."""
-        if not request.user.is_authenticated:
-            doc_url = reverse("api_docs")
-            login_url = reverse(settings.LOGIN_URL)
-            return redirect(f"{login_url}?next={doc_url}")
-
         # For backward compatibility wtih drf-yasg, `/api/docs/?format=openapi` is a redirect to the JSON schema.
         if request.GET.get("format") == "openapi":
             return redirect("schema_json", permanent=True)
@@ -537,11 +542,12 @@ class NautobotSpectacularRedocView(APIVersioningGetSchemaURLMixin, SpectacularRe
 class GraphQLDRFAPIView(NautobotAPIVersionMixin, APIView):
     """
     API View for GraphQL to integrate properly with DRF authentication mechanism.
-    The code is a stripped down version of graphene-django default View
-    https://github.com/graphql-python/graphene-django/blob/main/graphene_django/views.py#L57
     """
 
-    permission_classes = [AllowAny]
+    # The code is a stripped down version of graphene-django default View
+    # https://github.com/graphql-python/graphene-django/blob/main/graphene_django/views.py#L57
+
+    permission_classes = [IsAuthenticated]
     graphql_schema = None
     executor = None
     backend = None

nautobot/core/cli/__init__.py

@@ -13,7 +13,6 @@ from django.core.management import CommandError, CommandParser, execute_from_com
 from django.core.management.utils import get_random_secret_key
 from jinja2 import BaseLoader, Environment
 
-from nautobot import __version__
 from nautobot.core.settings_funcs import is_truthy
 from nautobot.extras.plugins.utils import load_plugins
 
@@ -126,7 +125,7 @@ def _preprocess_settings(settings, config_path):
     load_plugins(settings)
 
 
-def _load_settings(config_path):
+def load_settings(config_path):
     """Load nautobot_config.py or its equivalent into memory as a `nautobot_config` pseudo-module."""
     if not os.path.exists(config_path):
         raise FileNotFoundError(
@@ -154,6 +153,8 @@ class _VersionAction(argparse.Action):
         super().__init__(*args, **kwargs)
 
     def __call__(self, parser, namespace, values, option_string):
+        from nautobot import __version__
+
         print(f"Nautobot version: {__version__}")
         print(f"Django version: {django.__version__}")
         print(f"Configuration file: {namespace.config_path}")
@@ -215,13 +216,9 @@ def _init_settings(args):
     print(f"Configuration file created at {config_path}")
 
 
-def main():
-    """Run administrative tasks."""
-    # Point Django to our 'nautobot_config' pseudo-module that we'll load from the provided config path
-    os.environ["DJANGO_SETTINGS_MODULE"] = "nautobot_config"
-
-    # Default config path based on NAUTOBOT_CONFIG or NAUTOBOT_ROOT environment variables
-    config_path = os.getenv(
+def get_config_path():
+    """Get the default Nautobot config file path based on the NAUTOBOT_CONFIG or NAUTOBOT_ROOT environment variables."""
+    return os.getenv(
         "NAUTOBOT_CONFIG",
         os.path.join(
             os.getenv("NAUTOBOT_ROOT", os.path.expanduser("~/.nautobot")),
@@ -229,13 +226,23 @@ def main():
         ),
     )
 
+
+def main():
+    """Run administrative tasks."""
+    # Point Django to our 'nautobot_config' pseudo-module that we'll load from the provided config path
+    os.environ["DJANGO_SETTINGS_MODULE"] = "nautobot_config"
+
+    default_config_path = get_config_path()
+
     # Intercept certain CLI parameters and arguments before they reach Django
     parser = CommandParser(
         description=DESCRIPTION,
         usage=USAGE,
         formatter_class=_VerboseHelpFormatter,
     )
-    parser.add_argument("-c", "--config-path", default=config_path, help="Path to the Nautobot configuration file")
+    parser.add_argument(
+        "-c", "--config-path", default=default_config_path, help="Path to the Nautobot configuration file"
+    )
     parser.add_argument("--version", action=_VersionAction, help="Show version numbers and exit")
 
     # Parse out the `--config` argument here and capture the rest of the CLI args
@@ -282,7 +289,7 @@ def main():
             raise
 
     # If we get here, it's a regular Django management command - so load in the nautobot_config.py then hand off
-    _load_settings(args.config_path)
+    load_settings(args.config_path)
     execute_from_command_line([sys.argv[0], *unparsed_args])
 
 

nautobot/core/constants.py

@@ -104,4 +104,89 @@ COMPOSITE_KEY_SEPARATOR = ";"
 # For the natural slug separator, it's much simpler and we can just go with "_".
 NATURAL_SLUG_SEPARATOR = "_"
 
+# For config settings that contain a list of things.
+# As environment variables only allow string types, these need to be split into the final list.
+CONFIG_SETTING_SEPARATOR = ","
+
 CHARFIELD_MAX_LENGTH = 255
+
+# Models excluded from the global search list
+GLOBAL_SEARCH_EXCLUDE_LIST = [
+    "anotherexamplemodel",
+    "cablepath",
+    "circuittermination",
+    "circuittype",
+    "clustergroup",
+    "clustertype",
+    "computedfield",
+    "configcontext",
+    "configcontextschema",
+    "consoleport",
+    "consoleporttemplate",
+    "consoleserverport",
+    "consoleserverporttemplate",
+    "contactassociation",
+    "controllermanageddevicegroup",
+    "customfield",
+    "customfieldchoice",
+    "customlink",
+    "devicebay",
+    "devicebaytemplate",
+    "devicetypetosoftwareimagefile",
+    "dynamicgroupmembership",
+    "exporttemplate",
+    "fileattachment",
+    "fileproxy",
+    "frontport",
+    "frontporttemplate",
+    "graphqlquery",
+    "healthchecktestmodel",
+    "imageattachment",
+    "interface",
+    "interfaceredundancygroup",
+    "interfaceredundancygroupassociation",
+    "interfacetemplate",
+    "inventoryitem",
+    "ipaddresstointerface",
+    "job",
+    "jobbutton",
+    "jobhook",
+    "joblogentry",
+    "jobresult",
+    "locationtype",
+    "manufacturer",
+    "note",
+    "objectchange",
+    "platform",
+    "poweroutlet",
+    "poweroutlettemplate",
+    "powerpanel",
+    "powerport",
+    "powerporttemplate",
+    "prefixlocationassignment",
+    "rackreservation",
+    "rearport",
+    "rearporttemplate",
+    "relationship",
+    "relationshipassociation",
+    "rir",
+    "role",
+    "routetarget",
+    "scheduledjob",
+    "scheduledjobs",
+    "secret",
+    "secretsgroup",
+    "secretsgroupassociation",
+    "service",
+    "softwareimagefile",
+    "status",
+    "tag",
+    "taggeditem",
+    "tenantgroup",
+    "vlangroup",
+    "vlanlocationassignment",
+    "vminterface",
+    "vrfdeviceassignment",
+    "vrfprefixassignment",
+    "webhook",
+]

nautobot/core/filters.py

@@ -260,6 +260,9 @@ class ContentTypeMultipleChoiceFilter(django_filters.MultipleChoiceFilter):
         if not self.conjoined:
             qs = qs.filter(q)
 
+        if self.distinct:
+            qs = qs.distinct()
+
         return qs
 
 
@@ -522,7 +525,10 @@ class TreeNodeMultipleChoiceFilter(NaturalKeyOrPKMultipleChoiceFilter):
 
         # Fetch the generated Q object and filter the incoming qs with it before passing it along.
         query = self.generate_query(value)
-        return self.get_method(qs)(query)
+        result = self.get_method(qs)(query)
+        if self.distinct:
+            result = result.distinct()
+        return result
 
 
 #

nautobot/core/forms/widgets.py

@@ -182,8 +182,7 @@ class APISelect(SelectWithDisabled):
                     # ModelChoiceIterator.__iter__() yields a tuple of (value, label)
                     # using this approach first yield a tuple of (null(value), null_option(label))
                     yield "null", self.null_options
-                    for item in super().__iter__():
-                        yield item
+                    yield from super().__iter__()
 
             null_option = self.attrs.get("data-null-option")
             self.choices = ModelChoiceIteratorWithNullOption(field=self.choices.field, null_option=null_option)

nautobot/core/graphql/schema.py

@@ -1,4 +1,5 @@
 """Schema module for GraphQL."""
+
 from collections import OrderedDict
 import logging
 

nautobot/core/management/commands/generate_test_data.py

@@ -58,8 +58,8 @@ class Command(BaseCommand):
                 ProviderNetworkFactory,
             )
             from nautobot.dcim.factory import (
-                ControllerDeviceGroupFactory,
                 ControllerFactory,
+                ControllerManagedDeviceGroupFactory,
                 DeviceFactory,
                 DeviceFamilyFactory,
                 DeviceRedundancyGroupFactory,
@@ -131,7 +131,7 @@ class Command(BaseCommand):
         LocationFactory.create_batch(10, has_parent=False, using=db_name)
         self.stdout.write("Creating Controller with Groups...")
         ControllerFactory.create_batch(1)
-        ControllerDeviceGroupFactory.create_batch(5)
+        ControllerManagedDeviceGroupFactory.create_batch(5)
         self.stdout.write("Creating RIRs...")
         RIRFactory.create_batch(9, using=db_name)  # only 9 unique RIR names are hard-coded presently
         self.stdout.write("Creating RouteTargets...")
@@ -207,7 +207,7 @@ class Command(BaseCommand):
         ExternalIntegrationFactory.create_batch(20, using=db_name)
         self.stdout.write("Creating Controllers with Device or DeviceRedundancyGroups...")
         ControllerFactory.create_batch(10)
-        ControllerDeviceGroupFactory.create_batch(30)
+        ControllerManagedDeviceGroupFactory.create_batch(30)
         # make sure we have some tenants that have null relationships to make filter tests happy
         self.stdout.write("Creating Tenants without Circuits, Locations, IPAddresses, or Prefixes...")
         TenantFactory.create_batch(10, using=db_name)
@@ -227,7 +227,7 @@ class Command(BaseCommand):
                 CircuitTerminationFactory,
                 CircuitTypeFactory,
                 ContactFactory,
-                ControllerDeviceGroupFactory,
+                ControllerManagedDeviceGroupFactory,
                 ControllerFactory,
                 DeviceFactory,
                 DeviceFamilyFactory,

nautobot/core/models/__init__.py

@@ -55,6 +55,7 @@ class BaseModel(models.Model):
     )
 
     objects = BaseManager.from_queryset(RestrictedQuerySet)()
+    is_contact_associable_model = True
 
     class Meta:
         abstract = True

nautobot/core/settings.py

@@ -10,6 +10,7 @@ import django.forms
 from django.utils.safestring import mark_safe
 
 from nautobot import __version__
+from nautobot.core.constants import CONFIG_SETTING_SEPARATOR as _CONFIG_SETTING_SEPARATOR
 from nautobot.core.settings_funcs import ConstanceConfigItem, is_truthy, parse_redis_connection
 
 #
@@ -152,6 +153,9 @@ if "NAUTOBOT_MAX_PAGE_SIZE" in os.environ and os.environ["NAUTOBOT_MAX_PAGE_SIZE
 # Metrics
 METRICS_ENABLED = is_truthy(os.getenv("NAUTOBOT_METRICS_ENABLED", "False"))
 METRICS_AUTHENTICATED = is_truthy(os.getenv("NAUTOBOT_METRICS_AUTHENTICATED", "False"))
+METRICS_DISABLED_APPS = []
+if "NAUTOBOT_METRICS_DISABLED_APPS" in os.environ and os.environ["NAUTOBOT_METRICS_DISABLED_APPS"] != "":
+    METRICS_DISABLED_APPS = os.getenv("NAUTOBOT_METRICS_DISABLED_APPS", "").split(_CONFIG_SETTING_SEPARATOR)
 
 # Napalm
 NAPALM_ARGS = {}
@@ -166,7 +170,7 @@ if "NAUTOBOT_PAGINATE_COUNT" in os.environ and os.environ["NAUTOBOT_PAGINATE_COU
 # The options displayed in the web interface dropdown to limit the number of objects per page.
 # Default is [25, 50, 100, 250, 500, 1000]
 if "NAUTOBOT_PER_PAGE_DEFAULTS" in os.environ and os.environ["NAUTOBOT_PER_PAGE_DEFAULTS"] != "":
-    PER_PAGE_DEFAULTS = [int(val) for val in os.environ["NAUTOBOT_PER_PAGE_DEFAULTS"].split(",")]
+    PER_PAGE_DEFAULTS = [int(val) for val in os.environ["NAUTOBOT_PER_PAGE_DEFAULTS"].split(_CONFIG_SETTING_SEPARATOR)]
 
 # Plugins
 PLUGINS = []
@@ -188,6 +192,13 @@ if (
 ):
     RACK_ELEVATION_DEFAULT_UNIT_WIDTH = int(os.environ["NAUTOBOT_RACK_ELEVATION_DEFAULT_UNIT_WIDTH"])
 
+# Enable two-digit format for the rack unit numbering in rack elevations.
+if (
+    "NAUTOBOT_RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT" in os.environ
+    and os.environ["NAUTOBOT_RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT"] != ""
+):
+    RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT = is_truthy(os.environ["NAUTOBOT_RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT"])
+
 # How frequently to check for a new Nautobot release on GitHub, and the URL to check for this information.
 # Defaults to disabled (no URL) and check every 24 hours when enabled
 if "NAUTOBOT_RELEASE_CHECK_TIMEOUT" in os.environ and os.environ["NAUTOBOT_RELEASE_CHECK_TIMEOUT"] != "":
@@ -332,6 +343,7 @@ SPECTACULAR_SETTINGS = {
     # trim it from all of the individual paths correspondingly.
     # See also https://github.com/nautobot/nautobot-ansible/pull/135 for an example of why this is desirable.
     "SERVERS": [{"url": "/api"}],
+    "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAuthenticated"],
     "SCHEMA_PATH_PREFIX": "/api",
     "SCHEMA_PATH_PREFIX_TRIM": True,
     # use sidecar - locally packaged UI files, not CDN
@@ -768,6 +780,11 @@ CONSTANCE_CONFIG = {
     "RACK_ELEVATION_DEFAULT_UNIT_WIDTH": ConstanceConfigItem(
         default=230, help_text="Default width (in pixels) of a rack unit in a rack elevation diagram", field_type=int
     ),
+    "RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT": ConstanceConfigItem(
+        default=False,
+        help_text="Enables two-digit format for the rack unit numbering in a rack elevation diagram",
+        field_type=bool,
+    ),
     "RELEASE_CHECK_TIMEOUT": ConstanceConfigItem(
         default=24 * 3600,
         help_text="Number of seconds (must be at least 3600, or one hour) to cache the result of a release check "
@@ -799,7 +816,11 @@ CONSTANCE_CONFIG_FIELDSETS = {
     "Natural Keys": ["DEVICE_NAME_AS_NATURAL_KEY", "LOCATION_NAME_AS_NATURAL_KEY"],
     "Pagination": ["PAGINATE_COUNT", "MAX_PAGE_SIZE", "PER_PAGE_DEFAULTS"],
     "Performance": ["DYNAMIC_GROUPS_MEMBER_CACHE_TIMEOUT", "JOB_CREATE_FILE_MAX_SIZE"],
-    "Rack Elevation Rendering": ["RACK_ELEVATION_DEFAULT_UNIT_HEIGHT", "RACK_ELEVATION_DEFAULT_UNIT_WIDTH"],
+    "Rack Elevation Rendering": [
+        "RACK_ELEVATION_DEFAULT_UNIT_HEIGHT",
+        "RACK_ELEVATION_DEFAULT_UNIT_WIDTH",
+        "RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT",
+    ],
     "Release Checking": ["RELEASE_CHECK_URL", "RELEASE_CHECK_TIMEOUT"],
     "User Interface": ["SUPPORT_MESSAGE"],
     "Debugging": ["ALLOW_REQUEST_PROFILING"],
@@ -913,7 +934,7 @@ CELERY_TASK_TIME_LIMIT = int(os.getenv("NAUTOBOT_CELERY_TASK_TIME_LIMIT", str(10
 CELERY_WORKER_PROMETHEUS_PORTS = []
 if os.getenv("NAUTOBOT_CELERY_WORKER_PROMETHEUS_PORTS"):
     CELERY_WORKER_PROMETHEUS_PORTS = [
-        int(value) for value in os.getenv("NAUTOBOT_CELERY_WORKER_PROMETHEUS_PORTS").split(",")
+        int(value) for value in os.getenv("NAUTOBOT_CELERY_WORKER_PROMETHEUS_PORTS").split(_CONFIG_SETTING_SEPARATOR)
     ]
 
 # These settings define the custom nautobot serialization encoding as an accepted data encoding format