nautobot 2.0.0a3__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

nautobot/dcim/urls.py

@@ -40,17 +40,17 @@ urlpatterns = [
     path("location-types/add/", views.LocationTypeEditView.as_view(), name="locationtype_add"),
     path("location-types/import/", views.LocationTypeBulkImportView.as_view(), name="locationtype_import"),
     path("location-types/delete/", views.LocationTypeBulkDeleteView.as_view(), name="locationtype_bulk_delete"),
-    path("location-types/<slug:slug>/", views.LocationTypeView.as_view(), name="locationtype"),
-    path("location-types/<slug:slug>/edit/", views.LocationTypeEditView.as_view(), name="locationtype_edit"),
-    path("location-types/<slug:slug>/delete/", views.LocationTypeDeleteView.as_view(), name="locationtype_delete"),
+    path("location-types/<uuid:pk>/", views.LocationTypeView.as_view(), name="locationtype"),
+    path("location-types/<uuid:pk>/edit/", views.LocationTypeEditView.as_view(), name="locationtype_edit"),
+    path("location-types/<uuid:pk>/delete/", views.LocationTypeDeleteView.as_view(), name="locationtype_delete"),
     path(
-        "location-types/<slug:slug>/changelog/",
+        "location-types/<uuid:pk>/changelog/",
         ObjectChangeLogView.as_view(),
         name="locationtype_changelog",
         kwargs={"model": LocationType},
     ),
     path(
-        "location-types/<slug:slug>/notes/",
+        "location-types/<uuid:pk>/notes/",
         ObjectNotesView.as_view(),
         name="locationtype_notes",
         kwargs={"model": LocationType},
@@ -61,23 +61,23 @@ urlpatterns = [
     path("locations/edit/", views.LocationBulkEditView.as_view(), name="location_bulk_edit"),
     path("locations/import/", views.LocationBulkImportView.as_view(), name="location_import"),
     path("locations/delete/", views.LocationBulkDeleteView.as_view(), name="location_bulk_delete"),
-    path("locations/<slug:slug>/", views.LocationView.as_view(), name="location"),
-    path("locations/<slug:slug>/edit/", views.LocationEditView.as_view(), name="location_edit"),
-    path("locations/<slug:slug>/delete/", views.LocationDeleteView.as_view(), name="location_delete"),
+    path("locations/<uuid:pk>/", views.LocationView.as_view(), name="location"),
+    path("locations/<uuid:pk>/edit/", views.LocationEditView.as_view(), name="location_edit"),
+    path("locations/<uuid:pk>/delete/", views.LocationDeleteView.as_view(), name="location_delete"),
     path(
-        "locations/<slug:slug>/changelog/",
+        "locations/<uuid:pk>/changelog/",
         ObjectChangeLogView.as_view(),
         name="location_changelog",
         kwargs={"model": Location},
     ),
     path(
-        "locations/<slug:slug>/notes/",
+        "locations/<uuid:pk>/notes/",
         ObjectNotesView.as_view(),
         name="location_notes",
         kwargs={"model": Location},
     ),
     path(
-        "locations/<slug:slug>/images/add/",
+        "locations/<uuid:pk>/images/add/",
         ImageAttachmentEditView.as_view(),
         name="location_add_image",
         kwargs={"model": Location},
@@ -582,11 +582,6 @@ urlpatterns = [
     path("devices/", views.DeviceListView.as_view(), name="device_list"),
     path("devices/add/", views.DeviceEditView.as_view(), name="device_add"),
     path("devices/import/", views.DeviceBulkImportView.as_view(), name="device_import"),
-    path(
-        "devices/import/child-devices/",
-        views.ChildDeviceBulkImportView.as_view(),
-        name="device_import_child",
-    ),
     path("devices/edit/", views.DeviceBulkEditView.as_view(), name="device_bulk_edit"),
     path(
         "devices/delete/",

nautobot/dcim/views.py

@@ -1,5 +1,5 @@
 import uuid
-from collections import OrderedDict, namedtuple
+from collections import OrderedDict
 
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
@@ -25,7 +25,6 @@ from nautobot.core.utils.permissions import get_permission_for_model
 from nautobot.core.views import generic
 from nautobot.core.views.mixins import GetReturnURLMixin, ObjectPermissionRequiredMixin
 from nautobot.core.views.paginator import EnhancedPaginator, get_paginate_count
-from nautobot.core.views.utils import csv_format
 from nautobot.core.views.viewsets import NautobotUIViewSet
 from nautobot.extras.views import ObjectChangeLogView, ObjectConfigContextView, ObjectDynamicGroupsView
 from nautobot.ipam.models import IPAddress, Prefix, Service, VLAN
@@ -190,7 +189,6 @@ class LocationTypeDeleteView(generic.ObjectDeleteView):
 
 class LocationTypeBulkImportView(generic.BulkImportView):
     queryset = LocationType.objects.all()
-    model_form = forms.LocationTypeCSVForm
     table = tables.LocationTypeTable
 
 
@@ -280,7 +278,6 @@ class LocationBulkEditView(generic.BulkEditView):
 
 class LocationBulkImportView(generic.BulkImportView):
     queryset = Location.objects.all()
-    model_form = forms.LocationCSVForm
     table = tables.LocationTable
 
 
@@ -338,7 +335,6 @@ class RackGroupDeleteView(generic.ObjectDeleteView):
 
 class RackGroupBulkImportView(generic.BulkImportView):
     queryset = RackGroup.objects.all()
-    model_form = forms.RackGroupCSVForm
     table = tables.RackGroupTable
 
 
@@ -463,7 +459,6 @@ class RackDeleteView(generic.ObjectDeleteView):
 
 class RackBulkImportView(generic.BulkImportView):
     queryset = Rack.objects.all()
-    model_form = forms.RackCSVForm
     table = tables.RackTable
 
 
@@ -515,19 +510,8 @@ class RackReservationDeleteView(generic.ObjectDeleteView):
 
 class RackReservationImportView(generic.BulkImportView):
     queryset = RackReservation.objects.all()
-    model_form = forms.RackReservationCSVForm
     table = tables.RackReservationTable
 
-    def _save_obj(self, obj_form, request):
-        """
-        Assign the currently authenticated user to the RackReservation.
-        """
-        instance = obj_form.save(commit=False)
-        instance.user = request.user
-        instance.save()
-
-        return instance
-
 
 class RackReservationBulkEditView(generic.BulkEditView):
     queryset = RackReservation.objects.select_related("rack", "user")
@@ -592,7 +576,6 @@ class ManufacturerDeleteView(generic.ObjectDeleteView):
 
 class ManufacturerBulkImportView(generic.BulkImportView):
     queryset = Manufacturer.objects.all()
-    model_form = forms.ManufacturerCSVForm
     table = tables.ManufacturerTable
 
 
@@ -1069,7 +1052,6 @@ class PlatformDeleteView(generic.ObjectDeleteView):
 
 class PlatformBulkImportView(generic.BulkImportView):
     queryset = Platform.objects.all()
-    model_form = forms.PlatformCSVForm
     table = tables.PlatformTable
 
 
@@ -1128,8 +1110,7 @@ class DeviceView(generic.ObjectView):
 
         # VRF assignments
         vrf_assignments = instance.vrf_assignments.restrict(request.user, "view")
-        vrf_table = VRFDeviceAssignmentTable(vrf_assignments)
-        vrf_table.exclude = ("device",)
+        vrf_table = VRFDeviceAssignmentTable(vrf_assignments, exclude=("virtual_machine", "device"))
 
         return {
             "services": services,
@@ -1401,26 +1382,7 @@ class DeviceDeleteView(generic.ObjectDeleteView):
 
 class DeviceBulkImportView(generic.BulkImportView):
     queryset = Device.objects.all()
-    model_form = forms.DeviceCSVForm
-    table = tables.DeviceImportTable
-    template_name = "dcim/device_import.html"
-
-
-class ChildDeviceBulkImportView(generic.BulkImportView):
-    queryset = Device.objects.all()
-    model_form = forms.ChildDeviceCSVForm
     table = tables.DeviceImportTable
-    template_name = "dcim/device_import_child.html"
-
-    def _save_obj(self, obj_form, request):
-        obj = obj_form.save()
-
-        # Save the reverse relation to the parent device bay
-        device_bay = obj.parent_bay
-        device_bay.installed_device = obj
-        device_bay.save()
-
-        return obj
 
 
 class DeviceBulkEditView(generic.BulkEditView):
@@ -1477,7 +1439,6 @@ class ConsolePortDeleteView(generic.ObjectDeleteView):
 
 class ConsolePortBulkImportView(generic.BulkImportView):
     queryset = ConsolePort.objects.all()
-    model_form = forms.ConsolePortCSVForm
     table = tables.ConsolePortTable
 
 
@@ -1541,7 +1502,6 @@ class ConsoleServerPortDeleteView(generic.ObjectDeleteView):
 
 class ConsoleServerPortBulkImportView(generic.BulkImportView):
     queryset = ConsoleServerPort.objects.all()
-    model_form = forms.ConsoleServerPortCSVForm
     table = tables.ConsoleServerPortTable
 
 
@@ -1605,7 +1565,6 @@ class PowerPortDeleteView(generic.ObjectDeleteView):
 
 class PowerPortBulkImportView(generic.BulkImportView):
     queryset = PowerPort.objects.all()
-    model_form = forms.PowerPortCSVForm
     table = tables.PowerPortTable
 
 
@@ -1669,7 +1628,6 @@ class PowerOutletDeleteView(generic.ObjectDeleteView):
 
 class PowerOutletBulkImportView(generic.BulkImportView):
     queryset = PowerOutlet.objects.all()
-    model_form = forms.PowerOutletCSVForm
     table = tables.PowerOutletTable
 
 
@@ -1763,7 +1721,6 @@ class InterfaceDeleteView(generic.ObjectDeleteView):
 
 class InterfaceBulkImportView(generic.BulkImportView):
     queryset = Interface.objects.all()
-    model_form = forms.InterfaceCSVForm
     table = tables.InterfaceTable
 
 
@@ -1828,7 +1785,6 @@ class FrontPortDeleteView(generic.ObjectDeleteView):
 
 class FrontPortBulkImportView(generic.BulkImportView):
     queryset = FrontPort.objects.all()
-    model_form = forms.FrontPortCSVForm
     table = tables.FrontPortTable
 
 
@@ -1892,7 +1848,6 @@ class RearPortDeleteView(generic.ObjectDeleteView):
 
 class RearPortBulkImportView(generic.BulkImportView):
     queryset = RearPort.objects.all()
-    model_form = forms.RearPortCSVForm
     table = tables.RearPortTable
 
 
@@ -2041,7 +1996,6 @@ class DeviceBayDepopulateView(generic.ObjectEditView):
 
 class DeviceBayBulkImportView(generic.BulkImportView):
     queryset = DeviceBay.objects.all()
-    model_form = forms.DeviceBayCSVForm
     table = tables.DeviceBayTable
 
 
@@ -2100,7 +2054,6 @@ class InventoryItemDeleteView(generic.ObjectDeleteView):
 
 class InventoryItemBulkImportView(generic.BulkImportView):
     queryset = InventoryItem.objects.all()
-    model_form = forms.InventoryItemCSVForm
     table = tables.InventoryItemTable
 
 
@@ -2377,7 +2330,6 @@ class CableDeleteView(generic.ObjectDeleteView):
 
 class CableBulkImportView(generic.BulkImportView):
     queryset = Cable.objects.all()
-    model_form = forms.CableCSVForm
     table = tables.CableTable
 
 
@@ -2400,56 +2352,7 @@ class CableBulkDeleteView(generic.BulkDeleteView):
 
 
 class ConnectionsListView(generic.ObjectListView):
-    CSVRow = namedtuple("CSVRow", ["device", "name", "dest_device", "dest_name", "reachable"])
-
-    def queryset_to_csv_body_data(self):
-        """
-        The headers may differ from view to view but the formatting of the CSV data is the same.
-        """
-        csv_body_data = []
-        for obj in self.queryset:
-            # The connected endpoint may or may not be associated with a Device (e.g., CircuitTerminations are not)
-            # and may or may not have a name of its own (e.g., CircuitTerminations do not)
-            dest_device = None
-            dest_name = None
-            if obj.connected_endpoint:
-                if hasattr(obj.connected_endpoint, "device"):
-                    dest_device = obj.connected_endpoint.device.identifier
-                if hasattr(obj.connected_endpoint, "name"):
-                    dest_name = obj.connected_endpoint.name
-
-            # In the case where a connection exists between two like endpoints,
-            # for consistency of output we want to ensure that it's always represented as
-            # ("device a", "interface a", "device b", "interface b") rather than
-            # ("device b", "interface b", "device a", "interface a")
-            if obj.__class__ == obj.connected_endpoint.__class__ and (
-                obj.device.identifier > obj.connected_endpoint.device.identifier
-                or (
-                    obj.device.identifier == obj.connected_endpoint.device.identifier
-                    and obj.name > obj.connected_endpoint.name
-                )
-            ):
-                # Swap the two endpoints around for consistent output as described above
-                row = self.CSVRow(
-                    device=dest_device,
-                    name=dest_name,
-                    dest_device=obj.device.identifier,
-                    dest_name=obj.name,
-                    reachable=str(obj.path.is_active),
-                )
-            else:
-                # Existing order of endpoints is fine and correct
-                row = self.CSVRow(
-                    device=obj.device.identifier,
-                    name=obj.name,
-                    dest_device=dest_device,
-                    dest_name=dest_name,
-                    reachable=str(obj.path.is_active),
-                )
-
-            csv_body_data.append(csv_format(row))
-
-        return sorted(csv_body_data)
+    pass
 
 
 class ConsoleConnectionsListView(ConnectionsListView):
@@ -2457,17 +2360,9 @@ class ConsoleConnectionsListView(ConnectionsListView):
     filterset = filters.ConsoleConnectionFilterSet
     filterset_form = forms.ConsoleConnectionFilterForm
     table = tables.ConsoleConnectionTable
+    template_name = "dcim/console_port_connection_list.html"
     action_buttons = ("export",)
 
-    def queryset_to_csv(self):
-        csv_data = [
-            # Headers
-            ",".join(["device", "console_port", "console_server", "port", "reachable"])
-        ]
-        csv_data.extend(self.queryset_to_csv_body_data())
-
-        return "\n".join(csv_data)
-
     def extra_context(self):
         return {
             "title": "Console Connections",
@@ -2481,17 +2376,9 @@ class PowerConnectionsListView(ConnectionsListView):
     filterset = filters.PowerConnectionFilterSet
     filterset_form = forms.PowerConnectionFilterForm
     table = tables.PowerConnectionTable
+    template_name = "dcim/power_port_connection_list.html"
     action_buttons = ("export",)
 
-    def queryset_to_csv(self):
-        csv_data = [
-            # Headers
-            ",".join(["device", "power_port", "pdu", "outlet", "reachable"])
-        ]
-        csv_data.extend(self.queryset_to_csv_body_data())
-
-        return "\n".join(csv_data)
-
     def extra_context(self):
         return {
             "title": "Power Connections",
@@ -2505,6 +2392,7 @@ class InterfaceConnectionsListView(ConnectionsListView):
     filterset = filters.InterfaceConnectionFilterSet
     filterset_form = forms.InterfaceConnectionFilterForm
     table = tables.InterfaceConnectionTable
+    template_name = "dcim/interface_connection_list.html"
     action_buttons = ("export",)
 
     def __init__(self, *args, **kwargs):
@@ -2520,8 +2408,7 @@ class InterfaceConnectionsListView(ConnectionsListView):
             # Unfortunately we can't use something consistent to pick which pair to exclude (such as device or name)
             # as _path.destination is a GenericForeignKey without a corresponding GenericRelation and so cannot be
             # used for reverse querying.
-            # The below at least ensures uniqueness, but doesn't guarantee whether we get (A, B) or (B, A);
-            # we fix it up to be consistently (A, B) in queryset_to_csv_body_data().
+            # The below at least ensures uniqueness, but doesn't guarantee whether we get (A, B) or (B, A)
             # TODO: this is very problematic when filtering the view via FilterSet - if the filterset matches (A), then
             #       the connection will appear in the table, but if it only matches (B) then the connection will not!
             _path__destination_type=ContentType.objects.get_for_model(Interface),
@@ -2532,15 +2419,6 @@ class InterfaceConnectionsListView(ConnectionsListView):
 
         return self.queryset
 
-    def queryset_to_csv(self):
-        csv_data = [
-            # Headers
-            ",".join(["device_a", "interface_a", "device_b", "interface_b", "reachable"])
-        ]
-        csv_data.extend(self.queryset_to_csv_body_data())
-
-        return "\n".join(csv_data)
-
     def extra_context(self):
         return {
             "title": "Interface Connections",
@@ -2773,7 +2651,6 @@ class VirtualChassisRemoveMemberView(ObjectPermissionRequiredMixin, GetReturnURL
 
 class VirtualChassisBulkImportView(generic.BulkImportView):
     queryset = VirtualChassis.objects.all()
-    model_form = forms.VirtualChassisCSVForm
     table = tables.VirtualChassisTable
 
 
@@ -2829,7 +2706,6 @@ class PowerPanelDeleteView(generic.ObjectDeleteView):
 
 class PowerPanelBulkImportView(generic.BulkImportView):
     queryset = PowerPanel.objects.all()
-    model_form = forms.PowerPanelCSVForm
     table = tables.PowerPanelTable
 
 
@@ -2876,7 +2752,6 @@ class PowerFeedDeleteView(generic.ObjectDeleteView):
 
 class PowerFeedBulkImportView(generic.BulkImportView):
     queryset = PowerFeed.objects.all()
-    model_form = forms.PowerFeedCSVForm
     table = tables.PowerFeedTable
 
 
@@ -2894,7 +2769,6 @@ class PowerFeedBulkDeleteView(generic.BulkDeleteView):
 
 
 class DeviceRedundancyGroupUIViewSet(NautobotUIViewSet):
-    bulk_create_form_class = forms.DeviceRedundancyGroupCSVForm
     bulk_update_form_class = forms.DeviceRedundancyGroupBulkEditForm
     filterset_class = filters.DeviceRedundancyGroupFilterSet
     filterset_form_class = forms.DeviceRedundancyGroupFilterForm
@@ -2906,7 +2780,6 @@ class DeviceRedundancyGroupUIViewSet(NautobotUIViewSet):
     )
     serializer_class = serializers.DeviceRedundancyGroupSerializer
     table_class = tables.DeviceRedundancyGroupTable
-    lookup_field = "pk"
 
     def get_extra_context(self, request, instance):
         context = super().get_extra_context(request, instance)

nautobot/docs/additional-features/caching.md

@@ -10,75 +10,32 @@ Nautobot makes extensive use of caching; this is not a simple topic but it's a u
 
 ## How it Works
 
-Nautobot optionally supports database query caching using [`django-cacheops`](https://github.com/Suor/django-cacheops) and Redis. Caching can be enabled by toggling [`CACHEOPS_ENABLED`](../configuration/optional-settings.md#cacheops_enabled) to `True` (it is `False` by default). When caching is enabled, and a query is made, the results are cached in Redis for a short period of time, as defined by the [`CACHEOPS_DEFAULTS`](../configuration/optional-settings.md#cacheops_defaults) parameter (15 minutes by default). Within that time, all recurrences of that specific query will return the pre-fetched results from the cache.
-
-!!! caution "Changed in version 1.5.0"
-    Query caching is now disabled by default, and will be removed as a supported option in a future release.
-
-If a change is made to any of the objects returned by the cached query within that time, or if the timeout expires, the cached results are automatically invalidated and the next request for those results will be sent to the database.
+--- 2.0.0
+    `django-cacheops` has been removed as a Nautobot dependency and is no longer used.
 
 Caching is a complex topic and there are some important details to clarify with how caching is implemented and configured in Nautobot.
 
 ### Caching in Django
 
-Django includes with its own [cache framework](https://docs.djangoproject.com/en/stable/topics/cache/) that works for common cases, but does not work well for the wide array of use-cases within Nautobot. For that reason, **Django's built-in caching is not used for the caching of web UI views, API results, and underlying database queries.** Instead, we use [`django-cacheops`](https://github.com/Suor/django-cacheops). Please see below for more on this.
+Django includes its own [cache framework](https://docs.djangoproject.com/en/stable/topics/cache/). Nautobot uses this cache framework in a limited number of cases.
 
 ### `CACHES` and `django-redis`
 
-The [`CACHES`](../configuration/required-settings.md#caches) setting is used to, among other things, configure Django's built-in caching. You'll observe that, even though we aren't using Django's built-in caching, *we still have this as a required setting*. Here's why:
+The [`CACHES`](../configuration/required-settings.md#caches) setting is used to, among other things, configure Django's built-in caching. *This is a required setting*. Here's why:
 
 Nautobot uses the [`django-redis`](https://github.com/jazzband/django-redis) Django plugin which allows it to use Redis as a backend for caching and session storage. This is used to provide a concurrent write lock for preventing race conditions when allocating IP address objects.
 
 `django-redis` *also* uses the [`CACHES`](../configuration/required-settings.md#caches) setting, in its case to simplify the configuration for establishing concurrent write locks.
 
-Again: **`CACHES` is not used for Django's built-in caching at this time, but it is still a required setting for `django-redis` to function properly.**
-
-### Django Cacheops
-
-Cacheops (aka [`django-cacheops`](https://github.com/Suor/django-cacheops)) is a Django plugin that does some very advanced caching, but *does not leverage the built-in cache framework*. Instead it uses a technique called ["monkey patching"](https://en.wikipedia.org/wiki/Monkey_patch). By monkey patching, a library can inject its own functionality into the core code behind the scenes.
-
-This technique allows Cacheops to do more advanced caching operations that are not provided by the Django built-in cache framework without requiring Nautobot to also include some elaborate code of its own. This is accomplished by intercepting calls to the underlying queryset methods that get and set cached results in Redis.
-
-For this purpose, Cacheops has its own `CACHEOPS_*` settings required to configure it that are not related to the `CACHES` setting.
-
-For more information on the required settings needed to configure Cacheops, please see the [Caching section of the required settings documentation](../configuration/required-settings.md#caching).
-
-The optional settings include:
-
-* [`CACHEOPS_DEFAULTS`](../configuration/optional-settings.md#cacheops_defaults): To define the cache timeout value (Defaults to 15 minutes)
-* [`CACHEOPS_ENABLED`](../configuration/optional-settings.md#cacheops_enabled) : To turn on/off caching (Defaults to `False`)
-
-## Invalidating Cached Data
-
-Although caching is performed automatically and rarely requires administrative intervention, Nautobot provides the `invalidate` management command to force invalidation of cached results. This command can reference a specific object my its type and UUID:
-
-> Run these commands as the Nautobot user
-
-```no-highlight
-nautobot-server invalidate dcim.Device.84ae706d-c189-4d13-a898-9737648e34b3
-```
-
-Alternatively, it can also delete all cached results for an object type:
-
-```no-highlight
-nautobot-server invalidate dcim.Device
-```
-
-Finally, calling it with the `all` argument will force invalidation of the entire cache database:
-
-```no-highlight
-nautobot-server invalidate all
-```
-
 ## High Availability Caching
 
-[Redis](https://redis.io/) provides two different methods to achieve high availability: The first is [Redis Sentinel](https://redis.io/topics/sentinel) and the second is the newer [Redis Clustering](https://redis.io/topics/cluster-tutorial) feature. Unfortunately, due to an [known issue with django-cacheops](https://github.com/Suor/django-cacheops/issues/35) (last updated November 2021) Nautobot is unable to support Redis Clustering at this time. Therefore, Nautobot only supports Redis Sentinel for high availability.
+[Redis](https://redis.io/) provides two different methods to achieve high availability: The first is [Redis Sentinel](https://redis.io/topics/sentinel) and the second is the newer [Redis Clustering](https://redis.io/topics/cluster-tutorial) feature. Currently, Nautobot only supports Redis Sentinel for high availability.
 
 ### Using Redis Sentinel
 
 The installation/configuration of the [Redis Sentinel](https://redis.io/topics/sentinel) cluster itself is outside the scope of this document, this section is intended to provide the steps necessary to configure Nautobot to connect to a Sentinel cluster.
 
-We need to configure `django-redis`, `django-cacheops`, and `celery` to use Sentinel. Each library is configured differently, so please pay close attention to the details.
+We need to configure `django-redis` and `celery` to use Sentinel. Each library is configured differently, so please pay close attention to the details.
 
 #### `django-redis` Sentinel Configuration
 
@@ -117,44 +74,6 @@ CACHES = {
 
 For more details on configuring django-redis with Redis Sentinel, please see the documentation for [Django Redis](https://github.com/jazzband/django-redis#use-the-sentinel-connection-factory).
 
-#### `django-cacheops` Sentinel Configuration
-
-Notable settings:
-
-* `locations`: List of tuples or tuple of tuples with each inner tuple containing the name or IP address
-of the Redis server and port for each sentinel instance to connect to
-* `service_name`: the master/service name in redis sentinel
-* Additional parameters may be specified in the `CACHEOPS_SENTINEL` dictionary which are passed directly to Sentinel
-
-!!! note
-    `locations` for `django-cacheops` has a different meaning than the `LOCATION` value for `django-redis`
-
-!!! warning
-    [`CACHEOPS_REDIS`](../configuration/required-settings.md#cacheops_redis) and [`CACHEOPS_SENTINEL`](../configuration/required-settings.md#cacheops_sentinel) are mutually exclusive and will result in an error if both are set.
-
-Example:
-
-```python
-CACHEOPS_REDIS = False
-CACHEOPS_SENTINEL = {
-    "db": 1,
-    "locations": [
-        ("mysentinel.redis.example.com", 26379),
-        ("othersentinel.redis.example.com", 26379),
-        ("thirdsentinel.redis.example.com", 26379)
-    ],
-    "service_name": "nautobot",
-    "socket_timeout": 10,
-    "sentinel_kwargs": {
-        "password": ""
-    },
-    "password": "",
-    # Everything else is passed to `Sentinel()`
-}
-```
-
-For more details on how to configure Cacheops to use Redis Sentinel see the documentation for [Cacheops setup](https://github.com/Suor/django-cacheops#setup).
-
 #### `celery` Sentinel Configuration
 
 !!! note

nautobot/docs/additional-features/job-scheduling-and-approvals.md

@@ -43,6 +43,9 @@ For custom interval, a `crontab` parameter must be added.
 
 Jobs that have `approval_required` set to `True` on their `Meta` object require another user to approve a scheduled job.
 
+!!! warning
+    Requiring approval for execution of Job Hooks by setting the `Meta.approval_required` attribute to `True` on your `JobHookReceiver` subclass is not supported. The value of this attribute will be ignored. Support for requiring approval of Job Hooks will be added in a future release.
+
 Scheduled jobs can be approved or denied via the UI and API by any user that has the `extras.approve_job` permission for the job in question, as well as the appropriate `extras.change_scheduledjob` and/or `extras.delete_scheduledjob` permissions.
 
 +/- 1.3.0