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

Merge branch 'dev' into 'master' 

Aumenta memoria, actualiza ficheros compose y ci

See merge request redmic-project/metric/alertmanager!6
parents 6d70df01 261a7d92

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy

deploy/.env

+2 −0
Original line number Diff line number Diff line 
CONFIG_PATH=/etc/alertmanager

DATA_PATH=/alertmanager

PORT=9093



SLACK_URL=https://hooks.slack.com/services/TOKEN

SLACK_CHANNEL=#general
@@ -7,6 +8,7 @@ SLACK_USER=alertmanager 


TELEGRAM_BOT_TOKEN=changeme

TELEGRAM_CHAT_ID=123

TELEGRAM_PARSE_MODE=

TELEGRAM_DISABLE_NOTIFICATIONS=false



TRAEFIK_SUBDOMAIN=alertmanager

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.9'



volumes:

  alertmanager-vol:

    name: ${ALERTMANAGER_VOL_NAME}

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

+0 −2
Original line number Diff line number Diff line 
version: '3.9'



volumes:

  alertmanager-vol:

    name: ${ALERTMANAGER_VOL_NAME}

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+11 −5
Original line number Diff line number Diff line 
version: '3.9'



services:

  alertmanager:

    image: ${IMAGE_NAME:-prom/alertmanager}:${IMAGE_TAG:-latest}
@@ -15,6 +13,7 @@ services: 
      SLACK_USER:

      TELEGRAM_BOT_TOKEN:

      TELEGRAM_CHAT_ID:

      TELEGRAM_PARSE_MODE:

      TELEGRAM_DISABLE_NOTIFICATIONS:

    networks:

      metric-net:
@@ -27,6 +26,13 @@ services: 
        mode: 0555

      - source: alertmanager-config

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

    healthcheck:

      test: wget --spider -q http://localhost:${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}
@@ -40,14 +46,14 @@ services: 
        traefik.http.routers.alertmanager.rule: Host(`${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)

        traefik.http.middlewares.alertmanager-auth.basicauth.users: ${TRAEFIK_AUTH}

        traefik.http.routers.alertmanager.middlewares: alertmanager-auth

        traefik.http.services.alertmanager.loadbalancer.server.port: ${PORT:-9093}

        traefik.http.services.alertmanager.loadbalancer.server.port: ${PORT}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-32M}

          memory: ${RESOURCES_LIMITS_MEMORY:-64M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-16M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-32M}



networks:

  metric-net: