changes

docker-compose.yml

@@ -25,13 +25,14 @@ services:
       - AUTH_TYPE=scram-sha-256
       - POOL_MODE=transaction
       - ADMIN_USERS=postgres,dbuser
-  redis:
-    image: redis:latest
-    command: --appendonly no --save ""
+  rabbitmq:
+    image: rabbitmq:3-management-alpine
     restart: always
+    volumes:
+      - mq_data:/var/lib/rabbitmq/
     healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
-      interval: 5s
+      test: rabbitmq-diagnostics -q ping
+      interval: 30s
       timeout: 60s
       retries: 5
   web:
@@ -41,8 +42,7 @@ services:
     command: /webserver-entrypoint.sh
     environment:
       POSTGRES_HOST: pgbouncer
-      CELERY_BROKER_URL: 'redis://redis:6379/0'
-      CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
+      CELERY_BROKER_URL: 'amqp://guest:guest@rabbitmq:5672'
     ports:
       - "8000:8000"
     depends_on:
@@ -56,8 +56,7 @@ services:
       - db
       - redis
     environment:
-      CELERY_BROKER_URL: 'redis://redis:6379/0'
-      CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
+      CELERY_BROKER_URL: 'amqp://guest:guest@rabbitmq:5672'
       POSTGRES_HOST: pgbouncer
 
   report_worker:
@@ -68,8 +67,7 @@ services:
       - db
       - redis
     environment:
-      CELERY_BROKER_URL: 'redis://redis:6379/0'
-      CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
+      CELERY_BROKER_URL: 'amqp://guest:guest@rabbitmq:5672'
       POSTGRES_HOST: pgbouncer
 
   job_worker:
@@ -81,12 +79,12 @@ services:
       - db
       - redis
     environment:
-      CELERY_BROKER_URL: 'redis://redis:6379/0'
-      CELERY_RESULT_BACKEND: 'redis://redis:6379/0'
+      CELERY_BROKER_URL: 'amqp://guest:guest@rabbitmq:5672'
       POSTGRES_HOST: pgbouncer
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /home/.monitorizer:/home/.monitorizer:shared
 
 volumes:
   db_data:
+  mq_data:

monitorizer/server/settings.py

@@ -194,9 +194,8 @@
 CELERY_ENABLE_UTC = True
 CELERY_TASK_TRACK_STARTED = True
 CELERY_TASK_TIME_LIMIT = 30 * 60
-CELERY_BROKER_URL = os.environ.get("CELERY_BROKER_URL", "redis://localhost:6379/0")
-CELERY_RESULT_BACKEND = os.environ.get(
-    "CELERY_RESULT_BACKEND", "redis://localhost:6379/0"
+CELERY_BROKER_URL = os.environ.get(
+    "CELERY_BROKER_URL", "amqp://guest:[email protected]:5672"
 )
 CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True
 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"

pyproject.toml

@@ -8,7 +8,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.11"
 django = "^5.0.3"
-celery = {extras = ["redis"], version = "^5.3.6"}
+celery = {extras = ["amqp"], version = "^5.4.0"}
 django-unfold = "^0.21.1"
 django-celery-beat = "^2.6.0"
 django-import-export = "^3.3.7"