nautobot 2.2.8__py3-none-any.whl → 2.3.0__py3-none-any.whl

nautobot/core/templates/generic/object_changelog.html

@@ -1,17 +1,8 @@
 {% extends base_template %}
-{% load helpers %}
 
 {% block title %}{{ block.super }} - Change Log{% endblock %}
 
 {% block content %}
     {% include 'panel_table.html' %}
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
-    <div class="text-muted">
-        Change log retention:
-        {% if "CHANGELOG_RETENTION"|settings_or_config %}
-            {{ "CHANGELOG_RETENTION"|settings_or_config }} days
-        {% else %}
-            Indefinite
-        {% endif %}
-    </div>
 {% endblock %}

nautobot/core/templates/generic/object_list.html

@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load buttons %}
 {% load helpers %}
+{% load perms %}
 {% load plugins %}
 {% load static %}
 
@@ -40,27 +41,123 @@
     {% plugin_buttons content_type.model_class 'list' %}
     {% if table and request.user.is_authenticated and table_config_form %}
         {% block table_config_button %}
-            <button type="button" class="btn btn-default" data-toggle="modal" data-target="#ObjectTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+            {% table_config_button table table_name="ObjectTable" %}
         {% endblock table_config_button %}
     {% endif %}
     {% if filter_form or dynamic_filter_form %}
         <button type="button" class="btn btn-default" data-toggle="modal" data-target="#FilterForm_modal" title="Add filters" id="id__filterbtn"><i class="mdi mdi-filter"></i> Filter</button>
     {% endif %}
-    {% if permissions.add and 'add' in action_buttons %}
-        {% add_button content_type.model_class|validated_viewname:"add" %}
+    {% if model.is_saved_view_model %}
+        <div class="btn-group">
+            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="mdi mdi-view-compact-outline" aria-hidden="true"></span> Saved Views <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu">
+                {% for saved_view in saved_views %}
+                    <li>
+                        {% if saved_view == current_saved_view %}
+                            <a href="{% url list_url %}?clear_view=true">
+                                <i class="mdi mdi-check-bold text-bold" aria-hidden="true"></i>
+                                <strong>
+                                    {{saved_view.name}}
+                                </strong>
+                            </a>
+                        {% else %}
+                            <a href="{{ saved_view.get_absolute_url }}">
+                                <i class="mdi mdi-view-compact-outline text-muted" aria-hidden="true"></i>
+                                {{saved_view.name}}
+                            </a>
+                        {% endif %}
+                    </li>
+                {% endfor %}
+                {% if saved_views %}
+                    <li role="separator" class="divider"></li>
+                {% endif %}
+                {% if current_saved_view %}
+                    <li>
+                        <a href="{% url 'extras:savedview_update_config' pk=request.GET.saved_view %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}">
+                            <i class="mdi mdi-content-save-outline text-muted" aria-hidden="true"></i>
+                            <span>Update Current Saved View</span>
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{% url 'extras:savedview_set_default' pk=request.GET.saved_view %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}">
+                            <i class="mdi mdi-star text-muted" aria-hidden="true"></i>
+                            <span>Set As My Default</span>
+                        </a>
+                    </li>
+                {% endif %}
+                <li>
+                    <a href="" data-toggle="modal" data-target="#saved_view_modal" title="Save Current View As">
+                        <i class="mdi mdi-content-save-plus-outline text-muted" aria-hidden="true"></i>
+                        <span>Save As New View</span>
+                    </a>
+                </li>
+                {% if current_saved_view %}
+                    <li>
+                        <a href="{% url 'extras:savedview_delete' pk=request.GET.saved_view %}">
+                            <i class="mdi mdi-trash-can-outline text-danger" aria-hidden="true"></i>
+                            <span class="text-danger">Delete Current Saved View</span>
+                        </a>
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
     {% endif %}
+    <div class="btn-group">
+        {% if permissions.add and 'add' in action_buttons %}
+            {% add_button content_type.model_class|validated_viewname:"add" verbose_name=model|meta:"verbose_name"|bettertitle %}
+            <button type="button" id="actions-dropdown" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                <span class="caret"></span>
+                <span class="sr-only">Toggle Dropdown</span>
+            </button>
+        {% elif permissions.add and 'import' in action_buttons %}
+            <button type="button" id="actions-dropdown" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                Actions <span class="caret"></span>
+            </button>
+        {% elif 'export' in action_buttons %}
+            <button type="button" id="actions-dropdown" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                Actions <span class="caret"></span>
+            </button>
+        {% endif %}
+        <ul class="dropdown-menu pull-right" role="menu">
+            {% if permissions.add and 'import' in action_buttons %}
+                {% block import_list_element %}
+                    {% job_import_button content_type list_element=True%}
+                {% endblock import_list_element %}
+            {% endif %}
+            {% if permissions.add and 'import' in action_buttons and 'export' in action_buttons %}
+                <li class="divider"></li>
+            {% endif %}
+            {% if 'export' in action_buttons %}
+                {% block export_list_element %}
+                    {% export_button content_type list_element=True %}
+                {% endblock export_list_element %}
+            {% endif %}
+        </ul>
+    </div>
+    {% comment %} TODO: 3.0 Remove legacy import_button and export button {% endcomment %}
     {% if permissions.add and 'import' in action_buttons %}
         {% block import_button %}
-            {% job_import_button content_type %}
         {% endblock import_button %}
     {% endif %}
     {% if 'export' in action_buttons %}
         {% block export_button %}
-            {% export_button content_type %}
         {% endblock export_button %}
     {% endif %}
 </div>
-<h1>{% block title %}{{ title }}{% endblock %}</h1>
+<h1>{% block title %}
+    {{ title }}
+        {% if current_saved_view %}
+            —
+            {% if new_changes_not_applied %}
+                <i title="Pending changes not saved">{{ current_saved_view.name }}</i>
+            {% else %}
+                {{ current_saved_view.name }}
+            {% endif %}
+        {% endif %}
+    {% endblock %}
+</h1>
 {% block header_extra %}{% endblock %}
 {% if filter_params %}
 <div class="filters-applied">
@@ -103,7 +200,7 @@
     <div class="col-md-12">
         {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
         {% if permissions.change or permissions.delete %}
-            <form method="post" class="form form-horizontal">
+            <form id="object_list_form" method="post" class="form form-horizontal">
                 {% csrf_token %}
                 <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
                 {% if table.paginator.num_pages > 1 %}
@@ -117,6 +214,18 @@
                                 </label>
                             </div>
                             <div class="pull-right">
+                                {% if content_type.model_class.is_dynamic_group_associable_model and perms.extras.add_staticgroupassociation %}
+                                    <button type="button"
+                                            id="update_dynamic_groups_for_all"
+                                            data-toggle="modal"
+                                            data-target="#dynamic_group_assignment_modal"
+                                            data-objects="all"
+                                            class="btn btn-primary btn-sm"
+                                            disabled="disabled">
+                                        <span class="mdi mdi-group" aria-hidden="true"></span>
+                                        Update Group Assignment for All
+                                    </button>
+                                {% endif %}
                                 {% if bulk_edit_url and permissions.change %}
                                     <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
                                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit All
@@ -133,18 +242,11 @@
                 </div>
                 {% endif %}
                 {% include table_template|default:'panel_table.html' %}
+
                 <div class="pull-left noprint">
+                    {% consolidate_bulk_action_buttons %}
                     {% block bulk_buttons %}{% endblock %}
-                    {% if bulk_edit_url and permissions.change %}
-                        <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm">
-                            <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit Selected
-                        </button>
-                    {% endif %}
-                    {% if bulk_delete_url and permissions.delete %}
-                        <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm">
-                            <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete Selected
-                        </button>
-                    {% endif %}
+
                 </div>
             </form>
         {% else %}
@@ -158,6 +260,10 @@
 </div>
 {% if table %}{% table_config_form table table_name="ObjectTable" %}{% endif %}
 {% filter_form_modal filter_form dynamic_filter_form model_plural_name=title %}
+{% if model.is_saved_view_model %}
+    {% saved_view_modal request.GET.urlencode list_url model request %}
+{% endif %}
+{% dynamic_group_assignment_modal request=request content_type=content_type %}
 {% endblock %}
 
 {% block javascript %}
@@ -180,5 +286,38 @@
         added: jsify_form,
         removed: (row) => { row.remove(); }
     });
+
+    // TODO: move this to a JS file that is auto-included by dynamic_group_assignment_modal templatetag
+    $("#dynamic_group_assignment_modal").on("show.bs.modal", function (event) {
+        const button = $(event.relatedTarget);
+        const selected_or_all = button.data("objects");
+        const pks_target = document.getElementById("dynamic_group_assignment_pks");
+        pks_target.replaceChildren();
+        if (selected_or_all == "all") {
+            document.getElementById("dynamic_group_assignment_all").value = true;
+        } else {
+            document.getElementById("dynamic_group_assignment_all").value = "";
+            const formData = new FormData(document.getElementById("object_list_form"));
+            for (let pk of formData.getAll("pk")) {
+                let input = document.createElement("input");
+                input.setAttribute("type", "hidden");
+                input.setAttribute("name", "pk");
+                input.setAttribute("value", pk);
+                pks_target.append(input);
+            }
+        }
+    });
+
+    document.getElementById("dynamic_group_assignment_cancel").addEventListener("click", (e) => {
+        // Clear form data on cancel, but not on "close" "x" button
+        $("#dynamic_group_assignment_modal").modal("hide");
+        document.getElementById("dynamic_group_assignment_all").value = "";
+        document.getElementById("dynamic_group_assignment_pks").replaceChildren();
+        document.getElementById("id_create_and_assign_to_new_group_name").value = "";
+        $("#id_add_to_groups").val(null).trigger("change");
+        $("#id_remove_from_groups").val(null).trigger("change");
+    });
+
+
 </script>
 {% endblock %}

nautobot/core/templates/generic/object_retrieve.html

@@ -46,15 +46,7 @@
     {% block buttons %}
         {% plugin_buttons object %}
         {% block extra_buttons %}{% endblock extra_buttons %}
-        {% if object.clone_fields and user|can_add:object %}
-            {% clone_button object %}
-        {% endif %}
-        {% if user|can_change:object %}
-            {% edit_button object %}
-        {% endif %}
-        {% if user|can_delete:object %}
-            {% delete_button object %}
-        {% endif %}
+        {% consolidate_detail_view_action_buttons %}
     {% endblock buttons %}
     </div>
 
@@ -102,12 +94,27 @@
                 </li>
             {% endif %}
         {% endif %}
-        {% if perms.extras.view_dynamicgroup and object.get_dynamic_groups_url %}
-            {% if active_tab != 'dynamic-groups' and object.get_dynamic_groups_url or active_tab == 'dynamic-groups' %}
-                <li role="presentation"{% if active_tab == 'dynamic-groups' %} class="active"{% endif %}>
-                    <a href="{{ object.get_dynamic_groups_url }}">Dynamic Groups</a>
-                </li>
-            {% endif %}
+        {% if object.is_dynamic_group_associable_model and perms.extras.view_dynamicgroup %}
+            {% with object.dynamic_groups.count as dg_count %}
+                {% if dg_count %}
+                    <li role="presentation"{% if request.GET.tab == 'dynamic_groups' %} class="active"{% endif %}>
+                        <a href="{{ object.get_absolute_url }}#dynamic_groups" onclick="switch_tab(this.href)" aria-controls="dynamic_groups" role="tab" data-toggle="tab">
+                            Dynamic Groups {% badge dg_count %}
+                        </a>
+                    </li>
+                {% endif %}
+            {% endwith %}
+        {% endif %}
+        {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
+            {% with object.associated_object_metadata.count as om_count %}
+                {% if om_count %}
+                    <li role="presentation"{% if request.GET.tab == 'object_metadata' %} class="active"{% endif %}>
+                        <a href="{{ object.get_absolute_url }}#object_metadata" onclick="switch_tab(this.href)" aria-controls="object_metadata" role="tab" data-toggle="tab">
+                            Object Metadata {% badge om_count %}
+                        </a>
+                    </li>
+                {% endif %}
+            {% endwith %}
         {% endif %}
         {% if perms.extras.view_objectchange %}
             {% if active_tab != 'changelog' and object.get_changelog_url or active_tab == 'changelog' %}
@@ -148,6 +155,7 @@
             <div class="row">
                 <div class="col-md-6">
                     {% include 'inc/object_details_advanced_panel.html' %}
+                    {% block advanced_content_left_page %}{% endblock advanced_content_left_page %}
                 </div>
                 <div class="col-md-6">
                     {% block advanced_content_right_page %}{% endblock advanced_content_right_page %}
@@ -203,6 +211,62 @@
                 </div>
             </div>
         {% endif %}
+        {% if object.is_dynamic_group_associable_model and perms.extras.view_dynamicgroup %}
+            <div id="dynamic_groups" role="tabpanel" class="tab-pane {% if request.GET.tab == 'dynamic_groups' %}active{% else %}fade{% endif %}">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="alert alert-warning">
+                            Dynamic group membership is cached for performance reasons,
+                            therefore this table may not always be up-to-date.
+                            <br>You can refresh the membership of any specific group by navigating to it from the list below
+                            or from the <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+                            <br>You can also refresh the membership of all groups by running the
+                            <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <form method="post">
+                            {% csrf_token %}
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <strong>Dynamic Groups</strong>
+                                    <div class="pull-right noprint">
+                                        <!-- Insert table config button here -->
+                                    </div>
+                                </div>
+                                <div class="table-responsive">
+                                    {% render_table associated_dynamic_groups_table 'inc/table.html' %}
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+        {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
+            <div id="object_metadata" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadata' %}active{% else %}fade{% endif %}">
+                <div class="row">
+                    <div class="col-md-12">
+                        <form method="post">
+                            {% csrf_token %}
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <strong>Object Metadata</strong>
+                                    <div class="pull-right noprint">
+                                        <!-- Insert table config button here -->
+                                    </div>
+                                </div>
+                                <div class="table-responsive">
+                                    {% render_table associated_object_metadata_table 'inc/table.html' %}
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
         {% block extra_tab_content %}{% endblock extra_tab_content %}
     </div>
 {% endblock content %}
@@ -216,7 +280,7 @@
 
     clipboard.on('error', function (e) {});
 
-    
+
     // Set initial history state
     if (location.pathname == "{{ object.get_absolute_url }}"){
         var tab_id = "main";

nautobot/core/templates/inc/extras_features_edit_form_fields.html

@@ -24,6 +24,14 @@
         </div>
     </div>
 {% endif %}
+{% if form.dynamic_groups and perms.extras.add_staticgroupassociation %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Static Assignment to Dynamic Groups</strong></div>
+        <div class="panel-body">
+            {% render_field form.dynamic_groups %}
+        </div>
+    </div>
+{% endif %}
 {% if form.tags %}
     <div class="panel panel-default">
         <div class="panel-heading"><strong>Tags</strong></div>

nautobot/core/templates/inc/javascript.html

@@ -20,6 +20,8 @@
         onerror="window.location='{% url 'media_failure' %}?filename=js/forms.js'"></script>
 <script src="{% versioned_static 'js/theme.js' %}"
         onerror="window.location='{% url 'media_failure' %}?filename=js/theme.js'"></script>
+<script src="{% versioned_static 'js/table_sorting_indicator.js' %}"
+        onerror="window.location='{% url 'media_failure' %}?filename=js/table_sorting_indicator.js'"></script>
 <script type="text/javascript">
     var nautobot_api_path = "{% url 'api-root' %}";
     var nautobot_csrf_token = "{{ csrf_token }}";

nautobot/core/templates/inc/media.html

@@ -8,8 +8,8 @@
           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'">
+          href="{% static 'materialdesignicons-7.4.47/css/materialdesignicons.min.css' %}"
+          onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-7.4.47/css/materialdesignicons.min.css'">
     <link rel="stylesheet"
           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'">

nautobot/core/templates/inc/nav_menu.html

@@ -95,6 +95,7 @@
                         <ul class="collapse nav-dropdown-menu" id="adminDropdown">
                             <li><a href="{% url 'user:profile' %}"><i class="mdi mdi-account-box"></i> Profile</a></li>
                             {% if request.user.is_staff %}
+                                <li><a href="{% url 'worker_status' %}"><i class="mdi mdi-server-network"></i> Worker Status</a></li>
                                 <li><a href="{% url 'admin:index' %}"><i class="mdi mdi-cogs"></i> Admin</a></li>
                             {% endif %}
                             <li class="divider"></li>

nautobot/core/templates/inc/paginator.html

@@ -20,7 +20,7 @@
             </ul>
         </nav>
     {% endif %}
-    <form method="get">
+    <form method="get" class="form-inline">
         {% for k, v_list in request.GET.lists %}
             {% if k != 'per_page' %}
                 {% for v in v_list %}
@@ -28,15 +28,15 @@
                 {% endfor %}
             {% endif %}
         {% endfor %}
-        <select name="per_page" id="per_page">
+        <select name="per_page" id="per_page" class="form-control">
             {% for n in "PER_PAGE_DEFAULTS"|settings_or_config %}
                 <option value="{{ n }}"{% if page.paginator.per_page == n %} selected="selected"{% endif %}>{{ n }}</option>
             {% endfor %}
         </select> per page
+        {% if page %}
+            <div class="text-right text-muted">
+                Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}
+            </div>
+        {% endif %}
     </form>
-    {% if page %}
-        <div class="text-right text-muted">
-            Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }}
-        </div>
-    {% endif %}
 </div>

nautobot/core/templates/inc/search_panel.html

@@ -20,8 +20,8 @@
         <button type="submit" class="btn btn-primary">
             <span class="mdi mdi-magnify" aria-hidden="true"></span> Apply
         </button>
-        <a href="." class="btn btn-default">
+        <button type="reset" class="btn btn-default">
             <span class="mdi mdi-close-thick" aria-hidden="true"></span> Clear
-        </a>
+        </button>
     </div>
 </form>

nautobot/core/templates/inc/table.html

@@ -6,7 +6,7 @@
             <tr>
                 {% for column in table.columns %}
                     {% if column.orderable %}
-                        <th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
+                        <th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}" data-column-name="{{ column.name }}">{{ column.header }}</a></th>
                     {% else %}
                         <th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
                     {% endif %}
@@ -38,4 +38,4 @@
             </tr>
         </tfoot>
     {% endif %}
-</table>
+</table>

nautobot/core/templates/nautobot_config.py.j2

@@ -159,6 +159,19 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 #     },
 # }
 
+# Enable the following to setup structlog logging for Nautobot.
+# Configures defined loggers to use structlog and overwrites all formatters and handlers.
+#
+# from nautobot.core.settings_funcs import setup_structlog_logging
+# setup_structlog_logging(
+#     LOGGING,
+#     INSTALLED_APPS,
+#     MIDDLEWARE,
+#     log_level="DEBUG" if DEBUG else "INFO",
+#     debug_db=False,  # Set to True to log all database queries
+#     plain_format=bool(DEBUG),  # Set to True to use human-readable structlog format over JSON
+# )
+
 # The file path where uploaded media such as image attachments are stored. A trailing slash is not needed.
 #
 # MEDIA_ROOT = os.path.join(NAUTOBOT_ROOT, "media").rstrip("/")
@@ -282,6 +295,15 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 # CELERY_TASK_SOFT_TIME_LIMIT = int(os.getenv("NAUTOBOT_CELERY_TASK_SOFT_TIME_LIMIT", str(5 * 60)))
 # CELERY_TASK_TIME_LIMIT = int(os.getenv("NAUTOBOT_CELERY_TASK_TIME_LIMIT", str(10 * 60)))
 
+# How many tasks a worker is allowed to reserve for its own consumption and execution.
+# If set to zero (not recommended) a single worker can reserve all tasks even if other workers are free.
+# For short running tasks (such as webhooks) you may want to set this to a larger number to increase throughput.
+# Conversely, for long running tasks (such as SSoT or Golden-Config Jobs at scale) you may want to set this to 1
+# so that a worker executing a long-running task will not prefetch other tasks, which would block their execution
+# until the long-running task completes.
+# https://docs.celeryq.dev/en/stable/userguide/optimizing.html#prefetch-limits
+# CELERY_WORKER_PREFETCH_MULTIPLIER = int(os.getenv("NAUTOBOT_CELERY_WORKER_PREFETCH_MULTIPLIER", "4"))
+
 # Ports for prometheus metric HTTP server running on the celery worker.
 # Normally this should be set to a single port, unless you have multiple workers running on a single machine, i.e.
 # sharing the same available ports. In that case you need to specify a range of ports greater than or equal to the
@@ -294,6 +316,12 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 #         int(value) for value in os.getenv("NAUTOBOT_CELERY_WORKER_PROMETHEUS_PORTS").split(",")
 #     ]
 
+# If enabled stdout and stderr of running jobs will be redirected to the task logger.
+# CELERY_WORKER_REDIRECT_STDOUTS = is_truthy(os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS", "True"))
+
+# The log level of log messages generated by redirected job stdout and stderr.
+# Can be one of `DEBUG`, `INFO`, `WARNING`, `ERROR`, or `CRITICAL`.
+# CELERY_WORKER_REDIRECT_STDOUTS_LEVEL = os.getenv("NAUTOBOT_CELERY_WORKER_REDIRECT_STDOUTS_LEVEL", "WARNING")
 
 # Number of days to retain changelog entries. Set to 0 to retain changes indefinitely. Defaults to 90 if not set here.
 #
@@ -332,14 +360,6 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 # if "NAUTOBOT_DEVICE_NAME_AS_NATURAL_KEY" in os.environ and os.environ["NAUTOBOT_DEVICE_NAME_AS_NATURAL_KEY"] != "":
 #     DEVICE_NAME_AS_NATURAL_KEY = is_truthy(os.environ["NAUTOBOT_DEVICE_NAME_AS_NATURAL_KEY"])
 
-# The number of seconds to cache the member list of dynamic groups. Set this to `0` to disable caching.
-#
-# if (
-#     "NAUTOBOT_DYNAMIC_GROUPS_MEMBER_CACHE_TIMEOUT" in os.environ
-#     and os.environ["NAUTOBOT_DYNAMIC_GROUPS_MEMBER_CACHE_TIMEOUT"] != ""
-# ):
-#     DYNAMIC_GROUPS_MEMBER_CACHE_TIMEOUT = int(os.environ["NAUTOBOT_DYNAMIC_GROUPS_MEMBER_CACHE_TIMEOUT"])
-
 # Exempt certain models from the enforcement of view permissions. Models listed here will be viewable by all users and
 # by anonymous users. List models in the form `<app>.<model>`. Add '*' to this list to exempt all models.
 # Defaults to [].

nautobot/core/templates/utilities/templatetags/dynamic_group_assignment_modal.html

@@ -0,0 +1,37 @@
+{% load form_helpers %}
+
+<div class="modal fade" tabindex="-1" role="dialog" id="dynamic_group_assignment_modal">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type-"button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title">Static Assignment to Dynamic Groups</h4>
+            </div>
+            <form id="dynamic_group_assignment_form" action="{% url 'extras:dynamicgroup_bulk_assign' %}?"
+                  method="post" class="form form-horizontal">
+                <div class="modal-body">
+                    {% csrf_token %}
+                    <input type="hidden" name="return_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}">
+                    <input type="hidden" id="dynamic_group_assignment_all" name="_all">
+                    <span id="dynamic_group_assignment_pks"></span>
+                    {% for field in form.hidden_fields %}
+                        {{ field }}
+                    {% endfor %}
+                    {% render_field form.add_to_groups %}
+                    {% render_field form.create_and_assign_to_new_group_name %}
+                    {% render_field form.remove_from_groups %}
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary">
+                        <span class="mdi mdi-group" aria-hidden="true"></span> Apply
+                    </button>
+                    <button type="button" class="btn btn-default" id="dynamic_group_assignment_cancel">
+                        <span class="mdi mdi-close-thick" aria-hidden="true"></span> Cancel
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>

nautobot/core/templates/utilities/templatetags/filter_form_modal.html

@@ -73,9 +73,9 @@
                                 <button type="submit" class="btn btn-primary">
                                     <span class="mdi mdi-magnify" aria-hidden="true"></span> Apply
                                 </button>
-                                <a href="." class="btn btn-default">
+                                <button type="reset" class="btn btn-default">
                                     <span class="mdi mdi-close-thick" aria-hidden="true"></span> Clear
-                                </a>
+                                </button>
                             </div>
                         </form>
                     </div>