Commit d8bdc95a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/metric/prometheus!12
parents 3839fc58 4f1d4b34

.dockerignore

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
*

!conf

.gitlab-ci.yml

+16 −59
Original line number Diff line number Diff line 
stages:

  - check-rules

  - package

  - test-package

  - test

  - deploy



services:
@@ -11,60 +9,15 @@ 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}

  IMAGE_NAME: prom/prometheus

  IMAGE_TAG: v2.8.0



check-rules:

  stage: check-rules

  stage: test

  image: docker:stable

  script:

    - ./check-rules.sh



docker-build-commit-non-master-branches:

  stage: package

  image: docker:stable

  only:

    - branches

  except:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-commit-master-branch:

  stage: package

  image: docker:stable

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



container-scanning:

  stage: test-package

  image: docker:stable

  allow_failure: true

  only:

    - branches

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1

    - apk add -U wget ca-certificates

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}

    - wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64

    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - >

      ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log

      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]



deploy-supporting-branch-develop:

  stage: deploy

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}
@@ -74,8 +27,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}

      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}
@@ -94,8 +48,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}

      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}
@@ -112,8 +67,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}

      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}
@@ -132,8 +88,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}

      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}

Dockerfile

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
FROM prom/prometheus:v2.5.0



COPY conf /etc/prometheus/



ENTRYPOINT [ "/etc/prometheus/docker-entrypoint.sh" ]

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

deleted100644 → 0
+0 −72
Original line number Diff line number Diff line 
global:

  scrape_interval: 15s

  evaluation_interval: 15s



  external_labels:

    monitor: 'promswarm'



alerting:

  alertmanagers:

  - static_configs:

    - targets:

      - alertmanager:9093



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