Commit d85d6bda authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Asigna url externa para alertmanager

See merge request redmic-project/metric/karma!5
parents 10cef7c4 ebc4b4ec

deploy/.env

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ ALERTMANAGER_NAME=alertmanager 
ALERTMANAGER_INTERVAL=30s

ALERTMANAGER_TIMEOUT=10s

ALERTMANAGER_PROXY=true

ALERTMANAGER_SUBDOMAIN=alertmanager

deploy/docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ services: 
      UI_REFRESH:

      UI_THEME:

      ALERTMANAGER_URI:

      ALERTMANAGER_EXTERNAL_URI: https://${ALERTMANAGER_SUBDOMAIN}.${PUBLIC_HOSTNAME}

      ALERTMANAGER_NAME:

      ALERTMANAGER_INTERVAL:

      ALERTMANAGER_TIMEOUT: