PyPI - nautobot - Versions diffs - 2.2.0b1__py3-none-any.whl → 2.2.1__py3-none-any.whl - Mend

nautobot 2.2.0b1py3-none-any.whl → 2.2.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of nautobot might be problematic. Click here for more details.

Files changed (425) hide show

nautobot/core/settings.yaml CHANGED Viewed

@@ -1171,6 +1171,19 @@ properties:
       "Guide to Nautobot Prometheus metrics": "../guides/prometheus-metrics.md"
     type: "boolean"
     version_added: "2.1.5"
+  METRICS_DISABLED_APPS:
+    default: []
+    description: >-
+      A list of app names for which Prometheus metrics should be disabled.
+      (If provided as an environment variable, it should be a comma-separated string, for example
+      `NAUTOBOT_METRICS_DISABLED_APPS="nautobot_ssot, nautobot_device_lifecycle_mgmt"`.)
+    environment_variable: "NAUTOBOT_METRICS_DISABLED_APPS"
+    items:
+      type: "string"
+    see_also:
+      "Guide to Nautobot Prometheus metrics": "../guides/prometheus-metrics.md"
+    type: "array"
+    version_added: "2.2.1"
   METRICS_ENABLED:
     default: false
     description: "Toggle the availability of Prometheus-compatible metrics at `/metrics`."
@@ -1376,6 +1389,13 @@ properties:
     environment_variable: "NAUTOBOT_RACK_ELEVATION_DEFAULT_UNIT_WIDTH"
     is_constance_config: true
     type: "integer"
+  RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT:
+    default: false
+    description: "Enables two-digit format for the rack unit numbering in a rack elevation diagram."
+    environment_variable: "NAUTOBOT_RACK_ELEVATION_UNIT_TWO_DIGIT_FORMAT"
+    is_constance_config: true
+    type: "boolean"
+    version_added: "2.2.1"
   REDIS_LOCK_TIMEOUT:
     default: 600
     description: >-

nautobot/core/signals.py CHANGED Viewed

@@ -1,4 +1,5 @@
 """Custom signals and handlers for the core Nautobot application."""
 import contextlib
 from functools import wraps
 import inspect

nautobot/core/tables.py CHANGED Viewed

@@ -34,7 +34,7 @@ class BaseTable(django_tables2.Table):
             "class": "table table-hover table-headings",
         }
-    def __init__(self, *args, user=None, **kwargs):
+    def __init__(self, *args, user=None, hide_hierarchy_ui=False, **kwargs):
         # Add custom field columns
         model = self._meta.model
@@ -64,6 +64,7 @@ class BaseTable(django_tables2.Table):
         # Init table
         super().__init__(*args, **kwargs)
+        self.hide_hierarchy_ui = hide_hierarchy_ui
         # Set default empty_text if none was provided
         if self.empty_text is None:

nautobot/core/templates/admin/base.html CHANGED Viewed

@@ -8,55 +8,7 @@
 <html lang="en"{% if request.COOKIES|get_item:"theme" == 'dark' %} data-theme="dark"{% endif %}>
 <head>
     <title>{% block title %}Admin Home{% endblock %} - Nautobot</title>
-    <link rel="stylesheet"
-          href="{% static 'bootstrap-3.4.1-dist/css/bootstrap.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/css/bootstrap.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'materialdesignicons-6.5.95/css/materialdesignicons.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-6.5.95/css/materialdesignicons.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'jquery-ui-1.13.1/jquery-ui.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'select2-4.0.13/select2.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'flatpickr-4.6.9/themes/light.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/themes/light.min.css'">
-    <link rel="stylesheet" id="dark-theme"
-          href="{% versioned_static 'css/dark.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=css/dark.css'"{% if request.COOKIES|get_item:"theme" != 'dark' %} disabled="disabled"{% endif %} />
-    <link rel="stylesheet" id="base-theme"
-          href="{% versioned_static 'css/base.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=css/base.css'">
-    <link rel="apple-touch-icon" sizes="180x180" href="{%  custom_branding_or_static 'icon_180' 'img/nautobot_icon_180x180.png' %}">
-    <link rel="icon" type="image/png" sizes="32x32" href="{% custom_branding_or_static 'icon_32' 'img/nautobot_icon_32x32.png' %}">
-    <link rel="icon" type="image/png" sizes="16x16" href="{% custom_branding_or_static 'icon_16' 'img/nautobot_icon_16x16.png' %}">
-    <link rel="icon" type="image/png" href="{% custom_branding_or_static 'icon_192' 'img/nautobot_icon_192x192.png' %}" sizes="192x192">
-    <link rel="mask-icon" href="{% custom_branding_or_static 'icon_mask' 'img/nautobot_icon_monochrome.svg' %}" color="#0097ff">
-    <link rel="shortcut icon" href="{% custom_branding_or_static 'favicon' 'img/favicon.ico' %}">
-    <script src="{% static 'jquery/jquery-3.6.0.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery/jquery-3.6.0.min.js'"></script>
-    <script src="{% static 'jquery-ui-1.13.1/jquery-ui.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.js'"></script>
-    <script src="{% static 'bootstrap-3.4.1-dist/js/bootstrap.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/js/bootstrap.min.js'"></script>
-    <script src="{% static 'select2-4.0.13/select2.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.js'"></script>
-    <script src="{% static 'flatpickr-4.6.9/flatpickr.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/flatpickr.min.js'"></script>
-    <script src="{% static 'js/forms.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=js/forms.js'"></script>
-    <meta name="msapplication-TileColor" content="#2d89ef">
-    <meta name="theme-color" content="#ffffff">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
+    {% include 'inc/media.html' %}
     {% block extrahead %}{% endblock %}
     {% block extrastyle %}{% endblock %}
@@ -94,23 +46,27 @@
         }
     </style>
 </head>
-<body {% if is_popup %}style="padding-top: 0px;"{% endif %}>
+<body {% if is_popup %}style="padding-left: 0px;"{% endif %}>
 {% if not is_popup %}
     {% include 'inc/nav_menu.html' %}
 {% endif %}
-<div class="container-fluid wrapper" {% if is_popup %}style="padding-bottom: 0px;"{% endif %}>
-    {% if "BANNER_TOP"|settings_or_config %}
-        <div class="alert alert-info text-center" role="alert">
-            {{ "BANNER_TOP"|settings_or_config|safe }}
-        </div>
-    {% endif %}
-    {% if settings.MAINTENANCE_MODE %}
-        <div class="alert alert-warning text-center" role="alert">
-            <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
-            <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
-        </div>
+<div class="container-fluid wrapper" id="main-content" {% if is_popup %}style="padding-bottom: 0px;"{% endif %}>
+    {% if not is_popup %}
+        {% if "BANNER_TOP"|settings_or_config %}
+            <div class="alert alert-info text-center" role="alert">
+                {{ "BANNER_TOP"|settings_or_config|safe }}
+            </div>
+        {% endif %}
+        {% if settings.MAINTENANCE_MODE %}
+            <div class="alert alert-warning text-center" role="alert">
+                <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
+                <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
+            </div>
+        {% endif %}
+        {% plugin_banners %}
     {% endif %}
-    {% plugin_banners %}
     {% for message in messages %}
         <div class="alert alert-{{ message.tags }} alert-dismissable" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -148,8 +104,6 @@
             {% block content %}{{ content }}{% endblock %}
         </div>
     </div>
-    {% block footer %}<footer id="footer"></footer>{% endblock %}
     <div class="push"></div>
     {% if "BANNER_BOTTOM"|settings_or_config %}
         <div class="alert alert-info text-center banner-bottom" role="alert">
@@ -158,37 +112,12 @@
     {% endif %}
 </div>
 {% if not is_popup %}
-    <footer class="footer">
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col-xs-4">
-                    <p class="text-muted">{{ settings.HOSTNAME }} (v{{ settings.VERSION }})</p>
-                </div>
-                <div class="col-xs-4 text-center">
-                    <p class="text-muted">{% now 'Y-m-d H:i:s T' %}</p>
-                </div>
-                <div class="col-xs-4 text-right noprint">
-                    <p class="text-muted">
-                        <a href="#theme_modal" data-toggle="modal" data-target="#theme_modal" id="btn-theme-modal"><i class="mdi mdi-theme-light-dark text-primary"></i>Theme</a> &middot;
-                        <i class="mdi mdi-book-open-page-variant text-primary"></i>
-                        {% if settings.BRANDING_URLS.docs %}
-                            <a href="{{ settings.BRANDING_URLS.docs }}">Docs</a>
-                        {% else %}
-                            <a href="{% static 'docs/index.html' %}">Docs</a>
-                        {% endif %}
-                        &middot;
-                        <i class="mdi mdi-cloud-braces text-primary"></i> <a href="{% url 'api_docs' %}">API</a> &middot;
-                        <i class="mdi mdi-graphql text-primary"></i> <a href="{% url 'graphql' %}">GraphQL</a> &middot;
-                        <i class="mdi mdi-xml text-primary"></i> <a href="{{ settings.BRANDING_URLS.code }}">Code</a> &middot;
-                        <i class="mdi mdi-lifebuoy text-primary"></i> <a href="{{ settings.BRANDING_URLS.help }}">Help</a>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </footer>
+    {% include 'inc/footer.html' %}
 {% endif %}
 {% include 'modals/modal_theme.html' with name='theme'%}
-<script src="{% versioned_static 'js/theme.js' %}"></script>
-{% block javascript %}{% endblock %}
+{% block javascript %}
+    {% include 'inc/javascript.html' %}
+{% endblock %}
 </body>
 </html>

nautobot/core/templates/generic/object_retrieve.html CHANGED Viewed

@@ -87,7 +87,7 @@
                 Advanced
             </a>
         </li>
-        {% if is_contact_associatable_model %}
+        {% if object.is_contact_associable_model %}
             <li role="presentation"{% if request.GET.tab == 'contacts' %} class="active"{% endif %}>
                 <a href="{{ object.get_absolute_url }}#contacts" onclick="switch_tab(this.href)" aria-controls="contacts" role="tab" data-toggle="tab">
                     Contacts
@@ -159,7 +159,7 @@
                 </div>
             </div>
         </div>
-        {% if is_contact_associatable_model %}
+        {% if object.is_contact_associable_model %}
             <div id="contacts" role="tabpanel" class="tab-pane {% if request.GET.tab == 'contacts' %}active{% else %}fade{% endif %}">
                 <div class="row">
                     <div class="col-md-12">

nautobot/core/templates/graphene/graphiql.html CHANGED Viewed

@@ -10,53 +10,31 @@ add "&raw" to the end of the URL within a browser.
 <!DOCTYPE html>
 <html>
 <head>
+  {% include 'inc/media.html' %}
+  {% block extra_styles %}{% endblock %}
   <!-- Nautobot template requirements -->
   <title>{% block title %}GraphiQL{% endblock %} - {{ settings.BRANDING_TITLE }}</title>
-  <link rel="stylesheet"
-        href="{% static 'bootstrap-3.4.1-dist/css/bootstrap.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/css/bootstrap.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'materialdesignicons-6.5.95/css/materialdesignicons.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-6.5.95/css/materialdesignicons.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'jquery-ui-1.13.1/jquery-ui.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'select2-4.0.13/select2.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
-  <link rel="stylesheet"
-        href="{% static 'flatpickr-4.6.9/themes/light.min.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/themes/light.min.css'">
-  <link rel="stylesheet" id="dark-theme"
-        href="{% versioned_static 'css/dark.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=css/dark.css'" disabled="disabled" />
-  <link rel="stylesheet"
-        href="{% versioned_static 'css/base.css' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=css/base.css'">
-  <link rel="apple-touch-icon" sizes="180x180" href="{% custom_branding_or_static 'icon_180' 'img/nautobot_icon_180x180.png' %}">
-  <link rel="icon" type="image/png" sizes="32x32" href="{% custom_branding_or_static 'icon_32' 'img/nautobot_icon_32x32.png' %}">
-  <link rel="icon" type="image/png" sizes="16x16" href="{% custom_branding_or_static 'icon_16' 'img/nautobot_icon_16x16.png' %}">
-  <link rel="icon" type="image/png" sizes="192x192" href="{% custom_branding_or_static 'icon_192' 'img/nautobot_icon_192x192.png' %}">
-  <link rel="mask-icon" type="image/png" color="#0097ff" href="{% custom_branding_or_static 'icon_mask' 'img/nautobot_icon_monochrome.png' %}">
-  <link rel="shortcut icon" href="{% custom_branding_or_static 'favicon' 'img/favicon.ico' %}">
-  <meta name="msapplication-TileColor" content="#2d89ef">
-  <meta name="theme-color" content="#ffffff">
-  <meta charset="UTF-8">
-  <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
   <!-- GraphiQL template requirements -->
   <style>
-    html, body, #editor {
-      height: 100%;
+    #editor {
       margin: 0;
       width: 100%;
+      height: calc(100vh - 56px - 3rem);
     }
     .toolbar .dropdown-menu > li > a {
         clear: left;
         margin-right: 120px;  /* leave room for the "Save Changes" button if present */
     }
+    .graphiql-container .doc-explorer-title-bar {
+      box-sizing: content-box;
+  }
+    .graphiql-container .history-title-bar {
+      box-sizing: content-box;
+  }
+  .graphiql-container .docExplorerShow {
+    white-space: nowrap;
+  }
   </style>
   <!-- As Nautobot may be run without internet access, we source these files locally rather than from an online CDN -->
   <link rel="stylesheet"
@@ -72,23 +50,16 @@ add "&raw" to the end of the URL within a browser.
           onerror="window.location='{% url 'media_failure' %}?filename=graphiql-1.5.16/graphiql.min.js'"></script>
   <script src="{% static 'subscriptions-transport-ws-0.9.18/client.min.js' %}"
       onerror="window.location='{% url 'media_failure' %}?filename=subscriptions-transport-ws-0.9.18/client.min.js'"></script>
-  <!-- Custom CSS to address some conflicts between the two -->
-  <style>
-    body {
-      padding-top: 54px;
-    }
-    .graphiql-container .doc-explorer-title-bar {
-        box-sizing: content-box;
-    }
-  </style>
 </head>
 <body>
   <!-- Nautobot page contents -->
   {% include 'inc/nav_menu.html' %}
   {% include 'modals/modal_theme.html' with name='theme'%}
   {% include 'inc/javascript.html' %}
-  <!-- GraphiQL page contents -->
-  <div id="editor"></div>
+  <div class="container-fluid wrapper" id="main-content">
+    <!-- GraphiQL page contents -->
+    <div id="editor"></div>
+  </div>
   {% include 'inc/footer.html' %}
   {% csrf_token %}
   <script type="application/javascript">

nautobot/core/templates/inc/footer.html CHANGED Viewed

@@ -3,8 +3,8 @@
 {% load plugins %}
 <style>
-    /* Styles for viewports narrower than 1007px */
-    @media (max-width: 1007px) {
+    /* Styles for viewports narrower than 1232px, i.e. bootstrap 'xs' and 'sm' layouts */
+    @media (max-width: 1232px) {
         .footer-col-1, .footer-col-2, .footer-col-3 {
             text-align: center !important;
         }
@@ -19,7 +19,7 @@
     <footer class="footer" id="footer">
         <div class="container-fluid">
             <div class="row">
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-3 col-xs-12 text-left footer-col-1 no-wrap">
+                <div class="col-xl-4 col-lg-4 col-md-3 col-sm-12 col-xs-12 text-left footer-col-1 no-wrap">
                     {% if request.user.is_authenticated  %}
                         <p class="text-muted">
                             {% if settings.BRANDING_FILEPATHS.logo and settings.BRANDING_POWERED_BY_URL %}<a href="{{ settings.BRANDING_POWERED_BY_URL }}"><img src="{% static 'img/nautobot_logo.svg' %}" height="20" /> Powered</a> &middot;{% endif %}
@@ -27,10 +27,10 @@
                         </p>
                     {% endif %}
                 </div>
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-3 col-xs-12 text-center footer-col-2">
+                <div class="col-xl-4 col-lg-3 col-md-3 col-sm-12 col-xs-12 text-center footer-col-2">
                     <p class="text-muted">{% now 'Y-m-d H:i:s T' %}</p>
                 </div>
-                <div class="col-xl-4 col-lg-4 col-md-4 col-sm-6 col-xs-12 text-right footer-col-3 noprint">
+                <div class="col-xl-4 col-lg-5 col-md-6 col-sm-12 col-xs-12 text-right footer-col-3 noprint">
                     {% if request.user.is_authenticated  %}
                     <p class="text-muted footer-links">
                         <a href="#theme_modal" data-toggle="modal" data-target="#theme_modal" id="btn-theme-modal"><i class="mdi mdi-theme-light-dark text-primary"></i>Theme</a> &middot;

nautobot/core/templates/inc/javascript.html CHANGED Viewed

@@ -2,10 +2,10 @@
 {% load plugins %}
 {% load static %}
-<script src="{% static 'jquery/jquery-3.6.0.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery/jquery-3.6.0.min.js'"></script>
-<script src="{% static 'jquery-ui-1.13.1/jquery-ui.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.js'"></script>
+<script src="{% static 'jquery/jquery-3.7.1.min.js' %}"
+        onerror="window.location='{% url 'media_failure' %}?filename=jquery/jquery-3.7.1.min.js'"></script>
+<script src="{% static 'jquery-ui-1.13.2/jquery-ui.min.js' %}"
+        onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.2/jquery-ui.min.js'"></script>
 <script src="{% static 'bootstrap-3.4.1-dist/js/bootstrap.min.js' %}"
         onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/js/bootstrap.min.js'"></script>
 <script src="{% static 'select2-4.0.13/select2.min.js' %}"

nautobot/core/templates/inc/media.html CHANGED Viewed

@@ -11,8 +11,8 @@
           href="{% static 'materialdesignicons-6.5.95/css/materialdesignicons.min.css' %}"
           onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-6.5.95/css/materialdesignicons.min.css'">
     <link rel="stylesheet"
-          href="{% static 'jquery-ui-1.13.1/jquery-ui.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.css'">
+          href="{% static 'jquery-ui-1.13.2/jquery-ui.min.css' %}"
+          onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.2/jquery-ui.min.css'">
     <link rel="stylesheet"
           href="{% static 'select2-4.0.13/select2.min.css' %}"
           onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">

nautobot/core/templates/inc/nav_menu.html CHANGED Viewed

@@ -121,9 +121,6 @@
     document.addEventListener('DOMContentLoaded', function() {
         const navbar = document.querySelector('.navbar-fixed-left');
         const navbarHeader = document.querySelector('.navbar-header');
-        const breadcrumb = document.querySelector('.breadcrumb');
-        const bannerAlertArea = document.querySelector('.banner-alert-area');
-        const bannerAlert = document.querySelector('.plugin-banner') !== null;
         const mainContent = document.querySelector('#main-content');
         const footer = document.querySelector('#footer');
         const dropdownToggles = document.querySelectorAll('.navbar-fixed-left .navbar-nav > .dropdown > a[data-toggle="collapse"]');
@@ -180,10 +177,6 @@
         function adjustElementsForNavbarState(isCollapsed) {
             const marginLeftValue = isCollapsed ? '-240px' : '0px';
             mainContent.style.marginLeft = marginLeftValue;
-            bannerAlertArea.classList.toggle('collapsed', isCollapsed);
-            if(!bannerAlert && breadcrumb) {
-                breadcrumb.classList.toggle('collapsed', isCollapsed);
-            };
             if(footer) footer.style.marginLeft = marginLeftValue;
             toggler.style.left = isCollapsed ? '-5px' : '225px';
         }

nautobot/core/templates/nautobot_config.py.j2 CHANGED Viewed

@@ -415,6 +415,11 @@ INSTALLATION_METRICS_ENABLED = is_truthy(os.getenv("NAUTOBOT_INSTALLATION_METRIC
 #
 # METRICS_AUTHENTICATED = is_truthy(os.getenv("NAUTOBOT_METRICS_AUTHENTICATED", "False"))
+# Disable app metrics for specific 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(",")
 # Credentials that Nautobot will uses to authenticate to devices when connecting via NAPALM.
 #
 # NAPALM_USERNAME = os.getenv("NAUTOBOT_NAPALM_USERNAME", "")
@@ -472,6 +477,14 @@ INSTALLATION_METRICS_ENABLED = is_truthy(os.getenv("NAUTOBOT_INSTALLATION_METRIC
 # ):
 #     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"])
 # Sets an age out timer of redis lock. This is NOT implicitly applied to locks, must be added
 # to a lock creation as `timeout=settings.REDIS_LOCK_TIMEOUT`
 #
@@ -509,7 +522,7 @@ INSTALLATION_METRICS_ENABLED = is_truthy(os.getenv("NAUTOBOT_INSTALLATION_METRIC
 # class path of the storage driver in STORAGE_BACKEND and any configuration options in STORAGE_CONFIG.
 # These default to None and {} respectively.
 #
-# STORAGE_BACKEND = 'storages.backends.s3boto3.S3Boto3Storage'
+# STORAGE_BACKEND = 'storages.backends.s3.S3Storage'
 # STORAGE_CONFIG = {
 #     'AWS_ACCESS_KEY_ID': 'Key ID',
 #     'AWS_SECRET_ACCESS_KEY': 'Secret',

nautobot/core/templates/rest_framework/api.html CHANGED Viewed

@@ -7,13 +7,20 @@
     {% include 'inc/media.html' %}
 {% endblock bootstrap_theme %}
-{% block navbar %}
-    {% include 'inc/nav_menu.html' %}
-{% endblock navbar %}
 {% block body %}
-    {{ block.super }}
+    {% include 'inc/nav_menu.html' %}
+    <div class="container-fluid" id="main-content">
+        {{ block.super }}
+    </div>
     {% include 'inc/footer.html' %}
+    <style>
+        .navbar-static-top {
+            display: none;
+        }
+        #main-content {
+            min-height: calc(100vh - 70px);
+        }
+    </style>
 {% endblock body %}
 {% block script %}

nautobot/core/templatetags/helpers.py CHANGED Viewed

@@ -85,7 +85,7 @@ def hyperlinked_object(value, field="display"):
 @register.filter()
 def hyperlinked_email(value):
     """Render an email address as a `mailto:` hyperlink."""
-    if value is None:
+    if not value:
         return placeholder(value)
     return format_html('<a href="mailto:{}">{}</a>', value, value)
@@ -94,7 +94,7 @@ def hyperlinked_email(value):
 @register.filter()
 def hyperlinked_phone_number(value):
     """Render a phone number as a `tel:` hyperlink."""
-    if value is None:
+    if not value:
         return placeholder(value)
     return format_html('<a href="tel:{}">{}</a>', value, value)

nautobot/core/testing/__init__.py CHANGED Viewed

@@ -109,7 +109,7 @@ def get_job_class_and_model(module, name, source="local"):
 @tag("unit")
-class TransactionTestCase(_TransactionTestCase, NautobotTestCaseMixin):
+class TransactionTestCase(NautobotTestCaseMixin, _TransactionTestCase):
     """
     Base test case class using the TransactionTestCase for unit testing
     """

nautobot/core/testing/filters.py CHANGED Viewed

@@ -44,7 +44,7 @@ class FilterTestCases:
                 # randomly break out of loop after 2 values have been selected
                 if len(test_values) > 1 and random.choice([True, False]):  # noqa: S311  # suspicious-non-cryptographic-random-usage
                     break
-                if value[field_name] and value["count"] <= qs_count:
+                if value[field_name] and value["count"] < qs_count:
                     qs_count -= value["count"]
                     test_values.append(str(value[field_name]))

nautobot/core/testing/views.py CHANGED Viewed

@@ -17,6 +17,7 @@ from tree_queries.models import TreeNode
 from nautobot.core import testing
 from nautobot.core.models.generics import PrimaryModel
+from nautobot.core.models.tree_queries import TreeModel
 from nautobot.core.templatetags import helpers
 from nautobot.core.testing import mixins
 from nautobot.core.utils import lookup
@@ -24,6 +25,7 @@ from nautobot.extras import choices as extras_choices, models as extras_models,
 from nautobot.extras.forms import CustomFieldModelFormMixin, RelationshipModelFormMixin
 from nautobot.extras.models import CustomFieldModel, RelationshipModel
 from nautobot.extras.models.mixins import NotesMixin
+from nautobot.ipam.models import Prefix
 from nautobot.users import models as users_models
 __all__ = (
@@ -722,6 +724,8 @@ class ViewTestCases:
         """
         filterset = None
+        filter_on_field = "name"
+        sort_on_field = "tags"
         def get_filterset(self):
             return self.filterset or lookup.get_filterset_for_model(self.model)
@@ -737,6 +741,32 @@ class ViewTestCases:
         def get_list_view(self):
             return lookup.get_view_for_model(self.model, view_type="List")
+        def test_table_with_indentation_is_removed_on_filter_or_sort(self):
+            self.user.is_superuser = True
+            self.user.save()
+            if not issubclass(self.model, (TreeModel)) and self.model is not Prefix:
+                self.skipTest("Skipping Non TreeModels")
+            with self.subTest("Assert indentation is present"):
+                response = self.client.get(f"{self._get_url('list')}")
+                response_body = response.content.decode(response.charset)
+                self.assertInHTML('<i class="mdi mdi-circle-small"></i>', response_body)
+            with self.subTest("Assert indentation is removed on filter"):
+                queryset = (
+                    self._get_queryset().filter(parent__isnull=False).values_list(self.filter_on_field, flat=True)[:5]
+                )
+                filter_values = "&".join([f"{self.filter_on_field}={instance_value}" for instance_value in queryset])
+                response = self.client.get(f"{self._get_url('list')}?{filter_values}")
+                response_body = response.content.decode(response.charset)
+                self.assertNotIn('<i class="mdi mdi-circle-small"></i>', response_body)
+            with self.subTest("Assert indentation is removed on sort"):
+                response = self.client.get(f"{self._get_url('list')}?sort={self.sort_on_field}")
+                response_body = response.content.decode(response.charset)
+                self.assertNotIn('<i class="mdi mdi-circle-small"></i>', response_body)
         @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
         def test_list_objects_anonymous(self):
             # Make the request as an unauthenticated user

nautobot/core/tests/integration/test_view_authentication.py ADDED Viewed

@@ -0,0 +1,68 @@
+from django.test import tag
+from nautobot.core.testing import TestCase
+from nautobot.core.utils.lookup import get_url_for_url_pattern, get_url_patterns
+@tag("integration")
+class AuthenticationEnforcedTestCase(TestCase):
+    r"""
+    Test that all\* registered views require authentication to access.
+    \* with a very small number of known exceptions such as login and logout views.
+    """
+    def test_all_views_require_authentication(self):
+        self.client.logout()
+        url_patterns = get_url_patterns()
+        for url_pattern in url_patterns:
+            with self.subTest(url_pattern=url_pattern):
+                url = get_url_for_url_pattern(url_pattern)
+                response = self.client.get(url, follow=True)
+                if response.status_code == 405:  # Method not allowed
+                    response = self.client.post(url, follow=True)
+                # Is a view that *should* be open to unauthenticated users?
+                if url in [
+                    "/admin/login/",
+                    "/api/plugins/example-app/webhook/",
+                    "/health/",
+                    "/login/",
+                    "/media-failure/",
+                    "/template.css",
+                ]:
+                    self.assertHttpStatus(response, 200, msg=url)
+                elif response.status_code == 200:
+                    # UI views generally should redirect unauthenticated users to the appropriate login page
+                    if url.startswith("/admin"):
+                        if "logout" in url:
+                            # /admin/logout/ sets next=/admin/ because having login redirect to logout would be silly
+                            redirect_url = "/admin/login/?next=/admin/"
+                        else:
+                            redirect_url = f"/admin/login/?next={url}"
+                    else:
+                        if "logout" in url:
+                            # /logout/ sets next=/ because having login redirect back to logout would be silly
+                            redirect_url = "/login/?next=/"
+                        else:
+                            redirect_url = f"/login/?next={url}"
+                    self.assertRedirects(response, redirect_url)
+                elif response.status_code != 403:
+                    if any(
+                        url.startswith(path)
+                        for path in [
+                            "/complete/",  # social auth
+                            "/health/string/",  # health-check
+                            "/login/",  # social auth
+                            "/media/",  # MEDIA_ROOT
+                            "/plugins/example-app/docs/",  # STATIC_ROOT
+                        ]
+                    ):
+                        self.assertEqual(response.status_code, 404)
+                    else:
+                        self.fail(
+                            f"Unexpected {response.status_code} response at {url}: "
+                            + response.content.decode(response.charset)
+                        )

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

Potentially problematic release.

nautobot 2.2.0b1py3-none-any.whl → 2.2.1py3-none-any.whl