map coop-cloud labels

abra.sh

@@ -10,7 +10,7 @@ export PROMETHEUS_YML_VERSION=v2
 export MATRIX_ALERTMANAGER_CONFIG_VERSION=v1
 export MATRIX_ALERTMANAGER_ENTRYPOINT_VERSION=v1
 export GF_ALERTS_NODE_VERSION=v3
-export CONFIG_ALLOY_VERSION=v3
+export CONFIG_ALLOY_VERSION=v2
 
 # migrates secrets from old names to new names by reading values from the
 # running containers on the server and re-inserting them under the new names.

compose.yml

@@ -46,14 +46,14 @@ services:
       test: ["CMD", "bash", "-c", "exec 3<>/dev/tcp/localhost/12345 && printf 'GET /-/ready HTTP/1.0\r\nHost: localhost\r\n\r\n' >&3 && head -1 <&3 | grep -q 200"]
       interval: 5s
       timeout: 10s
-      retries: 10
-      start_period: 30s
+      retries: 3
+      start_period: 10s
     deploy:
       restart_policy:
         condition: on-failure
       labels:
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
-        - "coop-cloud.${STACK_NAME}.version=2.1.0+v1.18.1"
+        - "coop-cloud.${STACK_NAME}.version=2.0.0+v1.18.1"
 configs:
   config_alloy:
     template_driver: golang

config.alloy.tmpl

@@ -134,6 +134,11 @@ discovery.relabel "metrics" {
     action        = "keep"
   }
 
+  rule {
+  action = "labelmap"
+  regex  = "__meta_dockerswarm_container_label_coop_cloud_(.+)"
+  }
+
   // default to port 80 when prometheus.io/port isn't set
   rule {
     source_labels = ["__meta_dockerswarm_service_label_prometheus_io_port"]
@@ -300,6 +305,10 @@ discovery.relabel "docker" {
     source_labels = ["__meta_docker_container_log_stream"]
     target_label  = "stream"
   }
+  rule {
+  action = "labelmap"
+  regex  = "__meta_docker_container_label_coop_cloud_(.+)"
+  }
 }
 
 loki.source.docker "docker" {

release/2.1.0+v1.18.1

@@ -1 +0,0 @@
-alloy: split image label in "image_name" and "image_tag", relabel journald logs and drop NetworkDB stats