Commit 893d6cb7 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Elimina servicios de métricas y mejora Traefik 

Prometheus y Grafana ahora forman parte de su propio stack de métricas,
por lo que no tiene sentido mantenerlos aquí.
Se limitan recursos de Traefik y se prepara su versión para el server
de desarrollo.
parent c13c01d1

.gitlab-ci.yml

+12 −69
Original line number Diff line number Diff line
@@ -108,46 +108,6 @@ deploy-gitlab-runner-remote: 
    - dev

  when: manual



deploy-grafana-dev:

  stage: deploy

  variables:

    DOCKER_DRIVER: overlay2

    DEPLOY_DIR_NAME: grafana

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: grafana

    IMAGE_TAG: latest

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

  environment:

    name: dev/${SERVICE}

    url: https://${SERVICE}.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

  when: manual



deploy-grafana-pro:

  stage: deploy

  variables:

    DOCKER_DRIVER: overlay2

    DEPLOY_DIR_NAME: grafana

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SERVICE: grafana

    IMAGE_TAG: latest

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME}

  environment:

    name: pro/${SERVICE}

    url: https://${SERVICE}.${PRO_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual



deploy-mail-server-dev:

  stage: deploy

  variables:
@@ -300,47 +260,30 @@ deploy-portainer-pro: 
    - master

  when: manual



deploy-prometheus-dev:

deploy-traefik-dev:

  stage: deploy

  variables:

    DOCKER_DRIVER: overlay2

    DEPLOY_DIR_NAME: prometheus

    DEPLOY_DIR_NAME: traefik

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SERVICE: prometheus

    STACK: traefik

    SERVICES_TO_CHECK: traefik_traefik

    IMAGE_TAG: latest

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

    - create-nets.sh redmic-net traefik-net

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH}

  environment:

    name: dev/${SERVICE}

    url: https://${SERVICE}.${DEV_PUBLIC_HOSTNAME}

    name: dev/traefik

    url: https://traefik.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

  when: manual



deploy-prometheus-pro:

  stage: deploy

  variables:

    DOCKER_DRIVER: overlay2

    DEPLOY_DIR_NAME: prometheus

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: prometheus

    SERVICES_TO_CHECK: prometheus_prometheus

    IMAGE_TAG: latest

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  services:

    - docker:dind

  script:

    - deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME}

  environment:

    name: pro/${SERVICE}

    url: https://${SERVICE}.${PRO_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual



deploy-traefik-pro:

  stage: deploy

  variables:
@@ -361,8 +304,8 @@ deploy-traefik-pro: 
      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PRO_PUBLIC_HOSTNAME}

      UI_AUTH=${UI_AUTH}

  environment:

    name: pro/${SERVICE}

    url: https://${SERVICE}.${PRO_PUBLIC_HOSTNAME}

    name: pro/traefik

    url: https://traefik.${PRO_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual

README.md

+0 −2
Original line number Diff line number Diff line
@@ -6,12 +6,10 @@ 
* GitLab-CE

* GitLab Runner local

* GitLab Runner remote

* Grafana

* Mail admin

* Mail client

* Mail server

* Minio

* PGAdmin

* Portainer

* Prometheus

* Traefik

grafana/.env

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
GRAFANA_PORT=18004

grafana/docker-compose.dev.yml

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
version: '3.5'



services:

  grafana:

    container_name: grafana

    restart: on-failure:3

    ports:

      - ${GRAFANA_PORT}:3000



volumes:

  grafana-vol:

    name: grafana-vol

grafana/docker-compose.prod.yml

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
version: '3.5'



services:

  grafana:

    networks:

      - traefik-net

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "3000"

        traefik.docker.network: traefik-net

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

        traefik.backend: grafana

      placement:

        constraints:

          - node.role == manager

      restart_policy:

        condition: on-failure

        max_attempts: 3



networks:

  traefik-net:

    external: true



volumes:

  grafana-vol:

    name: grafana-vol

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2