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

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/metric/alertmanager!7
parents 82949890 02739b9d

deploy/.env

+11 −1
Original line number Diff line number Diff line
@@ -15,4 +15,14 @@ TRAEFIK_SUBDOMAIN=alertmanager 
PUBLIC_HOSTNAME=change.me

TRAEFIK_AUTH=user:$apr1$md5password



ALERTMANAGER_VOL_NAME=alertmanager-vol
 
DATA_VOL_NAME=alertmanager-vol



DEV_VOL_DRIVER=local

VOL_TYPE=nfs

VOL_ADDR=127.0.0.1

VOL_VERS=4.2

VOL_OPTS=nolock,noacl,noatime,nodiratime

DATA_VOL_DEVICE=/alertmanager-vol/



PRO_VOL_DRIVER=cloudstor:aws

VOL_BACKING=shared

deploy/compose.dev.yaml

+6 −6
Original line number Diff line number Diff line 
volumes:

  alertmanager-vol:

    name: ${ALERTMANAGER_VOL_NAME}

    driver: local

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: ${DEV_VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

      o: addr=${VOL_ADDR:-127.0.0.1},${VOL_OPTS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${ALERTMANAGER_VOL_DEVICE:-:/alertmanager-vol/}
 
      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},vers=${VOL_VERS},${VOL_OPTS}

      device: :${VOL_DEVICE_PREFIX}${DATA_VOL_DEVICE}

deploy/compose.prod.yaml

+4 −4
Original line number Diff line number Diff line 
volumes:

  alertmanager-vol:

    name: ${ALERTMANAGER_VOL_NAME}

    driver: 'cloudstor:aws'

  data-vol:

    name: ${DATA_VOL_NAME}

    driver: ${PRO_VOL_DRIVER}

    driver_opts:

      backing: shared
 
      backing: ${VOL_BACKING}

deploy/compose.tmpl.yaml

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ services: 
      metric-net:

      traefik-net:

    volumes:

      - alertmanager-vol:${DATA_PATH}

      - data-vol:${DATA_PATH}

    configs:

      - source: entrypoint-config

        target: ${CONFIG_PATH}/entrypoint.sh
@@ -27,12 +27,11 @@ services: 
      - source: alertmanager-config

        target: ${CONFIG_PATH}/alertmanager-tmpl.yml

    healthcheck:

      test: wget --spider -q http://localhost:${PORT}/-/healthy

      test: wget --spider -q http://127.0.0.1:${PORT}/-/healthy

      interval: ${HEALTHCHECK_INTERVAL:-1m}

      timeout: ${HEALTHCHECK_TIMEOUT:-15s}

      retries: ${HEALTHCHECK_RETRIES:-10}

      start_period: ${HEALTHCHECK_START_PERIOD:-1m}

      disable: ${HEALTHCHECK_DISABLE:-false}

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

deploy/config/entrypoint.sh

+0 −2
Original line number Diff line number Diff line
@@ -4,10 +4,8 @@ cat ${CONFIG_PATH}/alertmanager-tmpl.yml \ 
	| sed "s@\${SLACK_URL}@${SLACK_URL}@g" \

	| sed "s@\${SLACK_CHANNEL}@${SLACK_CHANNEL}@g" \

	| sed "s@\${SLACK_USER}@${SLACK_USER}@g" \

	| sed "s@\${SLACK_TEXT_TEMPLATE}@${SLACK_TEXT_TEMPLATE}@g" \

	| sed "s@\${TELEGRAM_CHAT_ID}@${TELEGRAM_CHAT_ID}@g" \

	| sed "s@\${TELEGRAM_BOT_TOKEN}@${TELEGRAM_BOT_TOKEN}@g" \

	| sed "s@\${TELEGRAM_MESSAGE_TEMPLATE}@${TELEGRAM_MESSAGE_TEMPLATE}@g" \

	| sed "s@\${TELEGRAM_PARSE_MODE}@${TELEGRAM_PARSE_MODE}@g" \

	| sed "s@\${TELEGRAM_DISABLE_NOTIFICATIONS}@${TELEGRAM_DISABLE_NOTIFICATIONS}@g" \

	> ${CONFIG_PATH}/alertmanager.yml