Commit 15b0020e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza y corrige reglas de alerta

See merge request redmic-project/metric/prometheus!2
parents c5bf2064 09c45737

.dockerignore

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

!conf

.gitignore

0 → 100644
+0 −0

Empty file added.

.gitlab-ci.yml

+38 −16
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ docker-build-commit-non-master-branches: 
    - 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

  only:
@@ -59,17 +58,16 @@ container-scanning: 
  artifacts:

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



deploy-dev:

deploy-supporting-branch-develop:

  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

    SERVICE: prometheus

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    DEPLOY_DIR_NAME: deploy

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

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
@@ -82,21 +80,49 @@ deploy-dev: 
    name: dev

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

  only:

    - dev

    - branches

  except:

    - master

  when: manual



deploy-supporting-branch:

deploy-supporting-branch-production:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    SERVICE: prometheus

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    DEPLOY_DIR_NAME: deploy

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.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: pro

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

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-develop:

  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.prod.yml

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:
@@ -108,23 +134,19 @@ deploy-supporting-branch: 
    name: dev

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

  only:

    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:

deploy-stable-branch-production:

  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

    SERVICE: prometheus

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    DEPLOY_DIR_NAME: deploy

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

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
@@ -135,7 +157,7 @@ deploy-pro: 
      UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

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

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

  only:

    - master

  when: manual

Dockerfile

+1 −5
Original line number Diff line number Diff line 
FROM prom/prometheus

FROM prom/prometheus:v2.5.0



COPY conf /etc/prometheus/



ENTRYPOINT [ "/etc/prometheus/docker-entrypoint.sh" ]
 
CMD        [ "--config.file=/etc/prometheus/prometheus.yml", \

             "--storage.tsdb.path=/prometheus", \

             "--web.console.libraries=/etc/prometheus/console_libraries", \

             "--web.console.templates=/etc/prometheus/consoles" ]

conf/docker-entrypoint.sh

+26 −28
Original line number Diff line number Diff line
@@ -2,11 +2,9 @@ 


cat /etc/prometheus/prometheus.yml > /tmp/prometheus.yml



#JOBS=mongo-exporter:9111 redis-exporter:9112



if [ ${JOBS+x} ]; then



for job in $JOBS

if [ ${JOBS+x} ]

then

	for job in $(echo "${JOBS}" | tr ',' ' ')

	do

		echo "adding job $job"
@@ -26,11 +24,11 @@ cat >>/tmp/prometheus.yml <<EOF 
      type: 'A'

      port: ${PORT}

EOF



	done



fi



if ls /etc/prometheus/*.rules.yml > /dev/null 2> /dev/null

then

	echo "Adding rules file"

	echo "rule_files:" >> /tmp/prometheus.yml
@@ -39,14 +37,14 @@ do 
		if [ -e "${f}" ]

		then

			filename=$( basename "${f}" )

    echo "- ${filename}"

			echo "adding rules ${filename}"

			echo '  - "'${filename}'"' >> /tmp/prometheus.yml

		fi

	done

fi



mv /tmp/prometheus.yml /etc/prometheus/prometheus.yml



set -- /bin/prometheus "$@"



exec "$@"