Commit 28e83060 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Añade salto de línea

See merge request redmic-project/metric/prometheus!6
parents 8a2a9643 3ac402a7

.gitlab-ci.yml

+23 −42
Original line number Diff line number Diff line 
image: docker:stable



stages:

  - check-rules

  - package

  - test-package

  - deploy



image: docker:stable



services:

  - docker:dind



variables:

  DOCKER_DRIVER: overlay2

  STACK: metric

  SERVICES_TO_CHECK: metric_prometheus

  STATUS_CHECK_DELAY: 60

  IMAGE_NAME: ${CI_REGISTRY_IMAGE}

  IMAGE_TAG: ${CI_COMMIT_SHA}



check-rules:

  stage: check-rules
@@ -63,16 +68,10 @@ deploy-supporting-branch-develop: 
  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - create-nets.sh metric-net

    - >

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

      UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
@@ -85,55 +84,43 @@ deploy-supporting-branch-develop: 
    - master

  when: manual



deploy-supporting-branch-production:

deploy-stable-branch-develop:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    SSH_REMOTE: ${DEV_SSH_REMOTE}

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

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - create-nets.sh metric-net

    - >

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

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

  environment:

    name: pro

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

    name: dev

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

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-develop:

deploy-supporting-branch-production:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    SSH_REMOTE: ${PRO_SSH_REMOTE}

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

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - create-nets.sh metric-net

    - >

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

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

  environment:

    name: dev

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

    name: pro

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

  only:

    - branches

  except:

    - master

  when: manual
@@ -142,16 +129,10 @@ deploy-stable-branch-production: 
  image: registry.gitlab.com/redmic-project/docker/docker-deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - create-nets.sh metric-net

    - >

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

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

conf/prometheus.yml

+18 −18
Original line number Diff line number Diff line
@@ -23,24 +23,6 @@ scrape_configs: 
      type: 'A'

      port: 9323



  - job_name: 'kafka'

    dns_sd_configs:

    - names:

        - 'confluent_kf-1'

        - 'confluent_kf-2'

        - 'confluent_kf-3'

      type: 'A'

      port: 9998



  - job_name: 'zookeeper'

    dns_sd_configs:

    - names:

        - 'confluent_zk-1'

        - 'confluent_zk-2'

        - 'confluent_zk-3'

      type: 'A'

      port: 9998



  - job_name: 'cadvisor'

    dns_sd_configs:

    - names:
@@ -61,3 +43,21 @@ scrape_configs: 
        - 'tasks.pushgateway'

      type: 'A'

      port: 9091



  - job_name: 'zookeeper'

    dns_sd_configs:

    - names:

        - 'confluent_zookeeper-1'

        - 'confluent_zookeeper-2'

        - 'confluent_zookeeper-3'

      type: 'A'

      port: 9998



  - job_name: 'kafka'

    dns_sd_configs:

    - names:

        - 'confluent_kafka-1'

        - 'confluent_kafka-2'

        - 'confluent_kafka-3'

      type: 'A'

      port: 9998

deploy/.env

+1 −0
Original line number Diff line number Diff line 
JOBS=api:8080/api/actuator/prometheus,oauth:8081/api/oauth/actuator/prometheus,user:8082/api/user/actuator/prometheus,vessels-commands:8091/api/vessels/commands/actuator/prometheus,vessels-view:8092/api/vessels/view/actuator/prometheus,web:3050/metrics,socket:8089/api/socket/actuator/prometheus,tasks:8088/api/tasks/actuator/prometheus,ais:8090/api/ais/actuactor/prometheus

STORAGE_TSDB_RETENTION=30d

deploy/docker-compose.dev.yml

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


volumes:

  prometheus:

    name: prometheus-vol
 
    name: ${PROMETHEUS_VOL_NAME:-prometheus-vol}

deploy/docker-compose.prod.yml

+4 −4
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ services: 


volumes:

  prometheus:

    name: prometheus-vol

    driver: "cloudstor:aws"

    name: ${PROMETHEUS_VOL_NAME:-prometheus-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: 10

      ebstype: gp2
 
      size: ${PROMETHEUS_VOL_SIZE:-10}

      ebstype: ${PROMETHEUS_VOL_EBS_TYPE:-gp2}