Try using Redis for AMQP
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Luke Murphy 2021-01-11 19:59:25 +01:00
parent edf8fbf78a
commit 10366a3863
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
4 changed files with 15 additions and 4 deletions

View File

@ -5,3 +5,5 @@ RUN /venv/bin/pip install dnspython==2.1.0
RUN /venv/bin/pip install "git+https://github.com/alerta/alerta-contrib.git@856a900528711eca05ccc3586ffd1106e4d091e3#subdirectory=integrations/mailer"
RUN /venv/bin/pip install "git+https://github.com/alerta/alerta-contrib.git@856a900528711eca05ccc3586ffd1106e4d091e3#subdirectory=plugins/rocketchat"
RUN /venv/bin/pip install redis==3.5.3

View File

@ -8,7 +8,7 @@ timezone = Europe/London
[alerta-mailer]
amqp_topic = notify
amqp_url = mongodb://{{ env "DB_HOST" }}/{{ env "DB_NAME" }}
amqp_url = redis://{{ env "QUEUE_HOST" }}/
config_file = /app/alerta.conf
dashboard_url = https://{{ env "DOMAIN" }}
debug = {{ env "DEBUG" }}

View File

@ -48,7 +48,7 @@ PLUGINS = [
"rocketchat",
]
AMQP_URL = "mongodb://{{ env "DB_HOST" }}/{{ env "DB_NAME" }}"
AMQP_URL = "redis://{{ env "QUEUE_HOST" }}"
AMQP_TOPIC = "notify"
ROCKETCHAT_WEBHOOK_URL = "{{ secret "rocket_chat_webhook_url" }}"

View File

@ -21,6 +21,8 @@ x-secrets: &default-secrets
x-environment: &default-env
- ADMIN_USERS=${ADMIN_USERS}
- DB_HOST=db:27017
- DB_NAME=alerta
- DEBUG=${DEBUG}
- DOMAIN=${DOMAIN}
- KEYCLOAK_REALM=${KEYCLOAK_REALM}
@ -28,9 +30,8 @@ x-environment: &default-env
- KEYCLOAK_URL=${KEYCLOAK_URL}
- MAIL_FROM=${MAIL_FROM}
- MAIL_TO=${MAIL_TO}
- DB_HOST=db:27017
- DB_NAME=alerta
- OAUTH2_CLIENT_ID=${OAUTH2_CLIENT_ID}
- QUEUE_HOST=queue:6379
- ROCKET_CHAT_ALERTA_USERNAME=${ROCKET_CHAT_ALERTA_USERNAME}
- ROCKET_CHAT_CHANNEL=${ROCKET_CHAT_CHANNEL}
- ROCKET_CHAT_ICON_EMOJI=${ROCKET_CHAT_ICON_EMOJI}
@ -74,6 +75,13 @@ services:
networks:
- internal
queue:
image: "redis:6"
volumes:
- "redis:/data"
networks:
- internal
networks:
internal:
proxy:
@ -81,6 +89,7 @@ networks:
volumes:
mongodb:
redis:
configs:
config_json: