nautobot 3.0.0rc1__py3-none-any.whl → 3.0.1__py3-none-any.whl

nautobot/core/views/mixins.py

@@ -17,7 +17,7 @@ from django.forms import Form, ModelMultipleChoiceField, MultipleHiddenInput
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import select_template, TemplateDoesNotExist
-from django.urls import reverse
+from django.urls import resolve, reverse
 from django.urls.exceptions import NoReverseMatch
 from django.utils.encoding import iri_to_uri
 from django.utils.html import format_html
@@ -57,7 +57,7 @@ from nautobot.core.views.utils import (
 )
 from nautobot.extras.context_managers import deferred_change_logging_for_bulk_operation
 from nautobot.extras.forms import NoteForm
-from nautobot.extras.models import ExportTemplate, Job, JobResult, SavedView, UserSavedViewAssociation
+from nautobot.extras.models import ExportTemplate, Job, JobResult, SavedView, ScheduledJob, UserSavedViewAssociation
 from nautobot.extras.tables import NoteTable, ObjectChangeTable
 from nautobot.extras.utils import bulk_delete_with_bulk_change_logging, get_base_template, remove_prefix_from_cf_key
 
@@ -74,8 +74,6 @@ PERMISSIONS_ACTION_MAP = {
     "changelog": "view",
     "notes": "view",
     "data_compliance": "view",
-    "approve": "change",
-    "deny": "change",
 }
 
 
@@ -416,11 +414,11 @@ class NautobotViewSetMixin(GenericViewSet, UIComponentsMixin, AccessMixin, GetRe
         """
         model_permissions = []
         for action in actions:
-            # Append additional object permissions if specified.
-            if self.custom_view_additional_permissions:
-                model_permissions.append(*self.custom_view_additional_permissions)
             # Append the model-level permissions for the action.
             model_permissions.append(f"{model._meta.app_label}.{action}_{model._meta.model_name}")
+        # Append additional object permissions if specified.
+        if self.custom_view_additional_permissions:
+            model_permissions.extend(self.custom_view_additional_permissions)
         return model_permissions
 
     def get_required_permission(self):
@@ -931,10 +929,12 @@ class ObjectListViewMixin(NautobotViewSetMixin, mixins.ListModelMixin):
                 self.filterset_class(),
             )
 
+        resolved_path = resolve(request.path)
+        # Note that `resolved_path.app_name` does work even for nested paths like `plugins:example_app:...`
+        view_name = f"{resolved_path.app_name}:{resolved_path.url_name}"
+
         # Check if there is a default for this view for this specific user
         user_default_saved_view = None
-        app_label, model_name = queryset.model._meta.label.split(".")
-        view_name = f"{app_label}:{model_name.lower()}_list"
         user = request.user
         if not isinstance(user, AnonymousUser):
             try:
@@ -1065,7 +1065,8 @@ class ObjectEditViewMixin(NautobotViewSetMixin, mixins.CreateModelMixin, mixins.
                 if hasattr(obj, "clone_fields"):
                     url = f"{request.path}?{prepare_cloned_fields(obj)}"
                     self.success_url = url
-                self.success_url = request.get_full_path()
+                else:
+                    self.success_url = request.get_full_path()
             else:
                 return_url = form.cleaned_data.get("return_url")
                 if url_has_allowed_host_and_scheme(url=return_url, allowed_hosts=request.get_host()):
@@ -1152,6 +1153,19 @@ class BulkEditAndBulkDeleteModelMixin:
         # BulkDeleteObjects job form cannot be invalid; Hence no handling of invalid case.
         job_form.is_valid()
         job_kwargs = BulkDeleteObjects.prepare_job_kwargs(job_form.cleaned_data)
+        # adapted from nautobot/extras/views JobRunView.post() - TODO: deduplicate this code and unify code paths
+        with transaction.atomic():
+            scheduled_job = ScheduledJob.create_schedule(
+                job_model,
+                request.user,
+                **BulkDeleteObjects.serialize_data(job_kwargs),
+            )
+            if scheduled_job.has_approval_workflow_definition():
+                messages.success(request, "Job '{scheduled_job.name}' successfully submitted for approval")
+                return redirect("extras:scheduledjob_approvalworkflow", pk=scheduled_job.pk)
+            else:
+                scheduled_job.delete()
+
         job_result = JobResult.enqueue_job(
             job_model,
             request.user,
@@ -1174,6 +1188,19 @@ class BulkEditAndBulkDeleteModelMixin:
         # NOTE: BulkEditObjects cant be invalid, so there is no need for handling invalid error
         job_form.is_valid()
         job_kwargs = BulkEditObjects.prepare_job_kwargs(job_form.cleaned_data)
+        # adapted from nautobot/extras/views JobRunView.post() - TODO: deduplicate this code and unify code paths
+        with transaction.atomic():
+            scheduled_job = ScheduledJob.create_schedule(
+                job_model,
+                request.user,
+                **BulkEditObjects.serialize_data(job_kwargs),
+            )
+            if scheduled_job.has_approval_workflow_definition():
+                messages.success(request, "Job '{scheduled_job.name}' successfully submitted for approval")
+                return redirect("extras:scheduledjob_approvalworkflow", pk=scheduled_job.pk)
+            else:
+                scheduled_job.delete()
+
         job_result = JobResult.enqueue_job(
             job_model,
             request.user,

nautobot/core/views/renderers.py

@@ -311,6 +311,7 @@ class NautobotHTMLRenderer(renderers.BrowsableAPIRenderer):
             valid_actions = self.validate_action_buttons(view, request)
             # Query SavedViews for dropdown button
             resolved_path = resolve(request.path)
+            # Note that `resolved_path.app_name` does work even for nested paths like `plugins:example_app:...`
             list_url = f"{resolved_path.app_name}:{resolved_path.url_name}"
             saved_views = None
             if model.is_saved_view_model:

nautobot/core/views/utils.py

@@ -591,9 +591,9 @@ def get_bulk_queryset_from_view(
 
     queryset = view_class.queryset.restrict(user, action)
 
-    # The filterset_class is determined from model on purpose, as filterset_class the view as a param, will not work
-    # with a job. It is better to be consistent with each with sending the same params that will
-    # always be available from to the confirmation page and to the job.
+    # The filterset_class is determined from model on purpose versus getting it from the view itself. This is
+    # because the filterset_class on the view as a param, will not work with a job. It is better to be consistent
+    # with each with sending the same params that will always be available from to the confirmation page and to the job.
     filterset_class = get_filterset_for_model(model)
 
     if not filterset_class:

nautobot/data_validation/views.py

@@ -5,12 +5,12 @@ from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
 from django.shortcuts import redirect, render
 
-from nautobot.apps.ui import Breadcrumbs, Titles, ViewNameBreadcrumbItem
 from nautobot.core.ui.choices import SectionChoices
 from nautobot.core.ui.object_detail import (
     ObjectDetailContent,
     ObjectFieldsPanel,
 )
+from nautobot.core.ui.titles import Titles
 from nautobot.core.views.generic import GenericView
 from nautobot.core.views.mixins import (
     ObjectBulkDestroyViewMixin,
@@ -174,13 +174,6 @@ class DataComplianceUIViewSet(  # pylint: disable=W0223
 class DeviceConstraintsView(GenericView):
     template_name = "data_validation/device_constraints.html"
     view_titles = Titles(titles={"*": "Device Constraints"})
-    breadcrumbs = Breadcrumbs(
-        items={
-            "*": [
-                ViewNameBreadcrumbItem(view_name="data_validation:device-constraints", label="Device Constraints"),
-            ],
-        },
-    )
 
     def get(self, request):
         form = forms.DeviceConstraintsForm(user=request.user)
@@ -190,7 +183,6 @@ class DeviceConstraintsView(GenericView):
             {
                 "form": form,
                 "view_titles": self.get_view_titles(),
-                "breadcrumbs": self.get_breadcrumbs(),
             },
         )
 

nautobot/dcim/forms.py

@@ -1491,7 +1491,7 @@ class InterfaceTemplateForm(ModularComponentTemplateForm):
 
 
 class InterfaceTemplateCreateForm(ModularComponentTemplateCreateForm):
-    type = forms.ChoiceField(choices=InterfaceTypeChoices, widget=StaticSelect2())
+    type = forms.ChoiceField(choices=add_blank_choice(InterfaceTypeChoices), widget=StaticSelect2())
     mgmt_only = forms.BooleanField(required=False, label="Management only")
     speed = forms.IntegerField(
         required=False, min_value=0, label="Speed (Kbps)", widget=NumberWithSelect(choices=InterfaceSpeedChoices)
@@ -1567,7 +1567,7 @@ class FrontPortTemplateForm(ModularComponentTemplateForm):
 
 
 class FrontPortTemplateCreateForm(ModularComponentTemplateCreateForm):
-    type = forms.ChoiceField(choices=PortTypeChoices, widget=StaticSelect2())
+    type = forms.ChoiceField(choices=add_blank_choice(PortTypeChoices), widget=StaticSelect2())
     rear_port_template_set = forms.MultipleChoiceField(
         choices=[],
         label="Rear ports",
@@ -1677,7 +1677,7 @@ class RearPortTemplateForm(ModularComponentTemplateForm):
 
 class RearPortTemplateCreateForm(ModularComponentTemplateCreateForm):
     type = forms.ChoiceField(
-        choices=PortTypeChoices,
+        choices=add_blank_choice(PortTypeChoices),
         widget=StaticSelect2(),
     )
     positions = forms.IntegerField(
@@ -3306,7 +3306,7 @@ class InterfaceForm(InterfaceCommonForm, ModularComponentEditForm):
 class InterfaceCreateForm(ModularComponentCreateForm, InterfaceCommonForm, RoleNotRequiredModelFormMixin):
     model = Interface
     type = forms.ChoiceField(
-        choices=InterfaceTypeChoices,
+        choices=add_blank_choice(InterfaceTypeChoices),
         widget=StaticSelect2(),
     )
     status = DynamicModelChoiceField(
@@ -3435,7 +3435,7 @@ class InterfaceBulkCreateForm(
 ):
     model = Interface
     type = forms.ChoiceField(
-        choices=InterfaceTypeChoices,
+        choices=add_blank_choice(InterfaceTypeChoices),
         widget=StaticSelect2(),
     )
     status = DynamicModelChoiceField(
@@ -3473,7 +3473,7 @@ class ModuleInterfaceBulkCreateForm(
 ):
     model = Interface
     type = forms.ChoiceField(
-        choices=InterfaceTypeChoices,
+        choices=add_blank_choice(InterfaceTypeChoices),
         widget=StaticSelect2(),
     )
     status = DynamicModelChoiceField(
@@ -3678,7 +3678,7 @@ class FrontPortForm(ModularComponentEditForm):
 # TODO: Merge with FrontPortTemplateCreateForm to remove duplicate logic
 class FrontPortCreateForm(ModularComponentCreateForm):
     type = forms.ChoiceField(
-        choices=PortTypeChoices,
+        choices=add_blank_choice(PortTypeChoices),
         widget=StaticSelect2(),
     )
     rear_port_set = forms.MultipleChoiceField(
@@ -3806,7 +3806,7 @@ class RearPortForm(ModularComponentEditForm):
 
 class RearPortCreateForm(ModularComponentCreateForm):
     type = forms.ChoiceField(
-        choices=PortTypeChoices,
+        choices=add_blank_choice(PortTypeChoices),
         widget=StaticSelect2(),
     )
     positions = forms.IntegerField(
@@ -5134,7 +5134,7 @@ class InterfaceRedundancyGroupBulkEditForm(
         queryset=InterfaceRedundancyGroup.objects.all(),
         widget=forms.MultipleHiddenInput,
     )
-    protocol = forms.ChoiceField(choices=InterfaceRedundancyGroupProtocolChoices, required=False)
+    protocol = forms.ChoiceField(choices=add_blank_choice(InterfaceRedundancyGroupProtocolChoices), required=False)
     description = forms.CharField(required=False)
     virtual_ip = DynamicModelChoiceField(queryset=IPAddress.objects.all(), required=False)
     secrets_group = DynamicModelChoiceField(queryset=SecretsGroup.objects.all(), required=False)

nautobot/dcim/models/devices.py

@@ -1962,11 +1962,11 @@ class Module(PrimaryModel):
     @property
     def page_title(self):
         if self.location:
-            return f"{self.module_type!s} at location {self.location}"
+            return f"{self.location} {self.module_type!s}"
         if self.parent_module_bay.parent_device is not None:
-            return f"{self.module_type!s} installed in {self.parent_module_bay.parent_device.display}"
+            return f"{self.parent_module_bay.parent_device.display} {self.module_type!s}"
 
-        return f"{self.module_type!s} installed in {self.parent_module_bay.parent_module.module_type!s}"
+        return f"{self.parent_module_bay.parent_module.module_type!s} {self.module_type!s}"
 
     @property
     def device(self):

nautobot/dcim/tables/power.py

@@ -2,6 +2,7 @@ import django_tables2 as tables
 
 from nautobot.core.tables import (
     BaseTable,
+    ButtonsColumn,
     ChoiceFieldColumn,
     LinkedCountColumn,
     TagColumn,
@@ -36,6 +37,7 @@ class PowerPanelTable(BaseTable):
         verbose_name="Feeds",
     )
     tags = TagColumn(url_name="dcim:powerpanel_list")
+    actions = ButtonsColumn(PowerPanel)
 
     class Meta(BaseTable.Meta):
         model = PowerPanel
@@ -81,6 +83,7 @@ class PowerFeedTable(StatusTableMixin, CableTerminationTable):
     max_utilization = tables.TemplateColumn(template_code="{{ value }}%")
     available_power = tables.Column(verbose_name="Available power (VA)")
     tags = TagColumn(url_name="dcim:powerfeed_list")
+    actions = ButtonsColumn(PowerFeed)
 
     class Meta(BaseTable.Meta):
         model = PowerFeed

nautobot/dcim/templates/dcim/controllermanageddevicegroup_create.html

@@ -20,7 +20,7 @@
     </div>
     <div class="card">
         <div class="card-header"><strong>Wireless Network Assignment</strong></div>
-        <div class="card-body">
+        <div class="card-body overflow-auto">
             {% if wireless_networks.errors %}
                 <div class="text-danger">
                     Please correct the error(s) below:

nautobot/dcim/views.py

@@ -3093,7 +3093,8 @@ class DeviceUIViewSet(NautobotUIViewSet):
                         table_title="Wireless Networks",
                         table_class=BaseControllerManagedDeviceGroupWirelessNetworkAssignmentTable,
                         table_attribute="wireless_network_assignments",
-                        related_field_name="controller_device_redundancy_group",
+                        related_field_name="controller_managed_device_groups__devices",
+                        related_list_url_name="wireless:wirelessnetwork_list",
                         tab_id="wireless",
                         include_paginator=True,
                         exclude_columns=["controller_managed_device_group", "controller"],
@@ -3104,7 +3105,8 @@ class DeviceUIViewSet(NautobotUIViewSet):
                         table_title="Radio Profiles",
                         table_class=ControllerManagedDeviceGroupRadioProfileAssignmentTable,
                         table_attribute="radio_profile_assignments",
-                        related_field_name="controller_device_redundancy_group",
+                        related_field_name="controller_managed_device_groups__devices",
+                        related_list_url_name="wireless:radioprofile_list",
                         tab_id="wireless",
                         include_paginator=True,
                         exclude_columns=["controller_managed_device_group"],
@@ -3508,6 +3510,30 @@ class ModuleUIViewSet(BulkComponentCreateUIViewSetMixin, NautobotUIViewSet):
     serializer_class = serializers.ModuleSerializer
     table_class = tables.ModuleTable
     component_model = None
+    breadcrumbs = Breadcrumbs(
+        items={
+            "detail": [
+                ModelBreadcrumbItem(),
+                InstanceBreadcrumbItem(
+                    instance=context_object_attr("parent_module_bay.parent_device"),
+                    should_render=lambda c: c["object"].parent_module_bay is not None
+                    and c["object"].parent_module_bay.parent_device is not None,
+                ),
+                InstanceBreadcrumbItem(
+                    instance=context_object_attr("parent_module_bay.parent_module"),
+                    should_render=lambda c: c["object"].parent_module_bay is not None
+                    and c["object"].parent_module_bay.parent_module is not None,
+                ),
+                InstanceBreadcrumbItem(instance=context_object_attr("parent_module_bay")),
+                AncestorsInstanceBreadcrumbItem(
+                    instance=context_object_attr("location"),
+                    ancestor_item=lambda ancestor: InstanceParentBreadcrumbItem(parent_key="location", parent=ancestor),
+                    include_self=True,
+                    should_render=lambda c: c["object"].location is not None,
+                ),
+            ]
+        }
+    )
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)
@@ -4592,24 +4618,12 @@ class ModuleBayUIViewSet(ModuleBayCommonViewSetMixin, NautobotUIViewSet):
                     instance=context_object_attr("parent_device"),
                     should_render=context_object_attr("parent_device"),
                 ),
-                ViewNameBreadcrumbItem(
-                    view_name_key="device_breadcrumb_url",
-                    should_render=lambda c: c["object"].parent_device and c.get("device_breadcrumb_url"),
-                    reverse_kwargs=lambda c: {"pk": c["object"].parent_device.pk},
-                    label=lambda c: c["object"]._meta.verbose_name_plural,
-                ),
                 # Breadcrumb path if ModuleBay is linked with module
                 ModelBreadcrumbItem(model=Module, should_render=lambda c: c["object"].parent_device is None),
                 InstanceBreadcrumbItem(
                     instance=context_object_attr("parent_module"),
                     should_render=lambda c: c["object"].parent_device is None,
                 ),
-                ViewNameBreadcrumbItem(
-                    view_name_key="module_breadcrumb_url",
-                    should_render=lambda c: c["object"].parent_device is None and c.get("module_breadcrumb_url"),
-                    reverse_kwargs=lambda c: {"pk": c["object"].parent_module.pk},
-                    label=lambda c: c["object"]._meta.verbose_name_plural,
-                ),
             ]
         }
     )
@@ -4999,15 +5013,6 @@ class ConsoleConnectionsListView(ConnectionsListView):
     template_name = "dcim/console_port_connection_list.html"
     action_buttons = ("export",)
     view_titles = Titles(titles={"list": "Console Connections"})
-    breadcrumbs = Breadcrumbs(
-        items={"list": [ViewNameBreadcrumbItem(view_name="dcim:console_connections_list", label="Console Connections")]}
-    )
-
-    def extra_context(self):
-        return {
-            "title": "Console Connections",
-            "list_url": "dcim:console_connections_list",
-        }
 
 
 class PowerConnectionsListView(ConnectionsListView):
@@ -5018,15 +5023,6 @@ class PowerConnectionsListView(ConnectionsListView):
     template_name = "dcim/power_port_connection_list.html"
     action_buttons = ("export",)
     view_titles = Titles(titles={"list": "Power Connections"})
-    breadcrumbs = Breadcrumbs(
-        items={"list": [ViewNameBreadcrumbItem(view_name="dcim:power_connections_list", label="Power Connections")]}
-    )
-
-    def extra_context(self):
-        return {
-            "title": "Power Connections",
-            "list_url": "dcim:power_connections_list",
-        }
 
 
 class InterfaceConnectionsListView(ConnectionsListView):
@@ -5037,11 +5033,6 @@ class InterfaceConnectionsListView(ConnectionsListView):
     template_name = "dcim/interface_connection_list.html"
     action_buttons = ("export",)
     view_titles = Titles(titles={"list": "Interface Connections"})
-    breadcrumbs = Breadcrumbs(
-        items={
-            "list": [ViewNameBreadcrumbItem(view_name="dcim:interface_connections_list", label="Interface Connections")]
-        }
-    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -5067,12 +5058,6 @@ class InterfaceConnectionsListView(ConnectionsListView):
 
         return self.queryset
 
-    def extra_context(self):
-        return {
-            "title": "Interface Connections",
-            "list_url": "dcim:interface_connections_list",
-        }
-
 
 #
 # Virtual chassis
@@ -5967,12 +5952,13 @@ class ControllerUIViewSet(NautobotUIViewSet):
                         table_title="Wireless Networks",
                         table_class=BaseControllerManagedDeviceGroupWirelessNetworkAssignmentTable,
                         table_filter="controller_managed_device_group__controller",
+                        related_field_name="controller_managed_device_groups__controller",
+                        related_list_url_name="wireless:wirelessnetwork_list",
                         tab_id="wireless_networks",
                         add_button_route=None,
                         select_related_fields=["wireless_network"],
                         exclude_columns=["controller"],
                         include_paginator=True,
-                        enable_related_link=False,
                     ),
                 ),
             ),

nautobot/extras/api/views.py

@@ -311,7 +311,7 @@ class ApprovalWorkflowStageViewSet(NautobotModelViewSet):
     def _is_user_approver(self, user, stage):
         """Checks if the user belongs to the group allowed to approve the current stage."""
         approver_group = stage.approval_workflow_stage_definition.approver_group
-        return user in approver_group.user_set.all()
+        return approver_group.user_set.filter(id=user.id).exists()
 
     def _user_already_approved_or_denied(self, user, stage, action_type):
         """Checks if the user has already approved/denied to the current stage."""
@@ -425,6 +425,12 @@ class ApprovalWorkflowStageViewSet(NautobotModelViewSet):
         """Add a comment to the specific stage (without approving or denying)."""
         stage = self.get_object()
 
+        if not stage.is_not_done_stage:
+            return Response(
+                {"detail": f"This stage is in {stage.state} state. Can't comment approved or denied stage."},
+                status=status.HTTP_400_BAD_REQUEST,
+            )
+
         comment = request.data.get("comments", "")
         if not comment:
             return Response(
@@ -432,9 +438,14 @@ class ApprovalWorkflowStageViewSet(NautobotModelViewSet):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
-        ApprovalWorkflowStageResponse.objects.create(
-            approval_workflow_stage=stage, user=request.user, state=stage.state, comments=comment
+        approval_workflow_stage_response, _ = ApprovalWorkflowStageResponse.objects.get_or_create(
+            approval_workflow_stage=stage, user=request.user
         )
+        # we don't want to change a state if is approved, denied or canceled
+        if approval_workflow_stage_response.state == ApprovalWorkflowStateChoices.PENDING:
+            approval_workflow_stage_response.state = ApprovalWorkflowStateChoices.COMMENT
+        approval_workflow_stage_response.comments = comment
+        approval_workflow_stage_response.save()
 
         serializer = serializers.ApprovalWorkflowStageSerializer(stage, context={"request": request})
         return Response(serializer.data, status=status.HTTP_200_OK)

nautobot/extras/choices.py

@@ -19,18 +19,21 @@ class ApprovalWorkflowStateChoices(ChoiceSet):
     APPROVED = "Approved"
     DENIED = "Denied"
     CANCELED = "Canceled"
+    COMMENT = "Comment"
 
     CHOICES = (
         (PENDING, "Pending"),
         (APPROVED, "Approved"),
         (DENIED, "Denied"),
         (CANCELED, "Canceled"),
+        (COMMENT, "Comment"),
     )
     CSS_CLASSES = {
         PENDING: "info",
         APPROVED: "success",
         DENIED: "danger",
         CANCELED: "warning",
+        COMMENT: "info",
     }
 
 

nautobot/extras/jobs.py

@@ -29,6 +29,7 @@ from django.db.models.query import QuerySet
 from django.forms import ValidationError
 from django.utils.functional import classproperty
 import netaddr
+from prometheus_client import Counter
 import yaml
 
 from nautobot.core.celery import import_jobs, nautobot_task
@@ -89,6 +90,27 @@ __all__ = [
 
 logger = logging.getLogger(__name__)
 
+started_jobs_counter = Counter(
+    name="nautobot_worker_started_jobs",
+    documentation="Job executions that started running",
+    labelnames=("job_class_name", "module_name"),
+)
+finished_jobs_counter = Counter(
+    name="nautobot_worker_finished_jobs",
+    documentation="Job executions that finished running",
+    labelnames=("job_class_name", "module_name", "status"),
+)
+exception_jobs_counter = Counter(
+    name="nautobot_worker_exception_jobs",
+    documentation="Job executions that raised an exception",
+    labelnames=("job_class_name", "module_name", "exception_type"),
+)
+singleton_conflict_counter = Counter(
+    name="nautobot_worker_singleton_conflict",
+    documentation="Job executions that ran into a singleton lock",
+    labelnames=("job_class_name", "module_name"),
+)
+
 
 class RunJobTaskFailed(Exception):
     """Celery task failed for some reason."""
@@ -1194,6 +1216,9 @@ def _prepare_job(job_class_path, request, kwargs) -> tuple[Job, dict]:
                     extra={"object": job.job_model, "grouping": "initialization"},
                 )
             else:
+                singleton_conflict_counter.labels(
+                    job_class_name=job.job_model.job_class_name, module_name=job.job_model.module_name
+                ).inc()
                 # TODO 3.0: maybe change to logger.failure() and return cleanly, as this is an "acceptable" failure?
                 job.logger.error(
                     "Job %s is a singleton and already running.",
@@ -1277,6 +1302,9 @@ def run_job(self, job_class_path, *args, **kwargs):
 
     result = None
     status = None
+    started_jobs_counter.labels(
+        job_class_name=job.job_model.job_class_name, module_name=job.job_model.module_name
+    ).inc()
     try:
         before_start_result = job.before_start(self.request.id, args, kwargs)
         if not job._failed:
@@ -1293,6 +1321,9 @@ def run_job(self, job_class_path, *args, **kwargs):
             job.on_success(result, self.request.id, args, kwargs)
         else:
             job.on_failure(result, self.request.id, args, kwargs, None)
+        finished_jobs_counter.labels(
+            job_class_name=job.job_model.job_class_name, module_name=job.job_model.module_name, status=status
+        ).inc()
 
         job.after_return(status, result, self.request.id, args, kwargs, None)
 
@@ -1309,11 +1340,21 @@ def run_job(self, job_class_path, *args, **kwargs):
         # We don't want to overwrite the manual state update that we did above, so:
         raise Ignore()
 
-    except Reject:
+    except Reject as exc:
+        exception_jobs_counter.labels(
+            job_class_name=job.job_model.job_class_name,
+            module_name=job.job_model.module_name,
+            exception_type=type(exc).__name__,
+        ).inc()
         status = status or JobResultStatusChoices.STATUS_REJECTED
         raise
 
-    except Ignore:
+    except Ignore as exc:
+        exception_jobs_counter.labels(
+            job_class_name=job.job_model.job_class_name,
+            module_name=job.job_model.module_name,
+            exception_type=type(exc).__name__,
+        ).inc()
         status = status or JobResultStatusChoices.STATUS_IGNORED
         raise
 
@@ -1326,6 +1367,11 @@ def run_job(self, job_class_path, *args, **kwargs):
             "exc_type": type(exc).__name__,
             "exc_message": sanitize(str(exc)),
         }
+        exception_jobs_counter.labels(
+            job_class_name=job.job_model.job_class_name,
+            module_name=job.job_model.module_name,
+            exception_type=type(exc).__name__,
+        ).inc()
         raise
 
     finally: