Upgrade dNation monitoring

Related to dNationCloud/kubernetes-monitoring#180 and SovereignCloudStack/issues#305

Signed-off-by: Roman Hros <[email protected]>

Author: chess-knight

chart/Chart.yaml

@@ -15,8 +15,8 @@
 
 apiVersion: v2
 name: dnation-kubernetes-monitoring-stack
-version: 3.3.1
-appVersion: 2.5.4  # dnation-kubernetes-monitoring
+version: 3.4.0
+appVersion: 2.6.0  # dnation-kubernetes-monitoring
 description: An umbrella helm chart for Kubernetes monitoring based on kube-prometheus-stack, thanos, loki, loki-distributed, promtail and dnation-kubernetes-monitoring.
 keywords:
 - dnation
@@ -53,7 +53,7 @@ dependencies:
   repository: https://grafana.github.io/helm-charts
   condition: promtail.enabled
 - name: dnation-kubernetes-monitoring
-  version: "2.5.*"
+  version: "2.6.*"
   repository: https://dnationcloud.github.io/helm-hub
   condition: dnation-kubernetes-monitoring.enabled
 - name: ssl-exporter

chart/values.yaml

@@ -162,8 +162,8 @@ promtail:
     clients:
     - url: http://loki-gateway/loki/api/v1/push
       tenant_id: 1
-  # !IMPORTANT: each cluster must have prometheus external label 'cluster' with unique value.
-  # This will be used as cluster discriminator when metrics are aggregated on observer cluster.
+  # !IMPORTANT: each cluster must have promtail external label 'cluster' with unique value.
+  # This will be used as cluster discriminator when logs are aggregated on observer cluster.
   extraArgs:
     - -client.external-labels=cluster=observer-cluster
 
@@ -201,6 +201,11 @@ kube-prometheus-stack:
   ##
   prometheus:
     prometheusSpec:
+      # !IMPORTANT: each cluster must have prometheus external label 'cluster' with unique value.
+      # This will be used as cluster discriminator when metrics are aggregated on observer cluster.
+      externalLabels:
+        cluster: observer-cluster
+
       ## PrometheusRules to be selected for target discovery
       ##
       ruleSelector:

multicluster-config/custom-observer-values-sample.yaml

@@ -1,5 +1,5 @@
 # !IMPORTANT: each cluster must have prometheus and promtail external label 'cluster' with unique value.
-# This will be used as cluster discriminator when metrics are aggregated on observer cluster.
+# This will be used as cluster discriminator when metrics and logs are aggregated on observer cluster.
 
 thanosStorage:
   # More details about supported storage types and config options can be found here: https://thanos.io/tip/thanos/storage.md/