hacking, things work

compose.yml

@@ -47,6 +47,7 @@ services:
     secrets:
       - prometheus_admin_password
       - prometheus_admin_password_hashed
+      - swarm_demo_admin_password
     volumes:
       - prometheus-data:/prometheus:rw
     configs:
@@ -200,3 +201,6 @@ secrets:
   loki_admin_password_hashed:
     external: true
     name: ${STACK_NAME}_loki_admin_password_hashed_${SECRET_LOKI_ADMIN_PASSWORD_HASHED_VERSION}
+  swarm_demo_admin_password:
+    external: true
+    name: ${STACK_NAME}_swarm_demo_admin_password_${SECRET_SWARM_DEMO_ADMIN_PASSWORD_VERSION}

env

@@ -31,7 +31,7 @@ LOKI_ACCESS_KEY_ID=bush-debrief-approval-robust-scraggly-molecule
 LOKI_BUCKET_NAMES=loki
 
 # NOTE(d1): abra.sh env vars, while we deploy things manually
-PROMETHEUS_YML_VERSION=v6
+PROMETHEUS_YML_VERSION=v10
 PROMTAIL_YML_VERSION=v1
 LOKI_YML_VERSION=v2
 NODE_EXPORTER_ENTRYPOINT_VERSION=v1
@@ -57,6 +57,7 @@ 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

prometheus.yml.tmpl

@@ -16,3 +16,21 @@ scrape_configs:
     basic_auth:
       username: 'admin'
       password: '{{ secret "prometheus_admin_password" }}'
+
+  - job_name: 'swarm_demo_node_exporter'
+    metrics_path: '/node_exporter/metrics'
+    static_configs:
+    - targets:
+      - swarm-demo.gather.autonomic.zone
+    basic_auth:
+      username: 'admin'
+      password: '{{ secret "swarm_demo_admin_password" }}'
+
+  - job_name: 'swarm_demo_cadvisor'
+    metrics_path: '/cadvisor/metrics'
+    static_configs:
+    - targets:
+      - swarm-demo.gather.autonomic.zone
+    basic_auth:
+      username: 'admin'
+      password: '{{ secret "swarm_demo_admin_password" }}'