From 74f6b96b06b195b5a5b07ed28bb7c6859d3e16a8 Mon Sep 17 00:00:00 2001 From: Matthias Hartmann Date: Mon, 4 May 2026 17:49:34 +0200 Subject: [PATCH 1/4] chore: replace promtail with alloy on leaves and monitor it --- deploy_partition.yaml | 4 ++-- inventories/group_vars/all/release_vector.yaml | 5 ++++- inventories/group_vars/leaves/alloy.yaml | 5 +++++ inventories/group_vars/partition/alloy.yaml | 5 +++++ inventories/group_vars/partition/monitoring.yaml | 3 +++ inventories/group_vars/partition/prometheus.yaml | 4 ++++ 6 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 inventories/group_vars/leaves/alloy.yaml create mode 100644 inventories/group_vars/partition/alloy.yaml diff --git a/deploy_partition.yaml b/deploy_partition.yaml index 705d707a..f5344479 100644 --- a/deploy_partition.yaml +++ b/deploy_partition.yaml @@ -119,9 +119,9 @@ roles: - name: ansible-common tags: always - - name: metal-roles/partition/roles/promtail + - name: metal-roles/partition/roles/alloy when: monitoring_enabled - tags: promtail + tags: alloy - name: metal-roles/partition/roles/monitoring/node-exporter when: monitoring_enabled tags: node-exporter diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index f801fffc..52ec9c45 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -32,7 +32,10 @@ metal_stack_release_vectors: # sonic_configdb_utils_image_tag: # ... # - +alloy_image_tag: v1.16.0 +alloy_image_name: grafana/alloy +logging_alloy_chart_version: 1.8.0 +logging_alloy_chart_repo: https://grafana.github.io/helm-charts ## ## for ansible roles ## diff --git a/inventories/group_vars/leaves/alloy.yaml b/inventories/group_vars/leaves/alloy.yaml new file mode 100644 index 00000000..8c0b4a3f --- /dev/null +++ b/inventories/group_vars/leaves/alloy.yaml @@ -0,0 +1,5 @@ +alloy_config_snippets: + - leaf-node-docker + - alloy-self + - syslog-logs + # - journal-logs diff --git a/inventories/group_vars/partition/alloy.yaml b/inventories/group_vars/partition/alloy.yaml new file mode 100644 index 00000000..250a43ab --- /dev/null +++ b/inventories/group_vars/partition/alloy.yaml @@ -0,0 +1,5 @@ +alloy_loki_write_endpoints: + - url: "http://loki.{{ metal_control_plane_ingress_dns }}:8080/loki/api/v1/push" + # basic_auth: + # username: "{{ logging_ingress_loki_basic_auth_user }}" + # password: "{{ logging_ingress_loki_basic_auth_password }}" diff --git a/inventories/group_vars/partition/monitoring.yaml b/inventories/group_vars/partition/monitoring.yaml index 2c3b07be..738903df 100644 --- a/inventories/group_vars/partition/monitoring.yaml +++ b/inventories/group_vars/partition/monitoring.yaml @@ -6,3 +6,6 @@ monitoring_sonic_exporter_port: 9101 # IPMI should use the same credentials as metal-api monitoring_ipmi_bmc_superuser_pwd: "{{ metal_api_bmc_superuser_pwd }}" + +# alloy offers logs and metrics +monitoring_alloy_port: 12345 diff --git a/inventories/group_vars/partition/prometheus.yaml b/inventories/group_vars/partition/prometheus.yaml index 8e691dae..8c39ce1d 100644 --- a/inventories/group_vars/partition/prometheus.yaml +++ b/inventories/group_vars/partition/prometheus.yaml @@ -28,4 +28,8 @@ prometheus_hosts_content: | {{ hostvars['leaf01'].ansible_host }} leaf01 {{ hostvars['leaf02'].ansible_host }} leaf02 +prometheus_alloy_targets: + - "leaf01:{{ monitoring_alloy_port }}" + - "leaf02:{{ monitoring_alloy_port }}" + prometheus_haproxy_enabled: false From 63a275954b4b61505775b9171a361f38e1ccc886 Mon Sep 17 00:00:00 2001 From: Matthias Hartmann Date: Wed, 6 May 2026 16:50:59 +0200 Subject: [PATCH 2/4] feat: use docker and journal snippets for leaves --- inventories/group_vars/all/release_vector.yaml | 2 ++ inventories/group_vars/leaves/alloy.yaml | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index 52ec9c45..1dda7972 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -36,6 +36,8 @@ alloy_image_tag: v1.16.0 alloy_image_name: grafana/alloy logging_alloy_chart_version: 1.8.0 logging_alloy_chart_repo: https://grafana.github.io/helm-charts +gardener_logging_alloy_chart_version: 1.8.0 +gardener_logging_alloy_chart_repo: https://grafana.github.io/helm-charts ## ## for ansible roles ## diff --git a/inventories/group_vars/leaves/alloy.yaml b/inventories/group_vars/leaves/alloy.yaml index 8c0b4a3f..77bb5f2c 100644 --- a/inventories/group_vars/leaves/alloy.yaml +++ b/inventories/group_vars/leaves/alloy.yaml @@ -1,5 +1,3 @@ alloy_config_snippets: - leaf-node-docker - - alloy-self - - syslog-logs - # - journal-logs + - journal From c7e069107e013b20a02a2f89ea750ffdae533553 Mon Sep 17 00:00:00 2001 From: Matthias Hartmann Date: Wed, 6 May 2026 18:25:00 +0200 Subject: [PATCH 3/4] chore: cleanup release vector overwrites --- inventories/group_vars/all/release_vector.yaml | 6 ------ inventories/group_vars/partition/alloy.yaml | 3 --- 2 files changed, 9 deletions(-) diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index 1dda7972..ea14eae0 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -32,12 +32,6 @@ metal_stack_release_vectors: # sonic_configdb_utils_image_tag: # ... # -alloy_image_tag: v1.16.0 -alloy_image_name: grafana/alloy -logging_alloy_chart_version: 1.8.0 -logging_alloy_chart_repo: https://grafana.github.io/helm-charts -gardener_logging_alloy_chart_version: 1.8.0 -gardener_logging_alloy_chart_repo: https://grafana.github.io/helm-charts ## ## for ansible roles ## diff --git a/inventories/group_vars/partition/alloy.yaml b/inventories/group_vars/partition/alloy.yaml index 250a43ab..bd8dba8e 100644 --- a/inventories/group_vars/partition/alloy.yaml +++ b/inventories/group_vars/partition/alloy.yaml @@ -1,5 +1,2 @@ alloy_loki_write_endpoints: - url: "http://loki.{{ metal_control_plane_ingress_dns }}:8080/loki/api/v1/push" - # basic_auth: - # username: "{{ logging_ingress_loki_basic_auth_user }}" - # password: "{{ logging_ingress_loki_basic_auth_password }}" From 9bcf414b2ec07168e827ef4e09b21392d33c77ff Mon Sep 17 00:00:00 2001 From: Matthias Hartmann Date: Thu, 7 May 2026 14:27:33 +0200 Subject: [PATCH 4/4] chore: rename docker alloy snippet --- inventories/group_vars/leaves/alloy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/leaves/alloy.yaml b/inventories/group_vars/leaves/alloy.yaml index 77bb5f2c..27c070ba 100644 --- a/inventories/group_vars/leaves/alloy.yaml +++ b/inventories/group_vars/leaves/alloy.yaml @@ -1,3 +1,3 @@ alloy_config_snippets: - - leaf-node-docker + - docker - journal