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 548c7c8d66..07e4660157 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/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml new file mode 100644 index 0000000000..1d51882d03 --- /dev/null +++ b/charts/rancher-monitoring/104.0.0-rc1+up45.31.1/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml @@ -0,0 +1,26 @@ +{{- if .Values.rancherMonitoring.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }} + name: monitoring-fleet-controller + namespace: cattle-fleet-system +spec: + endpoints: + - port: metrics + metricRelabelings: + {{ 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 }} + jobLabel: fleet + selector: + matchLabels: + app: fleet-controller +{{- end }} diff --git a/index.yaml b/index.yaml index a72b136687..46b222b0f8 100755 --- a/index.yaml +++ b/index.yaml @@ -15644,7 +15644,7 @@ entries: catalog.cattle.io/upstream-version: 45.31.1 apiVersion: v2 appVersion: v0.65.1 - created: "2024-06-05T09:32:59.399823889+05:30" + created: "2024-06-06T09:47:50.601115201+02:00" dependencies: - condition: grafana.enabled name: grafana @@ -15716,7 +15716,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: d0b1515cccd1899ef3ecdfa86b6de5f2c7000f6fd47f1d68414e610593ac4cdc + digest: 9b5d15eb638e0158e0ca5474bf68af003cbe01b384c85b26504a80d8d4586762 home: https://github.com/prometheus-operator/kube-prometheus icon: file://assets/logos/rancher-monitoring.png keywords: diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml new file mode 100644 index 0000000000..1d51882d03 --- /dev/null +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/overlay/templates/rancher-monitoring/exporters/fleet/servicemonitor.yaml @@ -0,0 +1,26 @@ +{{- if .Values.rancherMonitoring.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: {{ include "kube-prometheus-stack.labels" . | nindent 4 }} + name: monitoring-fleet-controller + namespace: cattle-fleet-system +spec: + endpoints: + - port: metrics + metricRelabelings: + {{ 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 }} + jobLabel: fleet + selector: + matchLabels: + app: fleet-controller +{{- end }}