nautobot 2.4.8__py3-none-any.whl → 2.4.10__py3-none-any.whl

nautobot/extras/models/jobs.py

@@ -1,10 +1,11 @@
 # Data models relating to Jobs
 
 import contextlib
-from datetime import timedelta
+from datetime import datetime, timedelta
 import json
 import logging
 import signal
+from typing import Optional, TYPE_CHECKING, Union
 
 from billiard.exceptions import SoftTimeLimitExceeded
 from celery.exceptions import NotRegistered
@@ -58,6 +59,11 @@ from nautobot.extras.utils import (
 
 from .customfields import CustomFieldModel
 
+if TYPE_CHECKING:
+    from django.contrib.auth import get_user_model
+
+    User = get_user_model()
+
 logger = logging.getLogger(__name__)
 
 
@@ -329,12 +335,12 @@ class Job(PrimaryModel):
             raise NotRegistered from err
 
     @property
-    def task_queues(self):
+    def task_queues(self) -> list[str]:
         """Deprecated backward-compatibility property for the list of queue names for this Job."""
         return self.job_queues.values_list("name", flat=True)
 
     @task_queues.setter
-    def task_queues(self, value):
+    def task_queues(self, value: Union[str, list[str]]):
         job_queues = []
         # value is going to be a comma separated list of queue names
         if isinstance(value, str):
@@ -747,50 +753,39 @@ class JobResult(BaseModel, CustomFieldModel):
                     duration.total_seconds()
                 )
 
+    set_status.alters_data = True
+
     @classmethod
-    def execute_job(cls, job_model, user, *job_args, celery_kwargs=None, profile=False, job_result=None, **job_kwargs):
+    def execute_job(cls, *args, **kwargs):
         """
         Create a JobResult instance and run a job in the current process, blocking until the job finishes.
 
         Running tasks synchronously in celery is *NOT* supported and if possible `enqueue_job` with synchronous=False
         should be used instead.
 
-        Args:
-            job_model (Job): The Job to be enqueued for execution
-            user (User): User object to link to the JobResult instance
-            celery_kwargs (dict, optional): Dictionary of kwargs to pass as **kwargs to Celery when job is run
-            profile (bool, optional): Whether to run cProfile on the job execution
-            job_result (JobResult, optional): Existing JobResult with status PENDING, used in kubernetes job execution
-            *job_args: positional args passed to the job task
-            **job_kwargs: keyword args passed to the job task
+        Args: see `enqueue_job()`
 
         Returns:
             JobResult instance
         """
-        return cls.enqueue_job(
-            job_model,
-            user,
-            *job_args,
-            celery_kwargs=celery_kwargs,
-            profile=profile,
-            job_result=job_result,
-            synchronous=True,
-            **job_kwargs,
-        )
+        return cls.enqueue_job(*args, **kwargs, synchronous=True)
+
+    execute_job.__func__.alters_data = True
 
     @classmethod
     def enqueue_job(
         cls,
-        job_model,
-        user,
+        job_model: Job,
+        user: "User",
         *job_args,
-        celery_kwargs=None,
-        profile=False,
-        schedule=None,
-        task_queue=None,
-        job_result=None,
-        synchronous=False,
-        ignore_singleton_lock=False,
+        celery_kwargs: Optional[dict] = None,
+        profile: bool = False,
+        schedule: Optional["ScheduledJob"] = None,
+        job_queue: Optional["JobQueue"] = None,
+        task_queue: Optional[str] = None,  # deprecated!
+        job_result: Optional["JobResult"] = None,
+        synchronous: bool = False,
+        ignore_singleton_lock: bool = False,
         **job_kwargs,
     ):
         """Create/Modify a JobResult instance and enqueue a job to be executed asynchronously by a Celery worker.
@@ -798,13 +793,16 @@ class JobResult(BaseModel, CustomFieldModel):
         Args:
             job_model (Job): The Job to be enqueued for execution.
             user (User): User object to link to the JobResult instance.
-            celery_kwargs (dict, optional): Dictionary of kwargs to pass as **kwargs to `apply_async()`/`apply()` when job is run.
-            profile (bool, optional): If True, dump cProfile stats on the job execution.
-            schedule (ScheduledJob, optional): ScheduledJob instance to link to the JobResult. Cannot be used with synchronous=True.
-            task_queue (str, optional): The celery queue to send the job to. If not set, use the default celery queue.
-            job_result (JobResult, optional): Existing JobResult with status PENDING, to be modified and to be used in kubernetes job execution.
-            synchronous (bool, optional): If True, run the job in the current process, blocking until the job completes.
-            ignore_singleton_lock (bool, optional): If True, invalidate the singleton lock before running the job.
+            celery_kwargs (dict): Dictionary of kwargs to pass as **kwargs to `apply_async()`/`apply()` when job is run.
+            profile (bool): If True, dump cProfile stats on the job execution.
+            schedule (ScheduledJob): ScheduledJob instance to link to the JobResult.
+                Cannot be used with synchronous=True.
+            job_queue (JobQueue): Job queue to send the job to. If not set, use the default queue for the given Job.
+            task_queue (str): The celery queue name to send the job to. **Deprecated, prefer `job_queue` instead.**
+            job_result (JobResult): Existing JobResult with status PENDING, to be modified and to be used
+                in kubernetes job execution.
+            synchronous (bool): If True, run the job in the current process, blocking until the job completes.
+            ignore_singleton_lock (bool): If True, invalidate the singleton lock before running the job.
               This allows singleton jobs to run twice, or makes it possible to remove the lock when the first instance
               of the job failed to remove it for any reason.
             *job_args: positional args passed to the job task (UNUSED)
@@ -818,6 +816,20 @@ class JobResult(BaseModel, CustomFieldModel):
         if schedule is not None and synchronous:
             raise ValueError("Scheduled jobs cannot be run synchronously")
 
+        if job_queue is not None and task_queue is not None and job_queue.name != task_queue:
+            raise ValueError("task_queue and job_queue are mutually exclusive")
+        if job_queue is not None and task_queue is None:
+            task_queue = job_queue.name
+        elif task_queue is not None and job_queue is None:
+            job_queue = JobQueue.objects.get(name=task_queue)
+        else:  # both none
+            if celery_kwargs is not None and "queue" in celery_kwargs:
+                task_queue = celery_kwargs["queue"]
+                job_queue = JobQueue.objects.get(name=task_queue)
+            else:
+                job_queue = job_model.default_job_queue
+                task_queue = job_queue.name
+
         if job_result is None:
             job_result = cls.objects.create(
                 name=job_model.name,
@@ -835,10 +847,6 @@ class JobResult(BaseModel, CustomFieldModel):
                     f"There is a mismatch between the job specified {job_model} and the job associated with the job result {job_result.job_model}"
                 )
 
-        if task_queue is None:
-            task_queue = job_model.default_job_queue.name
-
-        job_queue = JobQueue.objects.get(name=task_queue)
         # Kubernetes Job Queue logic
         # As we execute Kubernetes jobs, we want to execute `run_kubernetes_job_and_return_job_result`
         # the first time the kubernetes job is enqueued to spin up the kubernetes pod.
@@ -863,6 +871,7 @@ class JobResult(BaseModel, CustomFieldModel):
             job_celery_kwargs["time_limit"] = job_model.time_limit
 
         if celery_kwargs is not None:
+            # TODO: this lets celery_kwargs override keys like `queue` and `nautobot_job_user_id`; is that desirable?
             job_celery_kwargs.update(celery_kwargs)
 
         if synchronous:
@@ -933,6 +942,8 @@ class JobResult(BaseModel, CustomFieldModel):
 
         return job_result
 
+    enqueue_job.__func__.alters_data = True
+
     def log(
         self,
         message,
@@ -984,6 +995,8 @@ class JobResult(BaseModel, CustomFieldModel):
         else:
             log.save(using=JOB_LOGS)
 
+    log.alters_data = True
+
 
 #
 # Job Button
@@ -1071,6 +1084,8 @@ class ScheduledJobs(models.Model):
         if not instance.no_changes:
             cls.update_changed()
 
+    changed.__func__.alters_data = True
+
     @classmethod
     def update_changed(cls, raw=False, **kwargs):
         """This function acts as a signal handler to track changes to the scheduled job that is triggered after a change"""
@@ -1078,6 +1093,8 @@ class ScheduledJobs(models.Model):
             return
         cls.objects.update_or_create(ident=1, defaults={"last_update": timezone.now()})
 
+    update_changed.__func__.alters_data = True
+
     @classmethod
     def last_change(cls):
         """This function acts as a getter for the last update on scheduled jobs"""
@@ -1208,7 +1225,6 @@ class ScheduledJob(BaseModel):
         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:
@@ -1253,12 +1269,12 @@ class ScheduledJob(BaseModel):
         return self.to_cron()
 
     @property
-    def queue(self):
+    def queue(self) -> str:
         """Deprecated backward-compatibility property for the queue name this job is scheduled for."""
         return self.job_queue.name if self.job_queue else ""
 
     @queue.setter
-    def queue(self, value):
+    def queue(self, value: str):
         if value:
             try:
                 self.job_queue = JobQueue.objects.get(name=value)
@@ -1301,14 +1317,15 @@ class ScheduledJob(BaseModel):
         cls,
         job_model,
         user,
-        name=None,
-        start_time=None,
-        interval=JobExecutionType.TYPE_IMMEDIATELY,
-        crontab="",
-        profile=False,
-        approval_required=False,
-        task_queue=None,
-        ignore_singleton_lock=False,
+        name: Optional[str] = None,
+        start_time: Optional[datetime] = None,
+        interval: str = JobExecutionType.TYPE_IMMEDIATELY,
+        crontab: str = "",
+        profile: bool = False,
+        approval_required: bool = False,
+        job_queue: Optional[JobQueue] = None,
+        task_queue: Optional[str] = None,  # deprecated!
+        ignore_singleton_lock: bool = False,
         **job_kwargs,
     ):
         """
@@ -1321,21 +1338,32 @@ class ScheduledJob(BaseModel):
         Parameters:
             job_model (JobModel): The job model instance.
             user (User): The user who is scheduling the job.
-            name (str, optional): The name of the scheduled job. Defaults to None.
-            start_time (datetime, optional): The start time for the job. Defaults to None.
-            interval (JobExecutionType, optional): The interval type for the job execution.
+            name (str): The name of the scheduled job. Automatically derived from the job_model and start_time if unset.
+            start_time (datetime): The start time for the job. Defaults to the current time if unset.
+            interval (JobExecutionType): The interval type for the job execution.
                 Defaults to JobExecutionType.TYPE_IMMEDIATELY.
-            crontab (str, optional): The crontab string for the schedule. Defaults to "".
-            profile (bool, optional): Flag indicating whether to profile the job. Defaults to False.
-            approval_required (bool, optional): Flag indicating if approval is required. Defaults to False.
-            task_queue (str, optional): The task queue for the job. Defaults to None, which will use the configured default celery queue.
-            ignore_singleton_lock (bool, optional): Flag indicating whether to ignore singleton locks. Defaults to False.
+            crontab (str): The crontab string for the schedule. Defaults to "".
+            profile (bool): Flag indicating whether to profile the job. Defaults to False.
+            approval_required (bool): Flag indicating if approval is required. Defaults to False.
+            job_queue (JobQueue): The Job queue to use. If unset, use the configured default celery queue.
+            task_queue (str): The queue name to use. **Deprecated, prefer `job_queue`.**
+            ignore_singleton_lock (bool): Whether to ignore singleton locks. Defaults to False.
             **job_kwargs: Additional keyword arguments to pass to the job.
 
         Returns:
             ScheduledJob instance
         """
 
+        if job_queue is not None and task_queue is not None and job_queue.name != task_queue:
+            raise ValueError("task_queue and job_queue are mutually exclusive")
+        if job_queue is not None and task_queue is None:
+            task_queue = job_queue.name
+        elif task_queue is not None and job_queue is None:
+            job_queue = JobQueue.objects.get(name=task_queue)
+        else:  # both None
+            job_queue = job_model.default_job_queue
+            task_queue = job_queue.name
+
         if interval == JobExecutionType.TYPE_IMMEDIATELY:
             start_time = timezone.localtime()
             name = name or f"{job_model.name} - {start_time}"
@@ -1376,11 +1404,13 @@ class ScheduledJob(BaseModel):
             user=user,
             approval_required=approval_required,
             crontab=crontab,
-            queue=task_queue,
+            job_queue=job_queue,
         )
         scheduled_job.validated_save()
         return scheduled_job
 
+    create_schedule.__func__.alters_data = True
+
     def to_cron(self):
         tz = self.time_zone
         t = self.start_time.astimezone(tz)  # pylint: disable=no-member

nautobot/extras/models/metadata.py

@@ -251,6 +251,8 @@ class ObjectMetadata(ChangeLoggedModel, BaseModel):
         self.clean()
         return super().validated_save(*args, **kwargs)
 
+    validated_save.alters_data = True
+
     def clean(self):
         """
         Validate a value according to the field's type validation rules.

nautobot/extras/models/models.py

@@ -457,6 +457,8 @@ class ExportTemplate(
         if self.file_extension.startswith("."):
             self.file_extension = self.file_extension[1:]
 
+    clean.alters_data = True
+
 
 #
 # External integrations
@@ -919,6 +921,8 @@ class UserSavedViewAssociation(BaseModel):
         super().clean()
         self.view_name = self.saved_view.view
 
+    clean.alters_data = True
+
 
 #
 # Webhooks

nautobot/extras/models/secrets.py

@@ -4,6 +4,7 @@ from django.core.exceptions import ValidationError
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import models
 from jinja2.exceptions import TemplateSyntaxError, UndefinedError
+from jinja2.sandbox import unsafe
 
 from nautobot.core.constants import CHARFIELD_MAX_LENGTH
 from nautobot.core.models import BaseModel
@@ -58,6 +59,7 @@ class Secret(PrimaryModel):
         except (TemplateSyntaxError, UndefinedError) as exc:
             raise SecretParametersError(self, registry["secrets_providers"].get(self.provider), str(exc)) from exc
 
+    @unsafe
     def get_value(self, obj=None):
         """Retrieve the secret value that this Secret is a representation of.
 
@@ -77,6 +79,8 @@ class Secret(PrimaryModel):
         except Exception as exc:
             raise SecretError(self, provider, str(exc)) from exc
 
+    get_value.do_not_call_in_templates = True
+
     def clean(self):
         provider = registry["secrets_providers"].get(self.provider)
         if not provider:
@@ -108,6 +112,7 @@ class SecretsGroup(OrganizationalModel):
     def __str__(self):
         return self.name
 
+    @unsafe
     def get_secret_value(self, access_type, secret_type, obj=None, **kwargs):
         """Helper method to retrieve a specific secret from this group.
 
@@ -118,6 +123,8 @@ class SecretsGroup(OrganizationalModel):
         ).secret
         return secret.get_value(obj=obj, **kwargs)
 
+    get_secret_value.do_not_call_in_templates = True
+
 
 @extras_features(
     "graphql",

nautobot/extras/secrets/__init__.py

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
 
+from jinja2.sandbox import unsafe
+
 from nautobot.extras.registry import registry
 
 from .exceptions import SecretError, SecretParametersError, SecretProviderError, SecretValueNotFoundError
@@ -31,6 +33,7 @@ class SecretsProvider(ABC):
 
     @classmethod
     @abstractmethod
+    @unsafe
     def get_value_for_secret(cls, secret, obj=None, **kwargs):
         """Retrieve the stored value described by the given Secret record.
 
@@ -41,6 +44,17 @@ class SecretsProvider(ABC):
             obj (object): Django model instance or similar providing additional context for retrieving the secret.
         """
 
+    get_value_for_secret.__func__.do_not_call_in_templates = True
+
+    def __init_subclass__(cls, **kwargs):
+        # Automatically apply protection against Django and Jinja2 template execution to child classes.
+        if not getattr(cls.get_value_for_secret, "do_not_call_in_templates", False):  # Django
+            cls.get_value_for_secret.__func__.do_not_call_in_templates = True
+        if not getattr(cls.get_value_for_secret, "unsafe_callable", False):  # Jinja @unsafe decorator
+            cls.get_value_for_secret.__func__.unsafe_callable = True
+
+        super().__init_subclass__(**kwargs)
+
 
 def register_secrets_provider(provider):
     """

nautobot/extras/tables.py

@@ -40,6 +40,7 @@ from .models import (
     JobLogEntry,
     JobQueue,
     JobResult,
+    MetadataChoice,
     MetadataType,
     Note,
     ObjectChange,
@@ -730,7 +731,7 @@ class JobTable(BaseTable):
         accessor="latest_result",
         template_code="""
             {% if value %}
-                {{ value.created }} by {{ value.user }}
+                {{ value.date_created|date:settings.SHORT_DATETIME_FORMAT }} by {{ value.user }}
             {% else %}
                 <span class="text-muted">Never</span>
             {% endif %}
@@ -1008,6 +1009,15 @@ class MetadataTypeTable(BaseTable):
         )
 
 
+class MetadataChoiceTable(BaseTable):
+    value = tables.Column()
+    weight = tables.Column()
+
+    class Meta(BaseTable.Meta):
+        model = MetadataChoice
+        fields = ("value", "weight")
+
+
 class ObjectMetadataTable(BaseTable):
     pk = ToggleColumn()
     # NOTE: there is no identity column in this table; this is intentional as we have no detail view for ObjectMetadata

nautobot/extras/templates/extras/computedfield_retrieve.html

@@ -1,56 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Computed Field</strong>
-                </div>
-
-                <table class="table table-hover panel-body attr-table">
-                    <tr>
-                        <td>Content Type</td>
-                        <td><span>{{ object.content_type }}</span></td>
-                    </tr>
-                    <tr>
-                        <td>Label</td>
-                        <td><span>{{ object.label }}</span></td>
-                    </tr>
-                    <tr>
-                        <td>Key</td>
-                        <td><span>{{ object.key }}</span></td>
-                    </tr>
-                    <tr>
-                        <td>Grouping</td>
-                        <td>{{ object.grouping | placeholder }}</td>
-                    </tr>
-                    <tr>
-                        <td>Description</td>
-                        <td><span>{{ object.description|placeholder }}</span></td>
-                    </tr>
-                    <tr>
-                        <td>Fallback Value</td>
-                        <td><span>{{ object.fallback_value }}</span></td>
-                    </tr>
-                    <tr>
-                        <td>Weight</td>
-                        <td><span>{{ object.weight }}</span></td>
-                    </tr>
-                    <tr>
-                        <td>Move to Advanced Tab</td>
-                        <td><span>{{ object.advanced_ui | render_boolean }}</span></td>
-                    </tr>
-                </table>
-            </div>
-{% endblock content_left_page %}
-
-{% block content_full_width_page %}
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <strong>Template</strong>
-                </div>
-                <div class="panel-body">
-                    <pre>{{ object.template }}</pre>
-                </div>
-            </div>
-{% endblock content_full_width_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/inc/job_tiles.html

@@ -58,7 +58,7 @@
                 <div style="flex: 1;">
                     Last run:
                     {% if row.record.latest_result %}
-                        <a href="{{ row.record.latest_result.get_absolute_url }}">{{ row.record.latest_result.date_created }} by {{ row.record.latest_result.user }}</a>
+                        <a href="{{ row.record.latest_result.get_absolute_url }}">{{ row.record.latest_result.date_created|date:settings.DATETIME_FORMAT }} by {{ row.record.latest_result.user }}</a>
                     {% else %}
                         <span class="text-muted">Never</span>
                     {% endif %}

nautobot/extras/templates/extras/jobresult.html

@@ -115,7 +115,7 @@
                     <td>{{ result.worker }}</td>
                 </tr>
                 <tr>
-                    <td>Queue</td>
+                    <td>Queue Name</td>
                     <td>{{ result.celery_kwargs.queue}}</td>
                 </tr>
                 <tr>

nautobot/extras/templates/extras/metadatatype_retrieve.html

@@ -1,67 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Metadata Type</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Name</td>
-                <td>{{ object.name }}</td>
-            </tr>
-            <tr>
-                <td>Description</td>
-                <td>{{ object.description|placeholder }}</td>
-            </tr>
-            <tr>
-                <td>Data Type</td>
-                <td>{{ object.get_data_type_display }}</td>
-            </tr>
-        </table>
-    </div>
-    {% if object.choices.exists %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Choices</strong>
-            </div>
-            <table class="table table-hover panel-body attr-table">
-                <thead>
-                    <tr>
-                        <th>Value</th>
-                        <th>Weight</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for choice in object.choices.all %}
-                        <tr>
-                            <td>{{ choice.value }}</td>
-                            <td>{{ choice.weight }}</td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    {% endif %}
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <strong>Assignment</strong>
-        </div>
-        <table class="table table-hover panel-body attr-table">
-            <tr>
-                <td>Content Types</td>
-                <td>
-                    <ul>
-                        {% for ct in object.content_types.all %}
-                            <li>{{ ct }}</li>
-                        {% endfor %}
-                    </ul>
-                </td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_right_page %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/scheduledjob.html

@@ -48,22 +48,26 @@
                       <code>{{ object.task }}</code>
                   </td>
               </tr>
+              <tr>
+                  <td>Job</td>
+                  <td>{{ object.job_model|hyperlinked_object }}</td>
+              </tr>
               <tr>
                   <td>Requester</td>
                   <td>
-                      {{ object.user }}
+                      {{ object.user|placeholder }}
                   </td>
               </tr>
+              <tr>
+                  <td>Approval Required?</td>
+                  <td>{{ object.approval_required | render_boolean }}</td>
+              </tr>
               <tr>
                   <td>Approver</td>
                   <td>
                       {{ object.approved_by_user | placeholder }}
                   </td>
               </tr>
-              <tr>
-                  <td>Approval Required?</td>
-                  <td>{{ object.approval_required | render_boolean }}</td>
-              </tr>
               <tr>
                   <td>Approved At</td>
                   <td>
@@ -81,6 +85,10 @@
                   <td>Enabled?</td>
                   <td>{{ object.enabled | render_boolean }}</td>
               </tr>
+              <tr>
+                  <td>Job Queue</td>
+                  <td>{{ object.job_queue | hyperlinked_object }}</td>
+              </tr>
               <tr>
                   <td>Interval</td>
                   <td>
@@ -95,9 +103,9 @@
               <tr>
                   <td>Start Time</td>
                   <td>
-                      {{ object.start_time|timezone:object.time_zone|date:'Y-m-d H:i:s T' }}
+                      {{ object.start_time|timezone:object.time_zone|date:settings.SHORT_DATETIME_FORMAT }}
                       {% if default_time_zone != object.time_zone %}
-                          <br>{{ object.start_time|timezone:default_time_zone|date:'Y-m-d H:i:s T' }}
+                          <br>{{ object.start_time|timezone:default_time_zone|date:settings.SHORT_DATETIME_FORMAT }}
                       {% endif %}
                   </td>
               </tr>
@@ -105,9 +113,9 @@
                   <td>Last Run At</td>
                   <td>
                       {% if object.last_run_at %}
-                          {{ object.last_run_at|timezone:object.time_zone|date:'Y-m-d H:i:s T' }}
+                          {{ object.last_run_at|timezone:object.time_zone|date:settings.SHORT_DATETIME_FORMAT }}
                           {% if default_time_zone != object.time_zone %}
-                              <br>{{ object.last_run_at|timezone:default_time_zone|date:'Y-m-d H:i:s T' }}
+                              <br>{{ object.last_run_at|timezone:default_time_zone|date:SHORT_DATETIME_FORMAT }}
                           {% endif %}
                       {% else %}
                           {{ object.last_run_at|placeholder }}
@@ -141,4 +149,12 @@
           </table>
       </div>
     {% endif %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>Celery Keyword Arguments</strong>
+        </div>
+        <div class="panel-body">
+            {% include 'extras/inc/json_data.html' with data=object.celery_kwargs format="json" %}
+        </div>
+    </div>
 {% endblock %}