From 1c31b0d43cd0108f01517622dc5d2362a0140bdb Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 17 Jul 2026 18:41:15 +0200 Subject: [PATCH 1/2] alloy(role0: fix spelling mistake --- roles/alloy/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/alloy/README.md b/roles/alloy/README.md index a3c8e558..dc151442 100644 --- a/roles/alloy/README.md +++ b/roles/alloy/README.md @@ -9,11 +9,11 @@ Should work on Debian-based distributions. ## Required Arguments -- `alloy_config_default`: The default Alloy configuration. Recomanded for configuration that hosts of a groupe share. +- `alloy_config_default`: The default Alloy configuration. Recommended for configuration that hosts of a groupe share. ## Optional Arguments -- `alloy_config_additional`: Additional Alloy configuration appended to the default config. Recomanded for per host configuration +- `alloy_config_additional`: Additional Alloy configuration appended to the default config. Recommended for per host configuration - `alloy_cap_net_bind_service`: Grant Alloy the `CAP_NET_BIND_SERVICE` capability, allowing it to bind to privileged ports (<1024). ### Blackbox Exporter From e8d05c6542c7b1a184ee93edfdb828f84f2c0127 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 17 Jul 2026 18:51:14 +0200 Subject: [PATCH 2/2] alloy(role): remove alloy_config_default contents from role alloy_config_default should be set in group vars --- roles/alloy/defaults/main.yaml | 44 +--------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/roles/alloy/defaults/main.yaml b/roles/alloy/defaults/main.yaml index e98d555b..a544ab7e 100644 --- a/roles/alloy/defaults/main.yaml +++ b/roles/alloy/defaults/main.yaml @@ -1,49 +1,7 @@ --- alloy_cap_net_bind_service: false -alloy_config_default: | - prometheus.remote_write "default" { - endpoint { - url = "https://metrics.hamburg.ccc.de/api/v1/write" - basic_auth { - username = "chaos" - password = "{{ metrics__chaos_password }}" - } - } - } - - prometheus.relabel "chaosknoten_common" { - forward_to = [prometheus.remote_write.default.receiver] - rule { - target_label = "org" - replacement = "ccchh" - } - rule { - target_label = "site" - replacement = "wieske" - } - rule { - source_labels = ["instance"] - target_label = "instance" - regex = "([^:]+)" - replacement = "${1}.hosts.hamburg.ccc.de" - action = "replace" - } - } - - logging { - level = "info" - } - - prometheus.exporter.unix "local_system" { - enable_collectors = ["systemd"] - } - - prometheus.scrape "scrape_metrics" { - targets = prometheus.exporter.unix.local_system.targets - forward_to = [prometheus.relabel.chaosknoten_common.receiver] - } - +alloy_config_default: "" alloy_config_additional: "" alloy_blackbox_exporter_config_default: |