diff --git a/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz b/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz index 6d2f8417a6..c71d6e764c 100644 Binary files a/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz and b/assets/rancher-monitoring/rancher-monitoring-104.0.0-rc1+up45.31.1.tgz differ diff --git a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/charts/kube-state-metrics/templates/servicemonitor.yaml b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/charts/kube-state-metrics/templates/servicemonitor.yaml index 58619127bf..42f5f23b01 100644 --- a/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/charts/kube-state-metrics/templates/servicemonitor.yaml +++ b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/charts/kube-state-metrics/templates/servicemonitor.yaml @@ -45,20 +45,20 @@ spec: {{- if .Values.prometheus.monitor.honorLabels }} honorLabels: true {{- end }} - metricRelabelings: {{- if .Values.prometheus.monitor.metricRelabelings }} + metricRelabelings: {{- toYaml .Values.prometheus.monitor.metricRelabelings | nindent 8 }} {{- end }} - {{ if .Values.global.cattle.clusterId }} - - sourceLabels: [__address__] - targetLabel: cluster_id - replacement: {{ .Values.global.cattle.clusterId }} - {{- end }} - {{ if .Values.global.cattle.clusterName }} - - sourceLabels: [__address__] - targetLabel: cluster_name - replacement: {{ .Values.global.cattle.clusterName }} - {{- end }} + {{ if .Values.global.cattle.clusterId }} + - sourceLabels: [__address__] + targetLabel: cluster_id + replacement: {{ .Values.global.cattle.clusterId }} + {{- end }} + {{ if .Values.global.cattle.clusterName }} + - sourceLabels: [__address__] + targetLabel: cluster_name + replacement: {{ .Values.global.cattle.clusterName }} + {{- end }} {{- if .Values.prometheus.monitor.relabelings }} relabelings: {{- toYaml .Values.prometheus.monitor.relabelings | nindent 8 }} diff --git a/index.yaml b/index.yaml index b2301273a5..20d320e78b 100755 --- a/index.yaml +++ b/index.yaml @@ -14867,7 +14867,7 @@ entries: catalog.cattle.io/upstream-version: 45.31.1 apiVersion: v2 appVersion: v0.65.1 - created: "2024-04-30T15:12:45.432076713-04:00" + created: "2024-04-30T17:19:41.152728032-04:00" dependencies: - condition: grafana.enabled name: grafana @@ -14939,7 +14939,7 @@ entries: and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. - digest: 6cbd6e0776e5c0aca432a9060f172b0fa80679706ba9ea07c308605262d10b53 + digest: 525907615f85ba523abc6f388c5110a7787f7c6b90b6c44fcea89b76c432b11d home: https://github.com/prometheus-operator/kube-prometheus icon: file://assets/logos/rancher-monitoring.png keywords: diff --git a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/servicemonitor.yaml.patch b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/servicemonitor.yaml.patch index 89b86c986d..4a383edb32 100644 --- a/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/servicemonitor.yaml.patch +++ b/packages/rancher-monitoring/rancher-kube-state-metrics/generated-changes/patch/templates/servicemonitor.yaml.patch @@ -1,26 +1,28 @@ --- charts-original/templates/servicemonitor.yaml +++ charts/templates/servicemonitor.yaml -@@ -45,9 +45,19 @@ +@@ -45,10 +45,20 @@ {{- if .Values.prometheus.monitor.honorLabels }} honorLabels: true {{- end }} - {{- if .Values.prometheus.monitor.metricRelabelings }} - metricRelabelings: + {{- if .Values.prometheus.monitor.metricRelabelings }} + metricRelabelings: {{- toYaml .Values.prometheus.monitor.metricRelabelings | nindent 8 }} +- {{- end }} + {{- end }} -+ {{ if .Values.global.cattle.clusterId }} -+ - sourceLabels: [__address__] -+ targetLabel: cluster_id -+ replacement: {{ .Values.global.cattle.clusterId }} -+ {{- end }} -+ {{ if .Values.global.cattle.clusterName }} -+ - sourceLabels: [__address__] -+ targetLabel: cluster_name -+ replacement: {{ .Values.global.cattle.clusterName }} - {{- end }} ++ {{ if .Values.global.cattle.clusterId }} ++ - sourceLabels: [__address__] ++ targetLabel: cluster_id ++ replacement: {{ .Values.global.cattle.clusterId }} ++ {{- end }} ++ {{ if .Values.global.cattle.clusterName }} ++ - sourceLabels: [__address__] ++ targetLabel: cluster_name ++ replacement: {{ .Values.global.cattle.clusterName }} ++ {{- end }} {{- if .Values.prometheus.monitor.relabelings }} relabelings: + {{- toYaml .Values.prometheus.monitor.relabelings | nindent 8 }} @@ -81,10 +91,6 @@ {{- if .Values.prometheus.monitor.honorLabels }} honorLabels: true