Commit 5dd6eade authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Revert "Intercambia volumen nfs por seaweedfs"

Closes #3

See merge request redmic-project/metric/prometheus!34
parents d26a020e 6aba0f04

check-rules.sh

+20 −5
Original line number Diff line number Diff line 
#!/bin/sh



for f in $(pwd)/deploy/rules/*.rules.yml

rulesPath=${PROMTOOL_RULES_PATH:-deploy/rules}

imageName=${PROMTOOL_IMAGE_NAME:-dnanexus/promtool}

imageTag=${PROMTOOL_IMAGE_TAG:-2.9.2}



checkOutput=0



for f in "$(pwd)"/deploy/rules/*.yml

do

	if [ -e "$f" ]

	if [ -e "${f}" ]

	then

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



		if ! docker run --rm \

			-v "$(pwd)/${rulesPath}:/mnt" \

			"${imageName}:${imageTag}" \

				check rules "/mnt/${filename}"

		then

		filename=$( basename "$f" )

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

			check rules /tmp/${filename}

			checkOutput=1

			echo ""

		fi

	fi

done



exit "${checkOutput}"

deploy/.env

+5 −0
Original line number Diff line number Diff line
@@ -3,10 +3,15 @@ STORAGE_TSDB_RETENTION_SIZE=8GB 
PORT=9090

DATA_PATH=/prometheus

CONFIG_PATH=/etc/prometheus



INITIAL_CONFIG_FILENAME=prometheus-config.yml

FINAL_CONFIG_FILENAME=prometheus.yml

ENTRYPOINT_FILENAME=entrypoint.sh



DATA_VOL_NAME=prometheus-vol

NODE_RULES_NAME=node_rules



TRAEFIK_ENTRYPOINT=http

TRAEFIK_SUBDOMAIN=prometheus

PUBLIC_HOSTNAME=change.me

TRAEFIK_AUTH=user:$apr1$md5password

deploy/docker-compose.tmpl.yml

+6 −4
Original line number Diff line number Diff line
@@ -52,10 +52,12 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.backend: prometheus

        traefik.port: '${PORT}'

        traefik.enable: ${TRAEFIK_ENABLE:-true}

        traefik.http.routers.prometheus.entrypoints: ${TRAEFIK_ENTRYPOINT}

        traefik.http.routers.prometheus.rule: Host(`${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}`)

        traefik.http.middlewares.prometheus-auth.basicauth.users: ${TRAEFIK_AUTH}

        traefik.http.routers.prometheus.middlewares: prometheus-auth

        traefik.http.services.prometheus.loadbalancer.server.port: ${PORT}



networks:

  metric-net: