Commit 27036a1a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza detalles de deploy

See merge request redmic-project/metric/swarmprom-ci!20
parents 13df9b8c 628fb898

.gitlab-ci.yml

+2 −12
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ variables: 
  STATUS_CHECK_DELAY: 60

  STACK: metric

  SERVICES_TO_CHECK: metric_dockerd-exporter metric_cadvisor metric_grafana metric_alertmanager metric_unsee metric_node-exporter metric_pushgateway

  SLACK_URL: ${SLACK_URL}

  SLACK_USER: ${SLACK_USER}



deploy-supporting-branch-develop:

  stage: deploy
@@ -24,11 +26,8 @@ deploy-supporting-branch-develop: 
    DOCKER_GWBRIDGE_IP: ${DEV_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    SLACK_URL: ${SLACK_URL}

    SLACK_CHANNEL: ${DEV_SLACK_CHANNEL}

    SLACK_USER: ${SLACK_USER}

  script:

    - create-nets.sh metric-net

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}

      DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -51,11 +50,8 @@ deploy-stable-branch-develop: 
    DOCKER_GWBRIDGE_IP: ${DEV_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    SLACK_URL: ${SLACK_URL}

    SLACK_CHANNEL: ${DEV_SLACK_CHANNEL}

    SLACK_USER: ${SLACK_USER}

  script:

    - create-nets.sh metric-net

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}

      DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -76,11 +72,8 @@ deploy-supporting-branch-production: 
    DOCKER_GWBRIDGE_IP: ${PRO_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    SLACK_URL: ${SLACK_URL}

    SLACK_CHANNEL: ${PRO_SLACK_CHANNEL}

    SLACK_USER: ${SLACK_USER}

  script:

    - create-nets.sh metric-net

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}

      DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -103,11 +96,8 @@ deploy-stable-branch-production: 
    DOCKER_GWBRIDGE_IP: ${PRO_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    SLACK_URL: ${SLACK_URL}

    SLACK_CHANNEL: ${PRO_SLACK_CHANNEL}

    SLACK_USER: ${SLACK_USER}

  script:

    - create-nets.sh metric-net

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}

      DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ version: '3.5' 


volumes:

  grafana:

    name: grafana-vol
 
    name: ${GRAFANA_VOL_NAME:-grafana-vol}

docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ services: 


volumes:

  grafana:

    name: grafana-vol

    driver: "cloudstor:aws"

    name: ${GRAFANA_VOL_NAME:-grafana-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: 1

docker-compose.tmpl.yml

+31 −32
Original line number Diff line number Diff line
@@ -15,14 +15,14 @@ services: 
    deploy:

      mode: global

      restart_policy:

        delay: 1m

        window: 3m

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 128M

        reservations:

          memory: 64M

          memory: 16M



  cadvisor:

    image: google/cadvisor
@@ -44,11 +44,11 @@ services: 
    deploy:

      mode: global

      restart_policy:

        delay: 1m

        window: 3m

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          cpus: '1'

          memory: 256M

        reservations:

          memory: 64M
@@ -76,16 +76,15 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:grafana.${PUBLIC_HOSTNAME}

        traefik.backend: grafana

        traefik.port: "3000"

        traefik.port: '3000'

      restart_policy:

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          cpus: '1'

          memory: 128M

        reservations:

          memory: 64M
@@ -108,23 +107,22 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.docker.network: traefik-net

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:alertmanager.${PUBLIC_HOSTNAME}

        traefik.backend: alertmanager

        traefik.port: "9093"

        traefik.port: '9093'

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        delay: 1m

        window: 3m

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 128M

        reservations:

          memory: 64M

          memory: 32M



  unsee:

    image: cloudflare/unsee:v0.8.0
@@ -132,25 +130,24 @@ services: 
      - metric-net

      - traefik-net

    environment:

      - "ALERTMANAGER_URIS=default:http://alertmanager:9093"

      - ALERTMANAGER_URIS=default:http://alertmanager:9093

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.docker.network: traefik-net

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:unsee.${PUBLIC_HOSTNAME}

        traefik.backend: unsee

        traefik.port: "8080"

        traefik.port: '8080'

      restart_policy:

        delay: 1m

        window: 3m

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 128M

        reservations:

          memory: 64M

          memory: 32M



  node-exporter:

    image: stefanprodan/swarmprom-node-exporter:v0.16.0
@@ -172,14 +169,14 @@ services: 
    deploy:

      mode: global

      restart_policy:

        delay: 1m

        window: 3m

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 128M

        reservations:

          memory: 64M

          memory: 32M



  pushgateway:

    image: prom/pushgateway
@@ -194,38 +191,40 @@ services: 
      mode: replicated

      replicas: 1

      labels:

        traefik.docker.network: traefik-net

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:pushgateway.${PUBLIC_HOSTNAME}

        traefik.backend: pushgateway

        traefik.port: "9091"

        traefik.port: '9091'

      restart_policy:

        delay: 1m

        window: 3m

        delay: 30s

        window: 1m

      resources:

        limits:

          cpus: '0.5'

          memory: 128M

        reservations:

          memory: 64M

        reservations:

          memory: 16M



networks:

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true



volumes:

  pushgateway:

    name: pushgateway-vol

    name: ${PUSHGATEWAY_VOL_NAME:-pushgateway-vol}



  alertmanager:

    name: alertmanager-vol

    name: ${ALERTMANAGER_VOL_NAME:-alertmanager-vol}



  dockerd-exporter:

    name: dockerd-exporter-vol

    name: ${DOCKERD_EXPORTER_VOL_NAME:-dockerd-exporter-vol}



configs:

  dockerd_config:

    name: ${DOCKERD_CONFIG_NAME:-dockerd_config}

    file: ./swarmprom/dockerd-exporter/Caddyfile