nautobot 2.3.0b1__py3-none-any.whl → 2.3.2__py3-none-any.whl

nautobot/cloud/factory.py

@@ -24,6 +24,7 @@ class CloudAccountFactory(PrimaryModelFactory):
     has_description = NautobotBoolIterator()
     description = factory.Maybe("has_description", factory.Faker("sentence"), "")
     provider = random_instance(Manufacturer, allow_null=False)
+    # TODO: once SecretsGroupFactory is implemented:
     # has_secrets_group = NautobotBoolIterator()
     # secrets_group = factory.Maybe(
     #     "has_secrets_group",
@@ -40,6 +41,7 @@ class CloudResourceTypeFactory(PrimaryModelFactory):
     name = factory.LazyAttributeSequence(lambda o, n: f"{o.provider.name} CloudResourceType {n + 1}")
     has_description = NautobotBoolIterator()
     description = factory.Maybe("has_description", factory.Faker("sentence"), "")
+    # TODO: if we add a `config_schema` here, then CloudNetworkFactory and CloudServiceFactory have to follow it...
 
     @factory.post_generation
     def content_types(self, create, extracted, **kwargs):

nautobot/cloud/filters.py

@@ -74,6 +74,8 @@ class CloudNetworkFilterSet(NautobotFilterSet):
         filter_predicates={
             "name": "icontains",
             "description": "icontains",
+            "parent__name": "icontains",
+            "parent__description": "icontains",
             "cloud_account__name": "icontains",
             "cloud_account__description": "icontains",
             "cloud_resource_type__name": "icontains",
@@ -96,6 +98,7 @@ class CloudNetworkFilterSet(NautobotFilterSet):
         queryset=models.CloudNetwork.objects.all(),
         label="Parent cloud network (name or ID)",
     )
+    prefixes = django_filters.ModelMultipleChoiceFilter(queryset=Prefix.objects.all())
 
     class Meta:
         model = models.CloudNetwork

nautobot/cloud/forms.py

@@ -26,7 +26,7 @@ class CloudAccountForm(NautobotModelForm):
         queryset=Manufacturer.objects.all(),
         help_text="The Manufacturer instance which represents the Cloud Provider",
     )
-    secrets_group = DynamicModelChoiceField(queryset=SecretsGroup.objects.all())
+    secrets_group = DynamicModelChoiceField(queryset=SecretsGroup.objects.all(), required=False)
 
     class Meta:
         model = CloudAccount
@@ -94,6 +94,7 @@ class CloudNetworkForm(NautobotModelForm):
     )
     parent = DynamicModelChoiceField(
         queryset=CloudNetwork.objects.all(),
+        query_params={"parent__isnull": True},
         required=False,
     )
     namespace = DynamicModelChoiceField(queryset=Namespace.objects.all(), required=False)
@@ -187,7 +188,12 @@ class CloudNetworkFilterForm(NautobotFilterForm):
     cloud_account = DynamicModelMultipleChoiceField(
         queryset=CloudAccount.objects.all(), to_field_name="name", required=False
     )
-    parent = DynamicModelMultipleChoiceField(queryset=CloudNetwork.objects.all(), to_field_name="name", required=False)
+    parent = DynamicModelMultipleChoiceField(
+        queryset=CloudNetwork.objects.all(),
+        query_params={"parent__isnull": True},
+        to_field_name="name",
+        required=False,
+    )
     tags = TagFilterField(model)
 
 

nautobot/cloud/migrations/0001_initial.py

@@ -271,7 +271,7 @@ class Migration(migrations.Migration):
             field=models.ForeignKey(
                 blank=True,
                 null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
+                on_delete=django.db.models.deletion.PROTECT,
                 related_name="children",
                 to="cloud.cloudnetwork",
             ),

nautobot/cloud/models.py

@@ -14,7 +14,6 @@ from nautobot.extras.utils import FeatureQuery, extras_features
 @extras_features(
     "custom_links",
     "custom_validators",
-    "dynamic_groups",
     "export_templates",
     "graphql",
     "webhooks",
@@ -137,7 +136,7 @@ class CloudNetwork(CloudResourceTypeMixin, PrimaryModel):
     description = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True)
     cloud_account = models.ForeignKey(to=CloudAccount, on_delete=models.PROTECT, related_name="cloud_networks")
     parent = models.ForeignKey(
-        to="cloud.CloudNetwork", on_delete=models.SET_NULL, blank=True, null=True, related_name="children"
+        to="cloud.CloudNetwork", on_delete=models.PROTECT, blank=True, null=True, related_name="children"
     )
     prefixes = models.ManyToManyField(
         blank=True,

nautobot/cloud/tables.py

@@ -7,9 +7,8 @@ from nautobot.core.tables import (
     TagColumn,
     ToggleColumn,
 )
-from nautobot.tenancy.tables import TenantColumn
 
-from .models import CloudAccount, CloudNetwork, CloudNetworkPrefixAssignment, CloudResourceType, CloudService
+from .models import CloudAccount, CloudNetwork, CloudResourceType, CloudService
 
 
 class CloudAccountTable(BaseTable):
@@ -95,21 +94,6 @@ class CloudNetworkTable(BaseTable):
         )
 
 
-class CloudNetworkPrefixAssignmentTable(BaseTable):
-    cloud_network = tables.Column(
-        verbose_name="Cloud Network",
-        linkify=lambda record: record.cloud_network.get_absolute_url(),
-        accessor="cloud_network.name",
-    )
-    prefix = tables.Column(linkify=True)
-    rd = tables.Column(accessor="vrf.rd", verbose_name="RD")
-    tenant = TenantColumn(accessor="vrf.tenant")
-
-    class Meta(BaseTable.Meta):
-        model = CloudNetworkPrefixAssignment
-        fields = ("cloud_network", "prefix", "rd", "tenant")
-
-
 class CloudResourceTypeTable(BaseTable):
     pk = ToggleColumn()
     name = tables.Column(linkify=True)

nautobot/cloud/templates/cloud/cloudnetwork_retrieve.html

@@ -100,13 +100,7 @@
                 </tr>
                 <tr>
                     <td>Parent</td>
-                    <td>
-                        {% if object.parent %}
-                            {{ object.parent|hyperlinked_object }}
-                        {% else %}
-                            <span class="text-muted">&mdash;</span>
-                        {% endif %}
-                    </td>
+                    <td>{{ object.parent|hyperlinked_object }}</td>
                 </tr>
                 <tr>
                     <td>Description</td>

nautobot/cloud/templates/cloud/cloudresourcetype_retrieve.html

@@ -60,6 +60,17 @@
     </div>
 {% endblock content_left_page %}
 
+{% block content_right_page %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Config Schema</strong>
+        </div>
+        <div class="panel-body">
+            <pre>{{ object.config_schema|render_json }}</pre>
+        </div>
+    </div>
+{% endblock content_right_page %}
+
 {% block extra_tab_content %}
     {% if networks_count %}
         <div id="networks" role="tabpanel" class="tab-pane {% if not active_tab and not request.GET.tab or request.GET.tab == "networks" %}active{% else %}fade{% endif %}">

nautobot/cloud/templates/cloud/cloudservice_retrieve.html

@@ -49,6 +49,10 @@
                 <td>Cloud Resource Type</td>
                 <td>{{ object.cloud_resource_type|hyperlinked_object }}</td>
             </tr>
+            <tr>
+                <td>Description</td>
+                <td>{{ object.description|placeholder }}</td>
+            </tr>
         </table>
     </div>
 {% endblock content_left_page %}

nautobot/cloud/tests/test_filters.py

@@ -65,6 +65,18 @@ class CloudNetworkTestCase(FilterTestCases.NameOnlyFilterTestCase):
         ("parent", "parent__id"),
         ("parent", "parent__name"),
     ]
+    exclude_q_filter_predicates = [
+        "parent__name",
+        "parent__description",
+    ]
+
+    def _get_relevant_filterset_queryset(self, queryset, *filter_params):
+        queryset = super()._get_relevant_filterset_queryset(queryset, *filter_params)
+        if "name" in filter_params or "description" in filter_params:
+            # Only select an instance with no children as otherwise the search will also match the children,
+            # due to `parent__name` and `parent__description` also being search parameters
+            queryset = queryset.filter(children__isnull=True)
+        return queryset
 
 
 class CloudNetworkPrefixAssignmentTestCase(FilterTestCases.FilterTestCase):

nautobot/cloud/tests/test_views.py

@@ -2,6 +2,7 @@ from django.contrib.contenttypes.models import ContentType
 
 from nautobot.cloud.models import CloudAccount, CloudNetwork, CloudResourceType, CloudService
 from nautobot.core.testing import ViewTestCases
+from nautobot.core.testing.utils import post_data
 from nautobot.dcim.models import Manufacturer
 from nautobot.extras.models import SecretsGroup, Tag
 
@@ -36,6 +37,22 @@ class CloudAccountTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "comments": "New comments",
         }
 
+    def test_post_without_secrets_group(self):
+        """Assert Secrets Group form field is not required: Fix for https://github.com/nautobot/nautobot/issues/6096"""
+        self.add_permissions("cloud.add_cloudaccount", "dcim.view_manufacturer")
+        form_data = {
+            "name": "New Cloud Account 2",
+            "account_number": "8928371982311",
+            "provider": Manufacturer.objects.first().pk,
+            "description": "A new cloud account",
+        }
+        request = {
+            "path": self._get_url("add"),
+            "data": post_data(form_data),
+        }
+        self.assertHttpStatus(self.client.post(**request), 302)
+        self.assertTrue(CloudAccount.objects.filter(name="New Cloud Account 2").exists())
+
 
 class CloudNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
     model = CloudNetwork

nautobot/cloud/views.py

@@ -59,7 +59,7 @@ class CloudNetworkUIViewSet(NautobotUIViewSet):
         context = super().get_extra_context(request, instance)
         if self.action == "retrieve":
             prefixes = instance.prefixes.restrict(request.user, "view")
-            prefixes_table = PrefixTable(prefixes.select_related("namespace"))
+            prefixes_table = PrefixTable(prefixes.select_related("namespace"), hide_hierarchy_ui=True)
             prefixes_table.columns.hide("location_count")
             prefixes_table.columns.hide("vlan")
 

nautobot/core/celery/__init__.py

@@ -8,7 +8,7 @@ from celery import Celery, shared_task, signals
 from celery.app.log import TaskFormatter
 from celery.utils.log import get_logger
 from django.conf import settings
-from django.db.utils import ProgrammingError
+from django.db.utils import OperationalError, ProgrammingError
 from django.utils.functional import SimpleLazyObject
 from django.utils.module_loading import import_string
 from kombu.serialization import register
@@ -55,7 +55,10 @@ def import_jobs(sender=None, **kwargs):
 
     try:
         _import_jobs_from_git_repositories()
-    except ProgrammingError:  # Database not ready yet, as may be the case on initial startup and migration
+    except (
+        OperationalError,  # Database not present, as may be the case when running pylint-nautobot
+        ProgrammingError,  # Database not ready yet, as may be the case on initial startup and migration
+    ):
         pass
 
 

nautobot/core/celery/schedulers.py

@@ -1,4 +1,5 @@
 from collections.abc import Mapping
+from datetime import datetime
 import logging
 from pathlib import Path
 
@@ -20,7 +21,10 @@ class NautobotScheduleEntry(ModelEntry):
 
     def __init__(self, model, app=None):
         """Initialize the model entry."""
+        # copy-paste from django_celery_beat.schedulers
         self.app = app or current_app._get_current_object()
+
+        # Nautobot-specific logic
         self.name = f"{model.name}_{model.pk}"
         self.task = "nautobot.extras.jobs.run_job"
         try:
@@ -33,6 +37,8 @@ class NautobotScheduleEntry(ModelEntry):
         except (TypeError, ValueError) as exc:
             logger.exception("Removing schedule %s for argument deserialization error: %s", self.name, exc)
             self._disable(model)
+
+        # copy-paste from django_celery_beat.schedulers
         try:
             self.schedule = model.schedule
         except model.DoesNotExist:
@@ -42,6 +48,7 @@ class NautobotScheduleEntry(ModelEntry):
             )
             self._disable(model)
 
+        # Nautobot-specific logic
         self.options = {"nautobot_job_scheduled_job_id": model.id, "headers": {}}
 
         if model.user:
@@ -65,14 +72,25 @@ class NautobotScheduleEntry(ModelEntry):
         if isinstance(model.celery_kwargs, Mapping):
             self.options.update(model.celery_kwargs)
 
+        # copy-paste from django_celery_beat.schedulers
         self.total_run_count = model.total_run_count
         self.model = model
 
         if not model.last_run_at:
             model.last_run_at = self._default_now()
+            # if last_run_at is not set and
+            # model.start_time last_run_at should be in way past.
+            # This will trigger the job to run at start_time
+            # and avoid the heap block.
+            if model.start_time:
+                model.last_run_at = model.last_run_at - datetime.timedelta(days=365 * 30)
 
         self.last_run_at = model.last_run_at
 
+    def _default_now(self):
+        """Instead of using self.app.timezone, use the timezone specific to this schedule entry."""
+        return datetime.now(self.model.time_zone)
+
 
 class NautobotDatabaseScheduler(DatabaseScheduler):
     """

nautobot/core/filters.py

@@ -6,9 +6,11 @@ from django import forms as django_forms
 from django.conf import settings
 from django.db import models
 from django.forms.utils import ErrorDict, ErrorList
+from django.utils.encoding import force_str
+from django.utils.text import capfirst
 import django_filters
 from django_filters.constants import EMPTY_VALUES
-from django_filters.utils import get_model_field, resolve_field
+from django_filters.utils import get_model_field, label_for_filter, resolve_field, verbose_lookup_expr
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import extend_schema_field
 
@@ -720,6 +722,18 @@ class BaseFilterSet(django_filters.FilterSet):
                 # Of course setting the negation of the existing filter's exclude attribute handles both cases
                 new_filter.exclude = not filter_field.exclude
 
+            # If the base filter_field has a custom label, django_filters won't adjust it for the new_filter lookup,
+            # so we have to do it.
+            if filter_field.label and filter_field.label != label_for_filter(
+                cls.Meta.model, filter_field.field_name, filter_field.lookup_expr, filter_field.exclude
+            ):
+                # Lightly adjusted from label_for_filter() implementation:
+                verbose_expression = ["exclude", filter_field.label] if new_filter.exclude else [filter_field.label]
+                if isinstance(lookup_expr, str):
+                    verbose_expression.append(verbose_lookup_expr(lookup_expr))
+                verbose_expression = [force_str(part) for part in verbose_expression if part]
+                new_filter.label = capfirst(" ".join(verbose_expression))
+
             magic_filters[new_filter_name] = new_filter
 
         return magic_filters

nautobot/core/forms/forms.py

@@ -59,6 +59,13 @@ class AddressFieldMixin(forms.ModelForm):
 class BootstrapMixin(forms.BaseForm):
     """
     Add the base Bootstrap CSS classes to form elements.
+
+    Note that this only applies to form fields that are:
+
+    1. statically defined on the form class at declaration time, or
+    2. dynamically added to the form at init time by a class **later in the MRO than this mixin**.
+
+    If a class earlier in the MRO adds its own fields, it will have to ensure that the widgets are correctly configured.
     """
 
     def __init__(self, *args, **kwargs):
@@ -73,8 +80,9 @@ class BootstrapMixin(forms.BaseForm):
 
         for field in self.fields.values():
             if field.widget.__class__ not in exempt_widgets:
-                css = field.widget.attrs.get("class", "")
-                field.widget.attrs["class"] = " ".join([css, "form-control"]).strip()
+                css_classes = field.widget.attrs.get("class", "")
+                if "form-control" not in css_classes:
+                    field.widget.attrs["class"] = " ".join([css_classes, "form-control"]).strip()
             if field.required and not isinstance(field.widget, forms.FileInput):
                 field.widget.attrs["required"] = "required"
             if "placeholder" not in field.widget.attrs:

nautobot/core/graphql/generators.py

@@ -64,8 +64,8 @@ def generate_filter_resolver(schema_type, resolver_name, field_name):
     """
     filterset_class = schema_type._meta.filterset_class
 
-    def resolve_filter(self, *args, **kwargs):
-        if not filterset_class:
+    def resolve_filter(self, info, **kwargs):
+        if not filterset_class or not kwargs:
             return getattr(self, field_name).all()
 
         # Inverse of substitution logic from get_filtering_args_from_filterset() - transform "_type" back to "type"

nautobot/core/graphql/schema.py

@@ -4,6 +4,7 @@ from collections import OrderedDict
 import logging
 
 from django.conf import settings
+from django.contrib.contenttypes.fields import GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import ValidationError
 from django.db.models import ManyToManyField
@@ -205,8 +206,7 @@ def extend_schema_type_filter(schema_type, model):
         (DjangoObjectType): The extended schema_type object
     """
     for field in model._meta.get_fields():
-        # Check whether attribute is a ManyToOne or ManyToMany field
-        if not isinstance(field, (ManyToManyField, ManyToManyRel, ManyToOneRel)):
+        if not isinstance(field, (ManyToManyField, ManyToManyRel, ManyToOneRel, GenericRelation)):
             continue
         # OneToOneRel is a subclass of ManyToOneRel, but we don't want to treat it as a list
         if isinstance(field, OneToOneRel):
@@ -374,16 +374,9 @@ def extend_schema_type_config_context(schema_type, model):
 
 def extend_schema_type_global_features(schema_type, model):
     """
-    Extend schema_type object to have attributes and resolvers for global features (contacts, dynamic groups, etc.).
+    Extend schema_type object to have attributes and resolvers for global features (dynamic groups, etc.).
     """
-    if getattr(model, "is_contact_associable_model", False):
-
-        def resolve_associated_contacts(self, args):
-            return self.associated_contacts.all()
-
-        setattr(schema_type, "resolve_associated_contacts", resolve_associated_contacts)
-        schema_type._meta.fields["associated_contacts"] = graphene.Field.mounted(graphene.List(ContactAssociationType))
-
+    # associated_contacts and associated_object_metadata are handled elsewhere by extend_schema_type_filter()
     if getattr(model, "is_dynamic_group_associable_model", False):
 
         def resolve_dynamic_groups(self, args):
@@ -399,10 +392,9 @@ def extend_schema_type_relationships(schema_type, model):
     """Extend the schema type with attributes and resolvers corresponding
     to the relationships associated with this model."""
 
-    ct = ContentType.objects.get_for_model(model)
     relationships_by_side = {
-        "source": Relationship.objects.filter(source_type=ct),
-        "destination": Relationship.objects.filter(destination_type=ct),
+        "source": Relationship.objects.get_for_model_source(model),
+        "destination": Relationship.objects.get_for_model_destination(model),
     }
 
     prefix = ""

nautobot/core/jobs/__init__.py

@@ -1,3 +1,4 @@
+import codecs
 import contextlib
 from io import BytesIO
 
@@ -296,7 +297,9 @@ class ImportObjects(Job):
         if not csv_data and not csv_file:
             raise RunJobTaskFailed("Either csv_data or csv_file must be provided")
         if csv_file:
-            csv_bytes = csv_file
+            # data_encoding is utf-8 and file_encoding is utf-8-sig
+            # Bytes read from the original file are decoded according to file_encoding, and the result is encoded using data_encoding.
+            csv_bytes = codecs.EncodedFile(csv_file, "utf-8", "utf-8-sig")
         else:
             csv_bytes = BytesIO(csv_data.encode("utf-8"))
 

nautobot/core/management/commands/generate_test_data.py

@@ -329,6 +329,8 @@ class Command(BaseCommand):
         )
         _create_batch(MetadataChoiceFactory, 100)
         _create_batch(ObjectChangeFactory, 100)
+        _create_batch(JobResultFactory, 20)
+        _create_batch(JobLogEntryFactory, 100)
         _create_batch(ObjectMetadataFactory, 100)
         _create_batch(
             ObjectMetadataFactory,
@@ -344,8 +346,6 @@ class Command(BaseCommand):
             has_contact=False,
             description="with teams",
         )
-        _create_batch(JobResultFactory, 20)
-        _create_batch(JobLogEntryFactory, 100)
 
     def handle(self, *args, **options):
         if options["flush"]:

nautobot/core/models/__init__.py

@@ -54,11 +54,11 @@ class BaseModel(models.Model):
     is_saved_view_model = False  # SavedViewMixin overrides this to default True
     is_cloud_resource_type_model = False  # CloudResourceTypeMixin overrides this to default True
 
-    associated_object_metadatas = GenericRelation(
+    associated_object_metadata = GenericRelation(
         "extras.ObjectMetadata",
         content_type_field="assigned_object_type",
         object_id_field="assigned_object_id",
-        related_query_name="associated_object_metadatas_%(app_label)s_%(class)s",  # e.g. 'associated_object_metadatas_dcim_device'
+        related_query_name="associated_object_metadata_%(app_label)s_%(class)s",  # e.g. 'associated_object_metadata_dcim_device'
     )
 
     class Meta:

nautobot/core/settings.py

@@ -892,13 +892,24 @@ CELERY_TASK_TRACK_STARTED = True
 # If enabled, a `task-sent` event will be sent for every task so tasks can be tracked before they're consumed by a worker.
 CELERY_TASK_SEND_SENT_EVENT = True
 
+# 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"))
+
 # 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`.
+# 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")
 
-# Send task-related events so that tasks can be monitored using tools like flower. Sets the default value for the workers -E argument.
+# Send task-related events so that tasks can be monitored using tools like flower.
+# Sets the default value for the workers -E argument.
 CELERY_WORKER_SEND_TASK_EVENTS = True
 
 # Default celery queue name that will be used by workers and tasks if no queue is specified

nautobot/core/settings.yaml

@@ -426,6 +426,20 @@ properties:
     see_also:
       "`CELERY_TASK_SOFT_TIME_LIMIT`": "#celery_task_soft_time_limit"
     type: "integer"
+  CELERY_WORKER_PREFETCH_MULTIPLIER:
+    default: 4
+    description: "How many tasks a worker is allowed to reserve for its own consumption and execution."
+    details: >-
+      If set to `0` (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.
+    environment_variable: "NAUTOBOT_CELERY_WORKER_PREFETCH_MULTIPLIER"
+    see_also:
+      "Celery documentation": "https://docs.celeryq.dev/en/stable/userguide/optimizing.html#prefetch-limits"
+    type: "integer"
+    version_added: "2.2.9"
   CELERY_WORKER_PROMETHEUS_PORTS:
     default: []
     description: "Ports for Prometheus metric HTTP server running on the celery worker(s)."
@@ -468,8 +482,8 @@ properties:
           If enabling indefinite changelog retention, it is recommended to periodically delete old entries.
           Otherwise, the database may eventually exceed capacity.
 
-      +/- 2.2.0
-          As of Nautobot 2.2.0, changelog cleanup does not run automatically. Use the `Cleanup of ObjectChange records`
+      +/- 2.3.0
+          As of Nautobot 2.3.0, changelog cleanup does not run automatically. Use the `Cleanup of ObjectChange records`
           system Job to handle changelog cleanup; you may schedule this to run automatically like any other Job if
           desired. The `CHANGELOG_RETENTION` setting provides a default age cutoff for the Job but may be overridden
           at runtime if desired.
@@ -1816,9 +1830,9 @@ properties:
       The time zone Nautobot will use when dealing with dates and times. It is recommended to use UTC time unless you have a specific need to use a local time zone. Please see the [list of available time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
     details: |-
       !!! warning
-          Scheduled jobs will run in the time zone configured in this setting. If you change this setting from the
-          default UTC, you must change it on the Celery Beat server and all Nautobot web servers or your scheduled
-          jobs may run in the wrong time zone.
+          Scheduled jobs will default to running in the time zone configured in this setting.
+          If you change this setting from the default UTC, it must be set consistently on the Celery Beat server
+          and all Nautobot web servers, or else your scheduled jobs may run in the wrong time zone.
     environment_variable: "NAUTOBOT_TIME_ZONE"
     see_also:
       "Time Zones documentation": "./time-zones.md"

nautobot/core/tables.py

@@ -49,7 +49,7 @@ class BaseTable(django_tables2.Table):
         # Add custom field columns
         model = self._meta.model
 
-        if model.is_dynamic_group_associable_model:
+        if getattr(model, "is_dynamic_group_associable_model", False):
             self.base_columns["dynamic_group_count"] = LinkedCountColumn(
                 viewname="extras:dynamicgroup_list",
                 url_params={"member_id": "pk"},
@@ -155,6 +155,9 @@ class BaseTable(django_tables2.Table):
                     continue
                 if isinstance(column.column, LinkedCountColumn):
                     column_model = lookup.get_model_for_view_name(column.column.viewname)
+                    if column_model is None:
+                        logger.error("Couldn't find model for %s", column.column.viewname)
+                        continue
                     reverse_lookup = column.column.reverse_lookup or next(iter(column.column.url_params.keys()))
                     count_fields.append((column.name, column_model, reverse_lookup))
                     continue

nautobot/core/templates/generic/object_retrieve.html

@@ -106,10 +106,10 @@
             {% endwith %}
         {% endif %}
         {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-            {% with object.associated_object_metadatas.count as om_count %}
+            {% with object.associated_object_metadata.count as om_count %}
                 {% if om_count %}
-                    <li role="presentation"{% if request.GET.tab == 'object_metadatas' %} class="active"{% endif %}>
-                        <a href="{{ object.get_absolute_url }}#object_metadatas" onclick="switch_tab(this.href)" aria-controls="object_metadatas" role="tab" data-toggle="tab">
+                    <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>
@@ -134,7 +134,7 @@
             <div class="row">
                 <div class="col-md-6">
                     {% block content_left_page %}{% endblock content_left_page %}
-                    {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic computed_fields_advanced_ui=False %}
+                    {% include 'inc/custom_fields/panel.html' with custom_fields=object.get_custom_field_groupings_basic computed_fields=object.get_computed_fields_grouping_basic computed_fields_advanced_ui=False %}
                     {% include 'inc/relationships_panel.html' %}
                     {% include 'extras/inc/tags_panel.html' %}
                     {% plugin_left_page object %}
@@ -246,7 +246,7 @@
             </div>
         {% endif %}
         {% if object.is_metadata_associable_model and perms.extras.view_objectmetadata %}
-            <div id="object_metadatas" role="tabpanel" class="tab-pane {% if request.GET.tab == 'object_metadatas' %}active{% else %}fade{% endif %}">
+            <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">
@@ -259,7 +259,7 @@
                                     </div>
                                 </div>
                                 <div class="table-responsive">
-                                    {% render_table associated_object_metadatas_table 'inc/table.html' %}
+                                    {% render_table associated_object_metadata_table 'inc/table.html' %}
                                 </div>
                             </div>
                         </form>

nautobot/core/templates/home.html

@@ -39,10 +39,11 @@
                 {% for panel_name, panel_details in registry.homepage_layout.panels.items %}
                     {% if request.user|has_one_or_more_perms:panel_details.permissions %}
                         <div class="panel panel-default" id="{{ panel_name|slugify }}" style="break-inside: avoid" data-panel-weight="{{ panel_details.weight }}">
-                            <div class="panel-heading">
-                                <strong>{{ panel_name }}</strong><span id="toggle-homepanel-{{ panel_name|slugify }}" class="glyphicon glyphicon-chevron-down collapse-icon" type="button" data-toggle="collapse" data-target="#homepanel-{{ panel_name|slugify }}" aria-expanded="false" aria-controls="homepanel-{{ panel_name|slugify }}"></span>
-                            </div>
                             {% with cookie_key='homepanel-'|add:panel_name|slugify %}
+                                <div class="panel-heading">
+                                    <strong>{{ panel_name }}</strong>
+                                    <span id="collapse-icon-{{ panel_name|slugify }}" class="glyphicon glyphicon-chevron-down collapse-icon{% if request.COOKIES|default:''|get_item:cookie_key|default:'False' == 'False' %} rotated180{% endif %}" type="button" data-toggle="collapse" data-target="#homepanel-{{ panel_name|slugify }}" aria-expanded="false" aria-controls="homepanel-{{ panel_name|slugify }}"></span>
+                                </div>
                                 <div class="list-group collapse{% if request.COOKIES|default:''|get_item:cookie_key|default:'False' == 'False' %} in{% endif %} collapsible-div" id="homepanel-{{ panel_name|slugify }}" >
                             {% endwith %}
                                 {% if panel_details.rendered_html %}