nautobot 2.3.1__tar.gz → 2.3.2__tar.gz

{nautobot-2.3.1 → nautobot-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nautobot
-Version: 2.3.1
+Version: 2.3.2
 Summary: Source of truth and network automation platform.
 Home-page: https://nautobot.com
 License: Apache-2.0

{nautobot-2.3.1 → nautobot-2.3.2}/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-2.3.1 → nautobot-2.3.2}/nautobot/core/settings.yaml

@@ -1830,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-2.3.1 → nautobot-2.3.2}/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"},

{nautobot-2.3.1 → nautobot-2.3.2}/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 %}

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/core/templatetags/buttons.py

@@ -165,7 +165,7 @@ def consolidate_bulk_action_buttons(context):
 
     render_edit_button = bool(context["bulk_edit_url"] and context["permissions"]["change"])
     render_static_group_assign_button = bool(
-        context["model"].is_dynamic_group_associable_model
+        getattr(context["model"], "is_dynamic_group_associable_model", False)
         and context["user"].has_perms(["extras.add_staticgroupassociation"])
     )
     render_delete_button = bool(context["bulk_delete_url"] and context["permissions"]["delete"])

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/core/views/utils.py

@@ -337,7 +337,7 @@ def common_detail_view_context(request, instance):
     context["created_by"] = created_by
     context["last_updated_by"] = last_updated_by
 
-    if instance.is_contact_associable_model:
+    if getattr(instance, "is_contact_associable_model", False):
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
         associations = instance.associated_contacts.restrict(request.user, "view").order_by("role__name")
         associations_table = AssociatedContactsTable(associations, orderable=False)
@@ -347,7 +347,7 @@ def common_detail_view_context(request, instance):
     else:
         context["associated_contacts_table"] = None
 
-    if instance.is_dynamic_group_associable_model:
+    if getattr(instance, "is_dynamic_group_associable_model", False):
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
         dynamic_groups = instance.dynamic_groups.restrict(request.user, "view")
         dynamic_groups_table = DynamicGroupTable(dynamic_groups, orderable=False)
@@ -358,7 +358,7 @@ def common_detail_view_context(request, instance):
     else:
         context["associated_dynamic_groups_table"] = None
 
-    if instance.is_metadata_associable_model:
+    if getattr(instance, "is_metadata_associable_model", False):
         paginate = {"paginator_class": EnhancedPaginator, "per_page": get_paginate_count(request)}
         object_metadata = instance.associated_object_metadata.restrict(request.user, "view").order_by(
             "metadata_type", "scoped_fields"

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/dcim/factory.py

@@ -110,7 +110,7 @@ NETWORK_DRIVERS = {
     "Palo Alto": ["paloalto_panos"],
 }
 
-TIME_ZONES = {timezone for timezone, _ in TimeZoneFormField().choices}
+TIME_ZONES = sorted(timezone for timezone, _ in TimeZoneFormField().choices)
 
 
 # Retrieve correct rack reservation units
@@ -296,7 +296,7 @@ class DeviceTypeFactory(PrimaryModelFactory):
         while not unused_models:
             unused_models = {f"{device_type} {count}" for device_type in device_types}.difference(current_models)
             count += 1
-        return factory.random.randgen.choice(list(unused_models))
+        return factory.random.randgen.choice(sorted(unused_models))
 
     has_part_number = NautobotBoolIterator()
     part_number = factory.Maybe("has_part_number", factory.Faker("ean", length=8), "")
@@ -784,7 +784,7 @@ class ModuleTypeFactory(PrimaryModelFactory):
         while not unused_models:
             unused_models = {f"{module_type} {count}" for module_type in module_types}.difference(current_models)
             count += 1
-        return factory.random.randgen.choice(list(unused_models))
+        return factory.random.randgen.choice(sorted(unused_models))
 
 
 class ModuleFactory(PrimaryModelFactory):

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/dcim/tables/devices.py

@@ -396,7 +396,7 @@ class DeviceModuleConsolePortTable(ConsolePortTable):
             "actions",
         )
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
         }
 
 
@@ -460,7 +460,7 @@ class DeviceModuleConsoleServerPortTable(ConsoleServerPortTable):
             "actions",
         )
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
         }
 
 
@@ -535,7 +535,7 @@ class DeviceModulePowerPortTable(PowerPortTable):
             "connection",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class PowerOutletTable(ModularDeviceComponentTable, PathEndpointTable):
@@ -613,7 +613,7 @@ class DeviceModulePowerOutletTable(PowerOutletTable):
             "connection",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class BaseInterfaceTable(BaseTable):
@@ -739,7 +739,7 @@ class DeviceModuleInterfaceTable(InterfaceTable):
             "actions",
         ]
         row_attrs = {
-            "style": cable_status_color_css,
+            "class": cable_status_color_css,
             "data-name": lambda record: record.name,
         }
 
@@ -815,7 +815,7 @@ class DeviceModuleFrontPortTable(FrontPortTable):
             "cable_peer",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class RearPortTable(ModularDeviceComponentTable, CableTerminationTable):
@@ -874,7 +874,7 @@ class DeviceModuleRearPortTable(RearPortTable):
             "cable_peer",
             "actions",
         )
-        row_attrs = {"style": cable_status_color_css}
+        row_attrs = {"class": cable_status_color_css}
 
 
 class DeviceBayTable(DeviceComponentTable):

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/dcim/templates/dcim/device.html

@@ -406,6 +406,18 @@
 {% 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">

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/dcim/templates/dcim/softwareimagefile_retrieve.html

@@ -215,6 +215,18 @@
         {% 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">

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/dcim/utils.py

@@ -14,7 +14,7 @@ from netutils.lib_mapper import (
     SCRAPLI_LIB_MAPPER_REVERSE,
 )
 
-from nautobot.core.utils.color import hex_to_rgb, lighten_color, rgb_to_hex
+from nautobot.core.choices import ColorChoices
 from nautobot.core.utils.config import get_settings_or_config
 from nautobot.dcim.choices import InterfaceModeChoices
 from nautobot.dcim.constants import NETUTILS_NETWORK_DRIVER_MAPPING_NAMES
@@ -55,11 +55,14 @@ def cable_status_color_css(record):
     """
     if not record.cable:
         return ""
-    # The status colors are for use with labels and such, and tend to be quite bright.
-    # For this function we want a much milder, mellower color suitable as a row background.
-    base_color = record.cable.get_status_color().strip("#")
-    lighter_color = rgb_to_hex(*lighten_color(*hex_to_rgb(base_color), 0.75))
-    return f"background-color: #{lighter_color}"
+    else:
+        CABLE_STATUS_TO_CSS_CLASS = {
+            ColorChoices.COLOR_GREEN: "success",
+            ColorChoices.COLOR_AMBER: "warning",
+            ColorChoices.COLOR_CYAN: "info",
+        }
+        status_color = record.cable.get_status_color().strip("#")
+        return CABLE_STATUS_TO_CSS_CLASS.get(status_color, "")
 
 
 def get_network_driver_mapping_tool_names():

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/extras/api/serializers.py

@@ -6,6 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 from rest_framework.validators import UniqueTogetherValidator
+from timezone_field.rest_framework import TimeZoneSerializerField
 
 from nautobot.core.api import (
     BaseModelSerializer,
@@ -581,6 +582,7 @@ class JobVariableSerializer(serializers.Serializer):
 
 class ScheduledJobSerializer(BaseModelSerializer):
     # start_time = serializers.DateTimeField(format=None, required=False)
+    time_zone = TimeZoneSerializerField(required=False)
 
     class Meta:
         model = ScheduledJob

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/extras/filters/__init__.py

@@ -6,6 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models import Q
 import django_filters
 from drf_spectacular.utils import extend_schema_field
+from timezone_field import TimeZoneField
 
 from nautobot.core.api.exceptions import SerializerNotFound
 from nautobot.core.api.utils import get_serializer_for_model
@@ -911,6 +912,7 @@ class JobResultFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
             "job_model__name": "icontains",
             "name": "icontains",
             "user__username": "icontains",
+            "scheduled_job__name": "icontains",
         },
     )
     job_model = NaturalKeyOrPKMultipleChoiceFilter(
@@ -922,11 +924,16 @@ class JobResultFilterSet(BaseFilterSet, CustomFieldModelFilterSetMixin):
         queryset=Job.objects.all(),
         label="Job (ID) - Deprecated (use job_model filter)",
     )
+    scheduled_job = NaturalKeyOrPKMultipleChoiceFilter(
+        to_field_name="name",
+        queryset=ScheduledJob.objects.all(),
+        label="Scheduled Job (name or ID)",
+    )
     status = django_filters.MultipleChoiceFilter(choices=JobResultStatusChoices, null_value=None)
 
     class Meta:
         model = JobResult
-        fields = ["id", "date_created", "date_done", "name", "status", "user"]
+        fields = ["id", "date_created", "date_done", "name", "status", "user", "scheduled_job"]
 
 
 class JobLogEntryFilterSet(BaseFilterSet):
@@ -960,10 +967,15 @@ class ScheduledJobFilterSet(BaseFilterSet):
         queryset=Job.objects.all(),
         label="Job (ID) - Deprecated (use job_model filter)",
     )
+    time_zone = django_filters.MultipleChoiceFilter(
+        choices=[(str(obj), name) for obj, name in TimeZoneField().choices],
+        label="Time zone",
+        null_value="",
+    )
 
     class Meta:
         model = ScheduledJob
-        fields = ["id", "name", "total_run_count", "start_time", "last_run_at"]
+        fields = ["id", "name", "total_run_count", "start_time", "last_run_at", "time_zone"]
 
 
 #

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/extras/forms/forms.py

@@ -1286,6 +1286,12 @@ class JobResultFilterForm(BootstrapMixin, forms.Form):
         required=False,
         widget=StaticSelect2Multiple(),
     )
+    scheduled_job = DynamicModelMultipleChoiceField(
+        label="Scheduled Job",
+        queryset=ScheduledJob.objects.all(),
+        required=False,
+        to_field_name="name",
+    )
 
 
 class ScheduledJobFilterForm(BootstrapMixin, forms.Form):

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/extras/forms/mixins.py

@@ -174,7 +174,7 @@ class DynamicGroupModelFormMixin(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if self._meta.model.is_dynamic_group_associable_model:
+        if getattr(self._meta.model, "is_dynamic_group_associable_model", False):
             self.fields["dynamic_groups"] = DynamicModelMultipleChoiceField(
                 required=False,
                 initial=self.instance.dynamic_groups if self.instance else None,
@@ -193,7 +193,7 @@ class DynamicGroupModelFormMixin(forms.ModelForm):
 
     def save(self, commit=True):
         obj = super().save(commit=commit)
-        if commit and obj.is_dynamic_group_associable_model:
+        if commit and getattr(obj, "is_dynamic_group_associable_model", False):
             current_groups = set(obj.dynamic_groups.filter(group_type=DynamicGroupTypeChoices.TYPE_STATIC))
             for dynamic_group in set(self.cleaned_data.get("dynamic_groups")).difference(current_groups):
                 dynamic_group.add_members([obj])

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/extras/management/__init__.py

@@ -32,6 +32,7 @@ STATUS_CHOICESET_MAP = {
     "ipam.IPAddress": ipam_choices.IPAddressStatusChoices,
     "ipam.Prefix": ipam_choices.PrefixStatusChoices,
     "ipam.VLAN": ipam_choices.VLANStatusChoices,
+    "ipam.VRF": ipam_choices.VRFStatusChoices,
     "virtualization.VirtualMachine": vm_choices.VirtualMachineStatusChoices,
     "virtualization.VMInterface": vm_choices.VMInterfaceStatusChoices,
 }
@@ -48,6 +49,7 @@ STATUS_COLOR_MAP = {
     "Decommissioning": ColorChoices.COLOR_AMBER,
     "Deprecated": ColorChoices.COLOR_RED,
     "Deprovisioning": ColorChoices.COLOR_AMBER,
+    "Down": ColorChoices.COLOR_AMBER,
     "End-of-Life": ColorChoices.COLOR_RED,
     "Extended Support": ColorChoices.COLOR_CYAN,
     "Failed": ColorChoices.COLOR_RED,
@@ -76,6 +78,7 @@ STATUS_DESCRIPTION_MAP = {
     "Decommissioning": "Unit is being decommissioned",
     "Deprecated": "Unit has been deprecated",
     "Deprovisioning": "Circuit is being deprovisioned",
+    "Down": "VRF is down",
     "End-of-Life": "Unit has reached end-of-life",
     "Extended Support": "Software is in extended support",
     "Failed": "Unit has failed",

nautobot-2.3.2/nautobot/extras/migrations/0115_scheduledjob_time_zone.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.15 on 2024-08-19 13:44
+
+from django.db import migrations
+from django.utils import timezone
+import timezone_field.fields
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extras", "0114_computedfield_grouping"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="scheduledjob",
+            name="time_zone",
+            field=timezone_field.fields.TimeZoneField(default=timezone.get_default_timezone_name),
+        ),
+        migrations.AlterModelOptions(
+            name="scheduledjob",
+            options={"ordering": ["name"]},
+        ),
+    ]

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/extras/models/jobs.py

@@ -4,7 +4,6 @@ import contextlib
 from datetime import timedelta
 import logging
 
-from celery import schedules
 from celery.exceptions import NotRegistered
 from celery.utils.log import get_logger, LoggingProxy
 from django.conf import settings
@@ -16,7 +15,9 @@ from django.db.models import signals
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django_celery_beat.clockedschedule import clocked
+from django_celery_beat.tzcrontab import TzAwareCrontab
 from prometheus_client import Histogram
+from timezone_field import TimeZoneField
 
 from nautobot.core.celery import (
     app,
@@ -935,6 +936,9 @@ class ScheduledJob(BaseModel):
         verbose_name="Start Datetime",
         help_text="Datetime when the schedule should begin triggering the task to run",
     )
+    # Django always stores DateTimeField as UTC internally, but we want scheduled jobs to respect DST and similar,
+    # so we need to store the time zone the job was scheduled under as well.
+    time_zone = TimeZoneField(default=timezone.get_default_timezone_name)
     # todoindex:
     enabled = models.BooleanField(
         default=True,
@@ -1005,12 +1009,15 @@ class ScheduledJob(BaseModel):
     def __str__(self):
         return f"{self.name}: {self.interval}"
 
+    class Meta:
+        ordering = ["name"]
+
     def save(self, *args, **kwargs):
         self.queue = self.queue or ""
         # make sure non-valid crontab doesn't get saved
         if self.interval == JobExecutionType.TYPE_CUSTOM:
             try:
-                self.get_crontab(self.crontab)
+                self.get_crontab(self.crontab, tz=self.time_zone)
             except Exception as e:
                 raise ValidationError({"crontab": e})
         if not self.enabled:
@@ -1055,7 +1062,7 @@ class ScheduledJob(BaseModel):
         return timezone.now() + timedelta(seconds=15)
 
     @classmethod
-    def get_crontab(cls, crontab):
+    def get_crontab(cls, crontab, tz=None):
         """
         Wrapper method translates crontab syntax to Celery crontab.
 
@@ -1068,13 +1075,17 @@ class ScheduledJob(BaseModel):
 
         No support for Last (L), Weekday (W), Number symbol (#), Question mark (?), and special @ strings.
         """
+        if not tz:
+            tz = timezone.get_default_timezone()
         minute, hour, day_of_month, month_of_year, day_of_week = crontab.split(" ")
-        return schedules.crontab(
+
+        return TzAwareCrontab(
             minute=minute,
             hour=hour,
             day_of_month=day_of_month,
             month_of_year=month_of_year,
             day_of_week=day_of_week,
+            tz=tz,
         )
 
     @classmethod
@@ -1116,13 +1127,13 @@ class ScheduledJob(BaseModel):
         """
 
         if interval == JobExecutionType.TYPE_IMMEDIATELY:
-            start_time = timezone.now()
+            start_time = timezone.localtime()
             name = name or f"{job_model.name} - {start_time}"
         elif interval == JobExecutionType.TYPE_CUSTOM:
             if start_time is None:
                 # "start_time" is checked against models.ScheduledJob.earliest_possible_time()
                 # which returns timezone.now() + timedelta(seconds=15)
-                start_time = timezone.now() + timedelta(seconds=20)
+                start_time = timezone.localtime() + timedelta(seconds=20)
 
         celery_kwargs = {
             "nautobot_job_profile": profile,
@@ -1145,6 +1156,7 @@ class ScheduledJob(BaseModel):
             task=job_model.class_path,
             job_model=job_model,
             start_time=start_time,
+            time_zone=start_time.tzinfo,
             description=f"Nautobot job {name} scheduled by {user} for {start_time}",
             kwargs=job_kwargs,
             celery_kwargs=celery_kwargs,
@@ -1159,15 +1171,16 @@ class ScheduledJob(BaseModel):
         return scheduled_job
 
     def to_cron(self):
-        t = self.start_time
+        tz = self.time_zone
+        t = self.start_time.astimezone(tz)
         if self.interval == JobExecutionType.TYPE_HOURLY:
-            return schedules.crontab(minute=t.minute)
+            return TzAwareCrontab(minute=t.minute, tz=tz)
         elif self.interval == JobExecutionType.TYPE_DAILY:
-            return schedules.crontab(minute=t.minute, hour=t.hour)
+            return TzAwareCrontab(minute=t.minute, hour=t.hour, tz=tz)
         elif self.interval == JobExecutionType.TYPE_WEEKLY:
-            return schedules.crontab(minute=t.minute, hour=t.hour, day_of_week=t.strftime("%w"))
+            return TzAwareCrontab(minute=t.minute, hour=t.hour, day_of_week=t.strftime("%w"), tz=tz)
         elif self.interval == JobExecutionType.TYPE_CUSTOM:
-            return self.get_crontab(self.crontab)
+            return self.get_crontab(self.crontab, tz=tz)
         raise ValueError(f"I do not know to convert {self.interval} to a Cronjob!")
 
 

{nautobot-2.3.1 → nautobot-2.3.2}/nautobot/extras/tables.py

@@ -110,6 +110,10 @@ JOB_BUTTONS = """
 <a href="{% url 'extras:jobresult_list' %}?job_model={{ record.name | urlencode }}" class="btn btn-default btn-xs" title="Job Results"><i class="mdi mdi-format-list-bulleted" aria-hidden="true"></i></a>
 """
 
+SCHEDULED_JOB_BUTTONS = """
+<a href="{% url 'extras:jobresult_list' %}?scheduled_job={{ record.name | urlencode }}" class="btn btn-default btn-xs" title="Job Results"><i class="mdi mdi-format-list-bulleted" aria-hidden="true"></i></a>
+"""
+
 OBJECTCHANGE_OBJECT = """
 {% if record.changed_object and record.changed_object.get_absolute_url %}
     <a href="{{ record.changed_object.get_absolute_url }}">{{ record.object_repr }}</a>
@@ -835,6 +839,10 @@ class JobResultTable(BaseTable):
         orderable=False,
         attrs={"td": {"class": "text-nowrap report-stats"}},
     )
+    scheduled_job = tables.Column(
+        linkify=True,
+        verbose_name="Scheduled Job",
+    )
     actions = tables.TemplateColumn(
         template_code="""
             {% load helpers %}
@@ -884,6 +892,7 @@ class JobResultTable(BaseTable):
             "date_created",
             "name",
             "job_model",
+            "scheduled_job",
             "duration",
             "date_done",
             "user",
@@ -1038,16 +1047,37 @@ class NoteTable(BaseTable):
 
 class ScheduledJobTable(BaseTable):
     pk = ToggleColumn()
-    name = tables.LinkColumn()
+    name = tables.Column(linkify=True)
     job_model = tables.Column(verbose_name="Job", linkify=True)
     interval = tables.Column(verbose_name="Execution Type")
-    start_time = tables.Column(verbose_name="First Run")
-    last_run_at = tables.Column(verbose_name="Most Recent Run")
+    start_time = tables.DateTimeColumn(verbose_name="First Run", format=settings.SHORT_DATETIME_FORMAT)
+    last_run_at = tables.DateTimeColumn(verbose_name="Most Recent Run", format=settings.SHORT_DATETIME_FORMAT)
+    crontab = tables.Column()
     total_run_count = tables.Column(verbose_name="Total Run Count")
+    actions = ButtonsColumn(ScheduledJob, buttons=("delete"), prepend_template=SCHEDULED_JOB_BUTTONS)
 
     class Meta(BaseTable.Meta):
         model = ScheduledJob
-        fields = ("pk", "name", "job_model", "interval", "start_time", "last_run_at")
+        fields = (
+            "pk",
+            "name",
+            "total_run_count",
+            "job_model",
+            "interval",
+            "start_time",
+            "last_run_at",
+            "crontab",
+            "time_zone",
+            "actions",
+        )
+        default_columns = (
+            "pk",
+            "name",
+            "job_model",
+            "interval",
+            "last_run_at",
+            "actions",
+        )
 
 
 class ScheduledJobApprovalQueueTable(BaseTable):