diff --git a/assets/rancher-monitoring/rancher-monitoring-102.0.0+up40.1.2.tgz b/assets/rancher-monitoring/rancher-monitoring-102.0.0+up40.1.2.tgz index ca3328363..3fc967e4d 100644 Binary files a/assets/rancher-monitoring/rancher-monitoring-102.0.0+up40.1.2.tgz and b/assets/rancher-monitoring/rancher-monitoring-102.0.0+up40.1.2.tgz differ diff --git a/assets/rancher-pushprox/rancher-pushprox-102.0.0.tgz b/assets/rancher-pushprox/rancher-pushprox-102.0.0.tgz index b1bdb3bb1..1c25579d8 100644 Binary files a/assets/rancher-pushprox/rancher-pushprox-102.0.0.tgz and b/assets/rancher-pushprox/rancher-pushprox-102.0.0.tgz differ diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedKubelet/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedKubelet/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedKubelet/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedKubelet/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedNodeExporter/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedNodeExporter/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedNodeExporter/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/hardenedNodeExporter/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/k3sServer/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/k3sServer/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/k3sServer/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/k3sServer/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmControllerManager/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmControllerManager/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmControllerManager/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmControllerManager/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmEtcd/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmEtcd/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmEtcd/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmEtcd/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmProxy/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmProxy/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmProxy/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmProxy/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmScheduler/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmScheduler/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmScheduler/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/kubeAdmScheduler/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2ControllerManager/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2ControllerManager/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2ControllerManager/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2ControllerManager/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Etcd/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Etcd/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Etcd/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Etcd/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2IngressNginx/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2IngressNginx/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2IngressNginx/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2IngressNginx/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Proxy/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Proxy/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Proxy/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Proxy/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Scheduler/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Scheduler/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Scheduler/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rke2Scheduler/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeControllerManager/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeControllerManager/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeControllerManager/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeControllerManager/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeEtcd/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeEtcd/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeEtcd/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeEtcd/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeIngressNginx/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeIngressNginx/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeIngressNginx/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeIngressNginx/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeProxy/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeProxy/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeProxy/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeProxy/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeScheduler/templates/_helpers.tpl b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeScheduler/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeScheduler/templates/_helpers.tpl +++ b/charts/rancher-monitoring/102.0.0+up40.1.2/charts/rkeScheduler/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/charts/rancher-pushprox/102.0.0/templates/_helpers.tpl b/charts/rancher-pushprox/102.0.0/templates/_helpers.tpl index 82f5504df..c7f6ff92d 100644 --- a/charts/rancher-pushprox/102.0.0/templates/_helpers.tpl +++ b/charts/rancher-pushprox/102.0.0/templates/_helpers.tpl @@ -109,7 +109,7 @@ app: {{ template "pushprox.serviceMonitor.name" . }} {{- $_ := set $clusterIdRelabel "sourceLabels" (list "__address__") }} {{- $_ := set $clusterIdRelabel "targetLabel" "cluster_id" }} {{- $_ := set $clusterIdRelabel "replacement" $.Values.global.cattle.clusterId }} -{{- $_ := set . "metricsRelabelings" (list ($clusterIdRelabel))}} +{{- $_ := set . "metricRelabelings" (list ($clusterIdRelabel))}} {{- end }} {{- if $useHTTPS -}} {{- if (hasKey . "params") }} diff --git a/index.yaml b/index.yaml index 8712716dc..e7aecef08 100755 --- a/index.yaml +++ b/index.yaml @@ -8470,7 +8470,7 @@ entries: catalog.cattle.io/upstream-version: 19.0.3 apiVersion: v2 appVersion: 0.59.1 - created: "2023-02-02T15:46:50.652807-08:00" + created: "2023-02-09T12:09:18.068738-08:00" dependencies: - condition: grafana.enabled name: grafana @@ -8541,7 +8541,7 @@ entries: description: Collects several related Helm charts, Grafana dashboards, 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: 8988f35d905053c861123f56da0cc87fb227bc4358fcbff126bafa56b9857c28 + digest: 3907fb8dd90fd0f17b116ab7acd8580a3602ea17ac34550127c6b6afab45dfd8 home: https://github.com/prometheus-operator/kube-prometheus icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png keywords: @@ -10864,10 +10864,10 @@ entries: catalog.rancher.io/release-name: rancher-pushprox apiVersion: v1 appVersion: 0.1.0 - created: "2023-01-30T09:31:23.045991-08:00" + created: "2023-02-09T12:09:22.813253-08:00" description: Sets up a deployment of the PushProx proxy and a DaemonSet of PushProx clients. - digest: 82fff404d07032f952827115e1a483597631271d2ac02997b6f59a099e2b5244 + digest: 6e87b0f0c98e4bf35af4f7e0388345fe92ea72dff712651202f3bedd253c3258 name: rancher-pushprox type: application urls: