.env.sample

@@ -5,10 +5,6 @@ PROMETHEUS_DOMAIN=prometheus.example.com
 
 LETS_ENCRYPT_ENV=production
 
-# Edit this in order to allow collection of traefik metrics
-#TRAEFIK_METRICS_ENABLED=1
-#TRAEFIK_SERVICE_NAME=traefik_app
-
 # grafana SMTP configuration (optional)
 #GF_SMTP_HOST=changeme
 #GF_SMTP_ENABLED=1
@@ -22,8 +18,8 @@ GF_SERVER_ROOT_URL=https://${GRAFANA_DOMAIN}
 
 # Loki stores logs in object storage, fill these up with your
 # minio configuration (or any s3-compatible object store)
-#LOKI_AWS_ENDPOINT=https://minio/
-#LOKI_AWS_REGION=eu-west-1
-#LOKI_ACCESS_KEY_ID=
-#LOKI_SECRET_ACCESS_KEY=
-#LOKI_BUCKET_NAMES=loki
+LOKI_AWS_ENDPOINT=https://minio/
+LOKI_AWS_REGION=eu-west-1
+LOKI_ACCESS_KEY_ID=
+LOKI_SECRET_ACCESS_KEY=
+LOKI_BUCKET_NAMES=loki

abra.sh

@@ -1,4 +1,4 @@
-export PROMETHEUS_YML_VERSION=v2
+export PROMETHEUS_YML_VERSION=v1
 export PROMTAIL_YML_VERSION=v1
 export LOKI_YML_VERSION=v1
 export NODE_EXPORTER_ENTRYPOINT_VERSION=v1

compose.yml

@@ -145,9 +145,8 @@ services:
 
 configs:
   prometheus_yml:
-    template_driver: golang
     name: ${STACK_NAME}_prometheus_yml_${PROMETHEUS_YML_VERSION}
-    file: prometheus.yml.tmpl
+    file: prometheus.yml
   promtail_yml:
     name: ${STACK_NAME}_promtail_yml_${PROMTAIL_YML_VERSION}
     file: promtail.yml

prometheus.yml

@@ -46,13 +46,11 @@ scrape_configs:
       type: 'A'
       port: 8080
 
-{{ if eq (env "TRAEFIK_METRICS_ENABLED") "1" }}
   - job_name: 'traefik'
     scrape_interval: 30s
     metrics_path: '/metrics'
     dns_sd_configs:
     - names:
-      - 'tasks.{{ (env "TRAEFIK_SERVICE_NAME") }}'
+      - 'tasks.traefik_app'
       type: 'A'
       port: 8082
-{{ end }}