Commit 4fd73982 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza definición CI/CD y config de deploy

See merge request redmic-project/metric/grafana!2
parents 1e2059c9 8145b0df

.gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ stages: 
  - deploy



variables:

  STACK: metric

  DD_IMAGE_NAME: grafana/grafana

  PROJECT_PARENT_NAME: metric



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

  environment:

    url: https://${CI_PROJECT_NAME}.${PUBLIC_HOSTNAME}

deploy/docker-compose.dev.yml

+7 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  grafana:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}



volumes:

  data-vol:

    name: ${DATA_VOL_NAME}

deploy/docker-compose.tmpl.yml

+3 −1
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ services: 
  grafana:

    image: ${IMAGE_NAME:-grafana/grafana}:${IMAGE_TAG:-latest}

    environment:

      GF_SERVER_ROOT_URL: ${TRAEFIK_PROTOCOL}://${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}

      GF_PATHS_DATA:

      GF_PATHS_PROVISIONING:

      GF_INSTALL_PLUGINS:

      GF_SERVER_ROOT_URL: ${TRAEFIK_PROTOCOL}://${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}

      GF_SERVER_HTTP_PORT:

      GF_SERVER_ENABLE_GZIP:

      GF_SECURITY_ADMIN_USER:
@@ -84,10 +84,12 @@ services: 
networks:

  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true



configs:

README.md

+1 −1

File changed.

Contains only whitespace changes.