attempt to trim config

README.md

@@ -20,6 +20,7 @@ pwgen -s 64 1; ./scripts/genpw.py # input password & get hashed output for secre
 printf <...> | docker secret create gp_monitoring_loki_admin_password_v1 -
 
 printf <...> | docker secret create gp_monitoring_alertmanager_smtp_password_v1 -
+printf <...> | docker secret create gp_monitoring_grafana_smtp_password_v1 -
 
 set -a && source env && set +a
 docker context use monitor.autonomic.zone

compose.yml

@@ -20,7 +20,6 @@ services:
       - GF_SMTP_ENABLED
       - GF_SMTP_FROM_ADDRESS
       - GF_SMTP_SKIP_VERIFY
-      - GF_SECURITY_ALLOW_EMBEDDING
       - GF_INSTALL_PLUGINS=grafana-piechart-panel
       - GF_SERVER_ROOT_URL=https://${GRAFANA_DOMAIN}
       - GF_SECURITY_ADMIN_PASSWORD__FILE=/run/secrets/grafana_admin_password

env

@@ -1,48 +1,30 @@
 TYPE=monitoring
-
 STACK_NAME=gp_monitoring
-
-GRAFANA_DOMAIN=g.monitor.autonomic.zone
-PROMETHEUS_DOMAIN=p.monitor.autonomic.zone
-LOKI_DOMAIN=l.monitor.autonomic.zone
-
 LETS_ENCRYPT_ENV=production
 
-# Edit this in order to allow collection of traefik metrics
+GRAFANA_DOMAIN=g.monitor.autonomic.zone
-#TRAEFIK_METRICS_ENABLED=1
+GRAFANA_CUSTOM_INI_VERSION=v3
-#TRAEFIK_SERVICE_NAME=traefik_app
-
-# grafana SMTP configuration (optional)
-#GF_SMTP_HOST=changeme
-#GF_SMTP_ENABLED=1
-#GF_SMTP_FROM_ADDRESS=grafana@example.com
-#GF_SMTP_SKIP_VERIFY=1
-
-# Additional grafana settings (unlikely to require editing)
-GF_SECURITY_ALLOW_EMBEDDING=1
-GF_INSTALL_PLUGINS=grafana-piechart-panel
 GF_SERVER_ROOT_URL=https://${GRAFANA_DOMAIN}
+SECRET_GRAFANA_ADMIN_PASSWORD_VERSION=v1
+SECRET_GRAFANA_OAUTH_CLIENT_SECRET_VERSION=v1
 
-# Loki stores logs in object storage, fill these up with your
+PROMETHEUS_DOMAIN=p.monitor.autonomic.zone
-# minio configuration (or any s3-compatible object store)
+PROMETHEUS_YML_VERSION=v10
+PROMETHEUS_WEB_YML_VERSION=v2
+SECRET_PROMETHEUS_ADMIN_PASSWORD_VERSION=v1
+SECRET_PROMETHEUS_ADMIN_PASSWORD_HASHED_VERSION=v1
+
+LOKI_DOMAIN=l.monitor.autonomic.zone
 LOKI_AWS_ENDPOINT=https://minio.autonomic.zone
 LOKI_AWS_REGION=eu-west-1
 LOKI_ACCESS_KEY_ID=bush-debrief-approval-robust-scraggly-molecule
 LOKI_BUCKET_NAMES=loki
+LOKI_YML_VERSION=v7
+SECRET_LOKI_AWS_SECRET_ACCESS_KEY_VERSION=v1
+SECRET_LOKI_ADMIN_PASSWORD_HASHED_VERSION=v1
 
-# NOTE(d1): abra.sh env vars, while we deploy things manually
-PROMETHEUS_YML_VERSION=v10
-PROMTAIL_YML_VERSION=v1
-LOKI_YML_VERSION=v2
-NODE_EXPORTER_ENTRYPOINT_VERSION=v1
-GRAFANA_DATASOURCES_YML_VERSION=v1
-GRAFANA_DASHBOARDS_YML_VERSION=v1
-GRAFANA_SWARM_DASHBOARD_JSON_VERSION=v1
-GRAFANA_STACKS_DASHBOARD_JSON_VERSION=v1
-GRAFANA_TRAEFIK_DASHBOARD_JSON_VERSION=v1
-GRAFANA_CUSTOM_INI_VERSION=v2
-PROMETHEUS_WEB_YML_VERSION=v2
 ALERTMANAGER_CONFIG_VERSION=v2
+
 NGINX_CONFIG_VERSION=v5
 HTPASSWD_CONFIG_VERSION=v1
 
@@ -50,15 +32,9 @@ KEYCLOAK_AUTH_URL="https://id.autonomic.zone/auth/realms/autonomic/protocol/open
 KEYCLOAK_API_URL="https://id.autonomic.zone/auth/realms/autonomic/protocol/openid-connect/userinfo"
 KEYCLOAK_TOKEN_URL="https://id.autonomic.zone/auth/realms/autonomic/protocol/openid-connect/token"
 
-SECRET_LOKI_AWS_SECRET_ACCESS_KEY_VERSION=v1
-SECRET_GRAFANA_ADMIN_PASSWORD_VERSION=v1
-SECRET_GRAFANA_OAUTH_CLIENT_SECRET_VERSION=v1
-SECRET_PROMETHEUS_ADMIN_PASSWORD_VERSION=v1
-SECRET_PROMETHEUS_ADMIN_PASSWORD_HASHED_VERSION=v1
-SECRET_ALERTMANAGER_SMTP_PASSWORD_VERSION=v1
-SECRET_LOKI_ADMIN_PASSWORD_HASHED_VERSION=v1
-SECRET_SWARM_DEMO_ADMIN_PASSWORD_VERSION=v1
-
 ALERTMANAGER_SMTP_FROM=noreply@autonomic.zone
-ALERTMANAGER_SMTP_HOST=mail.gandi.net:465
+ALERTMANAGER_SMTP_HOST=mail.gandi.net:587
 ALERTMANAGER_SMTP_TO=kaboom@autonomic.zone
+SECRET_ALERTMANAGER_SMTP_PASSWORD_VERSION=v1
+
+SECRET_SWARM_DEMO_ADMIN_PASSWORD_VERSION=v1

loki.yml.tmpl

@@ -1,5 +1,18 @@
 auth_enabled: false
 
+ruler:
+  storage:
+    type: local
+    local:
+      directory: /loki/rules
+  rule_path: /loki/scratch
+  alertmanager_url: http://alertmanager:9093
+  enable_api: true
+  enable_alertmanager_v2: true
+  ring:
+    kvstore:
+      store: inmemory
+
 server:
   http_listen_port: 3100