Closes #3408: Remove WEBHOOKS_ENABLE configuration setting

netbox/extras/__init__.py

@@ -1,15 +1 @@
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
-
 default_app_config = 'extras.apps.ExtrasConfig'
-
-# check that django-rq is installed and we can connect to redis
-if settings.WEBHOOKS_ENABLED:
-    try:
-        import django_rq
-    except ImportError:
-        raise ImproperlyConfigured(
-            "django-rq is not installed! You must install this package per "
-            "the documentation to use the webhook backend."
-        )

netbox/extras/apps.py

@@ -1,6 +1,7 @@
 from django.apps import AppConfig
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
+import redis
 
 
 class ExtrasConfig(AppConfig):
@@ -10,26 +11,18 @@ class ExtrasConfig(AppConfig):
 
         import extras.signals
 
-        # Check that we can connect to the configured Redis database if webhooks are enabled.
-        if settings.WEBHOOKS_ENABLED:
-            try:
-                import redis
-            except ImportError:
-                raise ImproperlyConfigured(
-                    "WEBHOOKS_ENABLED is True but the redis Python package is not installed. (Try 'pip install "
-                    "redis'.)"
-                )
-            try:
-                rs = redis.Redis(
-                    host=settings.WEBHOOKS_REDIS_HOST,
-                    port=settings.WEBHOOKS_REDIS_PORT,
-                    db=settings.WEBHOOKS_REDIS_DATABASE,
-                    password=settings.WEBHOOKS_REDIS_PASSWORD or None,
-                    ssl=settings.WEBHOOKS_REDIS_SSL,
-                )
-                rs.ping()
-            except redis.exceptions.ConnectionError:
-                raise ImproperlyConfigured(
-                    "Unable to connect to the Redis database. Check that the Redis configuration has been defined in "
-                    "configuration.py."
-                )
+        # Check that we can connect to the configured Redis database.
+        try:
+            rs = redis.Redis(
+                host=settings.WEBHOOKS_REDIS_HOST,
+                port=settings.WEBHOOKS_REDIS_PORT,
+                db=settings.WEBHOOKS_REDIS_DATABASE,
+                password=settings.WEBHOOKS_REDIS_PASSWORD or None,
+                ssl=settings.WEBHOOKS_REDIS_SSL,
+            )
+            rs.ping()
+        except redis.exceptions.ConnectionError:
+            raise ImproperlyConfigured(
+                "Unable to connect to the Redis database. Check that the Redis configuration has been defined in "
+                "configuration.py."
+            )

netbox/extras/webhooks.py

@@ -14,7 +14,7 @@ def enqueue_webhooks(instance, user, request_id, action):
     Find Webhook(s) assigned to this instance + action and enqueue them
     to be processed
     """
-    if not settings.WEBHOOKS_ENABLED or instance._meta.label.lower() not in WEBHOOK_MODELS:
+    if instance._meta.label.lower() not in WEBHOOK_MODELS:
         return
 
     # Retrieve any applicable Webhooks