Commit 117887a4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revisa servicios y redefine límites 

Actualiza parámetros de límite: renombra el de tiempo a nueva
nomenclatura y añade el de espacio ocupado.

Mueve definición de servicios a consultar a variable de entorno, en
lugar de usar el fichero de config. Añade nuevos servicios.

Corrige otros detalles menores.
parent c7c3b402

.gitlab-ci.yml

+14 −10
Original line number Diff line number Diff line 
stages:

  - check-rules

  - test

  - package

  - test-package

  - deploy
@@ -15,7 +15,7 @@ variables: 
  IMAGE_TAG: ${CI_COMMIT_SHA}



check-rules:

  stage: check-rules

  stage: test

  image: docker:stable

  script:

    - ./check-rules.sh
@@ -73,8 +73,9 @@ deploy-supporting-branch-develop: 
    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

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

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

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} JOBS=${JOBS} STORAGE_TSDB_RETENTION_TIME=${STORAGE_TSDB_RETENTION_TIME}

      STORAGE_TSDB_RETENTION_SIZE=${STORAGE_TSDB_RETENTION_SIZE}

  environment:

    name: dev

    url: https://prometheus.${DEV_PUBLIC_HOSTNAME}
@@ -93,8 +94,9 @@ deploy-stable-branch-develop: 
    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:

    - >

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

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

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} JOBS=${JOBS} STORAGE_TSDB_RETENTION_TIME=${STORAGE_TSDB_RETENTION_TIME}

      STORAGE_TSDB_RETENTION_SIZE=${STORAGE_TSDB_RETENTION_SIZE}

  environment:

    name: dev

    url: https://prometheus.${DEV_PUBLIC_HOSTNAME}
@@ -111,8 +113,9 @@ deploy-supporting-branch-production: 
    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - >

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

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

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} JOBS=${JOBS} STORAGE_TSDB_RETENTION_TIME=${STORAGE_TSDB_RETENTION_TIME}

      STORAGE_TSDB_RETENTION_SIZE=${STORAGE_TSDB_RETENTION_SIZE}

  environment:

    name: pro

    url: https://prometheus.${PRO_PUBLIC_HOSTNAME}
@@ -131,8 +134,9 @@ deploy-stable-branch-production: 
    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - >

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

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

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} JOBS=${JOBS} STORAGE_TSDB_RETENTION_TIME=${STORAGE_TSDB_RETENTION_TIME}

      STORAGE_TSDB_RETENTION_SIZE=${STORAGE_TSDB_RETENTION_SIZE}

  environment:

    name: pro

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

check-rules.sh

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ do 
	if [ -e "$f" ]

	then

		filename=$( basename "$f" )

		docker run -v $(pwd)/deploy/rules/:/tmp dnanexus/promtool:1.0 \

		docker run --rm -v $(pwd)/deploy/rules/:/tmp dnanexus/promtool:1.0 \

			check rules /tmp/${filename}

	fi

done

conf/prometheus.yml

+0 −55
Original line number Diff line number Diff line
@@ -15,58 +15,3 @@ scrape_configs: 
  - job_name: 'prometheus'

    static_configs:

      - targets: ['localhost:9090']
 


  - job_name: 'dockerd-exporter'

    dns_sd_configs:

    - names:

        - 'tasks.dockerd-exporter'

      type: 'A'

      port: 9323



  - job_name: 'cadvisor'

    dns_sd_configs:

    - names:

        - 'tasks.cadvisor'

      type: 'A'

      port: 8080



  - job_name: 'node-exporter'

    dns_sd_configs:

    - names:

        - 'tasks.node-exporter'

      type: 'A'

      port: 9100



  - job_name: 'pushgateway'

    dns_sd_configs:

    - names:

        - 'tasks.pushgateway'

      type: 'A'

      port: 9091



  - job_name: 'zookeeper'

    dns_sd_configs:

    - names:

        - 'tasks.zookeeper-1'

        - 'tasks.zookeeper-2'

        - 'tasks.zookeeper-3'

      type: 'A'

      port: 9998



  - job_name: 'kafka'

    dns_sd_configs:

    - names:

        - 'tasks.kafka-1'

        - 'tasks.kafka-2'

        - 'tasks.kafka-3'

      type: 'A'

      port: 9998



  - job_name: 'vernemq'

    scrape_interval: 5s

    scrape_timeout: 5s

    dns_sd_configs:

    - names:

        - 'tasks.vernemq'

      type: 'A'

      port: 8888

deploy/.env

+3 −2
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/actuator/prometheus

STORAGE_TSDB_RETENTION=30d
 
JOBS=dockerd-exporter:9323,cadvisor:8080,node-exporter:9100,pushgateway:9091,zookeeper-1:9998,zookeeper-2:9998,zookeeper-3:9998,kafka-1:9998,kafka-2:9998,kafka-3:9998,vernemq:8888,traefik:8080,web:3050,api:8080/api/actuator/prometheus,oauth:8081/api/oauth/actuator/prometheus,user:8082/api/user/actuator/prometheus,socket:8089/api/socket/actuator/prometheus,tasks:8088/api/tasks/actuator/prometheus,ais:8090/api/ais/actuator/prometheus,vessels-commands:8091/api/vessels/commands/actuator/prometheus,vessels-view:8092/api/vessels/view/actuator/prometheus,time-series:8096/api/time-series/view/actuator/prometheus

STORAGE_TSDB_RETENTION_TIME=30d

STORAGE_TSDB_RETENTION_SIZE=8GB

deploy/docker-compose.tmpl.yml

+3 −2
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ services: 
      - '--web.console.libraries=/etc/prometheus/console_libraries'

      - '--web.console.templates=/etc/prometheus/consoles'

      - '--storage.tsdb.path=/prometheus'

      - '--storage.tsdb.retention=${STORAGE_TSDB_RETENTION}'

      - '--storage.tsdb.retention.time=${STORAGE_TSDB_RETENTION_TIME}'

      - '--storage.tsdb.retention.size=${STORAGE_TSDB_RETENTION_SIZE}'

    user: '0:0'

    networks:

      - metric-net

deploy/rules/swarm_job.rules.yml

+1 −1

File changed.

Contains only whitespace changes.

deploy/rules/swarm_node.rules.dev.yml

+1 −1

File changed.

Contains only whitespace changes.

deploy/rules/swarm_service.rules.yml

+1 −1

File changed.

Contains only whitespace changes.