From 80a01a533ddef481e8d3fb41d27620583b8e81b6 Mon Sep 17 00:00:00 2001 From: Gerrit Date: Thu, 5 Mar 2026 10:03:27 +0100 Subject: [PATCH] Allow thanos ruler deployment for control plane monitoring. --- deploy_control_plane.yaml | 13 +++++++------ deploy_control_plane_monitoring.yaml | 11 +++++++++++ .../group_vars/control-plane/monitoring.yaml | 10 ++++++++++ roles/minio/templates/values.yaml.j2 | 1 + 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 deploy_control_plane_monitoring.yaml diff --git a/deploy_control_plane.yaml b/deploy_control_plane.yaml index 6fe5a2b4..1ec2a169 100644 --- a/deploy_control_plane.yaml +++ b/deploy_control_plane.yaml @@ -31,12 +31,13 @@ tags: auth - name: metal-roles/control-plane/roles/metal tags: metal - - name: metal-roles/control-plane/roles/logging - when: monitoring_enabled - tags: logging - - name: metal-roles/control-plane/roles/monitoring - when: monitoring_enabled - tags: monitoring + - name: minio + tags: minio + when: monitoring_enabled or gardener_enabled + +- name: deploy monitoring + import_playbook: deploy_control_plane_monitoring.yaml + when: monitoring_enabled - name: deploy gardener import_playbook: deploy_gardener.yaml diff --git a/deploy_control_plane_monitoring.yaml b/deploy_control_plane_monitoring.yaml new file mode 100644 index 00000000..ed91bd3d --- /dev/null +++ b/deploy_control_plane_monitoring.yaml @@ -0,0 +1,11 @@ +--- +- name: Deploy control plane monitoring + hosts: control-plane + connection: local + gather_facts: false + roles: + - name: metal-roles/control-plane/roles/logging + tags: logging + + - name: metal-roles/control-plane/roles/monitoring + tags: monitoring diff --git a/inventories/group_vars/control-plane/monitoring.yaml b/inventories/group_vars/control-plane/monitoring.yaml index db54d9be..300e2ea7 100644 --- a/inventories/group_vars/control-plane/monitoring.yaml +++ b/inventories/group_vars/control-plane/monitoring.yaml @@ -10,3 +10,13 @@ monitoring_thanos_receive_ingress_enabled: true monitoring_thanos_receive_size: 5Gi monitoring_prometheus_core_dns_enabled: true + +monitoring_thanos_object_store_config: |- + type: s3 + config: + bucket: thanos + endpoint: "{{ minio_dns_name + ':8080' }}" + access_key: "{{ minio_root_user }}" + secret_key: "{{ minio_root_password }}" + insecure: true + region: us-east-1 diff --git a/roles/minio/templates/values.yaml.j2 b/roles/minio/templates/values.yaml.j2 index f68a2fd8..5d9ea8f8 100644 --- a/roles/minio/templates/values.yaml.j2 +++ b/roles/minio/templates/values.yaml.j2 @@ -23,6 +23,7 @@ tenant: buckets: - name: mini-lab - name: gardener-operator + - name: thanos ingress: api: