Partition Prometheus Role (#167)

metal-stack · Oct 9, 2023 · 8a5d55d · 8a5d55d
1 parent 8936ab6
commit 8a5d55d
Show file tree

Hide file tree

Showing 38 changed files with 9,387 additions and 731 deletions.
diff --git a/control-plane/roles/monitoring/README.md b/control-plane/roles/monitoring/README.md
diff --git a/control-plane/roles/monitoring/defaults/main/main.yaml b/control-plane/roles/monitoring/defaults/main/main.yaml
@@ -10,23 +10,24 @@ monitoring_grafana_additional_datasources:
     orgId: 1
     version: 1
     isDefault: false
+    uid: loki
     jsonData:
       maxLines: 1000
-  - name: AlertManager
-    type: camptocamp-prometheus-alertmanager-datasource
-    url: http://prometheus-alertmanager:9093/
-    access: proxy
-    jsonData:
-      severity_critical: "critical"
-      severity_high: "high"
-      severity_warning: "warning"
-      severity_info: "info"
 monitoring_grafana_ingress_dns: "grafana.{{ metal_control_plane_ingress_dns }}"
 monitoring_prometheus_ingress_dns: prometheus.{{ metal_control_plane_ingress_dns }}
 monitoring_ingress_grafana_tls: yes
 monitoring_prometheus_ingress_enabled: false
 monitoring_additional_ingress_annotations: {}
 
+monitoring_thanos_receive_ingress_dns: "monitoring.{{ metal_control_plane_ingress_dns }}"
+
+monitoring_alertmanager_ingress_enabled: true
+monitoring_alertmanager_ingress_dns: "alert.{{ metal_control_plane_ingress_dns }}"
+monitoring_alertmanager_ingress_tls: yes
+monitoring_alertmanager_ingress_basic_auth_user: alertmanager
+monitoring_alertmanager_ingress_basic_auth_password:
+monitoring_alertmanager_ingress_basic_auth_password_salt: "{{ monitoring_alertmanager_ingress_basic_auth_password | hash('sha1') | truncate(22, True, '') }}"
+
 # metal metrics exporter
 monitoring_metal_api_url: "http://metal-api.metal-control-plane.svc:8080/metal"
 monitoring_metal_api_hmac: "metal-admin"

diff --git a/control-plane/roles/monitoring/tasks/exporters.yaml b/control-plane/roles/monitoring/tasks/exporters.yaml
@@ -23,12 +23,3 @@
     namespace: "{{ monitoring_namespace }}"
     apply: true
   when: monitoring_gardener_enabled
-
-- name: Add webhook-logger
-  k8s:
-    definition: "{{ lookup('template', item) }}"
-    namespace: "{{ monitoring_namespace }}"
-    apply: true
-  loop:
-    - webhook-logger-Service.yaml
-    - webhook-logger-Deployment.yaml
diff --git a/control-plane/roles/monitoring/tasks/main.yaml b/control-plane/roles/monitoring/tasks/main.yaml
@@ -76,6 +76,7 @@
      - metal-api.yaml
      - rethinkdb.yaml
      - alertmanager.yaml
+     - sonic-exporter.yaml
 
 - name: Deploy Grafana dashboards for Gardener
   k8s:
@@ -108,13 +109,3 @@
   loop:
     - gardener-metrics-exporter.yaml
   when: monitoring_gardener_enabled
-
-- name: Deploy alerting rules
-  k8s:
-    definition: "{{ lookup('template', 'monitoring_rules/' + item) }}"
-    namespace: "{{ monitoring_namespace }}"
-  loop:
-    - metal-api-rules.yaml
-    - prometheus-alerts.yaml
-    - alertmanager-rules.yaml
-    - partition-rules.yaml