diff --git a/core/common/apps.py b/core/common/apps.py index acd02dd6d..a5bbdfdeb 100644 --- a/core/common/apps.py +++ b/core/common/apps.py @@ -12,6 +12,7 @@ def ready(self): plugin_dir.register(healthcheck.ESHealthCheck) plugin_dir.register(healthcheck.FlowerHealthCheck) plugin_dir.register(healthcheck.CeleryDefaultQueueHealthCheck) + plugin_dir.register(healthcheck.CeleryIndexingQueueHealthCheck) plugin_dir.register(healthcheck.CeleryConcurrentThreadsHealthCheck) plugin_dir.register(healthcheck.CeleryBulkImport0QueueHealthCheck) plugin_dir.register(healthcheck.CeleryBulkImport1QueueHealthCheck) diff --git a/core/common/healthcheck/healthcheck.py b/core/common/healthcheck/healthcheck.py index bc01119f2..3225f15c7 100644 --- a/core/common/healthcheck/healthcheck.py +++ b/core/common/healthcheck/healthcheck.py @@ -127,6 +127,10 @@ class CeleryConcurrentThreadsHealthCheck(CeleryQueueHealthCheck): queues = {'concurrent'} +class CeleryIndexingQueueHealthCheck(CeleryQueueHealthCheck): + queues = {'indexing'} + + class CeleryBulkImport0QueueHealthCheck(CeleryQueueHealthCheck): queues = {'bulk_import_0'} diff --git a/core/common/healthcheck/urls.py b/core/common/healthcheck/urls.py index 20d5fdb80..33178e3e0 100644 --- a/core/common/healthcheck/urls.py +++ b/core/common/healthcheck/urls.py @@ -14,6 +14,10 @@ 'celery@default/', views.CeleryDefaultHealthCheckView.as_view(), name='celery-default-healthcheck' ), + path( + 'celery@indexing/', views.CeleryIndexingHealthCheckView.as_view(), + name='celery-indexing-healthcheck' + ), path( 'celery@concurrent/', views.CeleryConcurrentThreadsHealthCheckView.as_view(), name='celery-concurrent-healthcheck' diff --git a/core/common/healthcheck/views.py b/core/common/healthcheck/views.py index 8aaaf5dfe..738af6662 100644 --- a/core/common/healthcheck/views.py +++ b/core/common/healthcheck/views.py @@ -5,7 +5,7 @@ from core.common.healthcheck.healthcheck import FlowerHealthCheck, CeleryDefaultQueueHealthCheck, \ CeleryBulkImport0QueueHealthCheck, CeleryBulkImportRootQueueHealthCheck, CeleryBulkImport3QueueHealthCheck, \ CeleryBulkImport2QueueHealthCheck, CeleryBulkImport1QueueHealthCheck, CeleryConcurrentThreadsHealthCheck, \ - ESHealthCheck + ESHealthCheck, CeleryIndexingQueueHealthCheck class BaseHealthcheckView(MainView): @@ -38,6 +38,7 @@ class DBHealthcheckView(BaseHealthcheckView): class CeleryHealthCheckView(BaseHealthcheckView): _plugins = [ CeleryDefaultQueueHealthCheck(critical_service=True), + CeleryIndexingQueueHealthCheck(critical_service=True), CeleryConcurrentThreadsHealthCheck(), CeleryBulkImport0QueueHealthCheck(), CeleryBulkImport1QueueHealthCheck(), @@ -51,6 +52,10 @@ class CeleryDefaultHealthCheckView(BaseHealthcheckView): _plugins = [CeleryDefaultQueueHealthCheck(critical_service=True)] +class CeleryIndexingHealthCheckView(BaseHealthcheckView): + _plugins = [CeleryIndexingQueueHealthCheck(critical_service=True)] + + class CeleryBulkImport0HealthCheckView(BaseHealthcheckView): _plugins = [CeleryBulkImport0QueueHealthCheck(critical_service=True)]