From 3d2233d49ef7cdac92a1799d07cbbc73505bf966 Mon Sep 17 00:00:00 2001
From: Jiaqi Luo <6218999+jiaqiluo@users.noreply.github.com>
Date: Tue, 12 Oct 2021 15:09:28 -0700
Subject: [PATCH] Rebase to c6208979d494156a3869d2e5faab669ce4301c68

---
 .../templates/prometheus/csi-secret.yaml      |  12 +
 .../generated-changes/patch/Chart.yaml.patch  |   2 +-
 .../core-dns/servicemonitor.yaml.patch        |   8 +
 .../kube-api-server/servicemonitor.yaml.patch |   9 +
 .../servicemonitor.yaml.patch                 |   8 +
 .../kube-dns/servicemonitor.yaml.patch        |   8 +
 .../kube-etcd/servicemonitor.yaml.patch       |  10 +
 .../kube-proxy/servicemonitor.yaml.patch      |  15 +
 .../kube-scheduler/servicemonitor.yaml.patch  |  10 +
 .../serviceMonitor.yaml.patch                 |  18 +
 .../kubelet/servicemonitor.yaml.patch         |  61 ++-
 .../node-exporter/servicemonitor.yaml.patch   |   8 +
 .../generated-changes/patch/values.yaml.patch | 374 ++++++++++++++++--
 13 files changed, 510 insertions(+), 33 deletions(-)
 create mode 100644 packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/csi-secret.yaml
 create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-etcd/servicemonitor.yaml.patch
 create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-proxy/servicemonitor.yaml.patch
 create mode 100644 packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-scheduler/servicemonitor.yaml.patch

diff --git a/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/csi-secret.yaml b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/csi-secret.yaml
new file mode 100644
index 000000000..89399cec8
--- /dev/null
+++ b/packages/rancher-monitoring/generated-changes/overlay/templates/prometheus/csi-secret.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.prometheus.prometheusSpec.thanos.secretProviderClass }}
+---
+apiVersion: secrets-store.csi.x-k8s.io/v1alpha1
+kind: SecretProviderClass
+metadata:
+  name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus
+  namespace: {{ template "kube-prometheus-stack.namespace" . }}
+  labels:
+    app: {{ template "kube-prometheus-stack.name" . }}-prometheus
+spec:
+{{ toYaml .Values.prometheus.prometheusSpec.thanos.secretProviderClass | indent 2 }}
+{{- end }}
\ No newline at end of file
diff --git a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch
index c32acd367..4b291875b 100644
--- a/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/Chart.yaml.patch
@@ -24,7 +24,7 @@
 +sources:
 +  - https://github.com/prometheus-community/helm-charts
 +  - https://github.com/prometheus-operator/kube-prometheus
-+version: 19.0.0
++version: 19.0.3
 +appVersion: 0.50.0
 +kubeVersion: ">=1.16.0-0"
 +home: https://github.com/prometheus-operator/kube-prometheus
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/core-dns/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/core-dns/servicemonitor.yaml.patch
index 0dfe2b1db..0ad326844 100644
--- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/core-dns/servicemonitor.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/core-dns/servicemonitor.yaml.patch
@@ -9,3 +9,11 @@
    labels:
      app: {{ template "kube-prometheus-stack.name" . }}-coredns
  {{ include "kube-prometheus-stack.labels" . | indent 4 }}
+@@ -31,6 +31,6 @@
+ {{- end }}
+ {{- if .Values.coreDns.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.coreDns.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.coreDns.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-api-server/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-api-server/servicemonitor.yaml.patch
index b7497995e..5424ffb44 100644
--- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-api-server/servicemonitor.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-api-server/servicemonitor.yaml.patch
@@ -9,3 +9,12 @@
    labels:
      app: {{ template "kube-prometheus-stack.name" . }}-apiserver
  {{ include "kube-prometheus-stack.labels" . | indent 4 }}
+@@ -24,7 +24,7 @@
+ {{- end }}
+ {{- if .Values.kubeApiServer.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeApiServer.serviceMonitor.relabelings | indent 6 }}
++{{ tpl (toYaml .Values.kubeApiServer.serviceMonitor.relabelings | indent 6) . }}
+ {{- end }}
+     tlsConfig:
+       caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-controller-manager/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-controller-manager/servicemonitor.yaml.patch
index 74ed9c2ee..d93356d68 100644
--- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-controller-manager/servicemonitor.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-controller-manager/servicemonitor.yaml.patch
@@ -9,3 +9,11 @@
    labels:
      app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager
  {{ include "kube-prometheus-stack.labels" . | indent 4 }}
+@@ -42,6 +42,6 @@
+ {{- end }}
+ {{- if .Values.kubeControllerManager.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeControllerManager.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeControllerManager.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-dns/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-dns/servicemonitor.yaml.patch
index 394dbc5a1..b82eaad3a 100644
--- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-dns/servicemonitor.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-dns/servicemonitor.yaml.patch
@@ -9,3 +9,11 @@
    labels:
      app: {{ template "kube-prometheus-stack.name" . }}-kube-dns
  {{ include "kube-prometheus-stack.labels" . | indent 4 }}
+@@ -44,6 +44,6 @@
+ {{- end }}
+ {{- if .Values.kubeDns.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeDns.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeDns.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-etcd/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-etcd/servicemonitor.yaml.patch
new file mode 100644
index 000000000..0d3cae998
--- /dev/null
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-etcd/servicemonitor.yaml.patch
@@ -0,0 +1,10 @@
+--- charts-original/templates/exporters/kube-etcd/servicemonitor.yaml
++++ charts/templates/exporters/kube-etcd/servicemonitor.yaml
+@@ -48,6 +48,6 @@
+ {{- end }}
+ {{- if .Values.kubeEtcd.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeEtcd.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeEtcd.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-proxy/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-proxy/servicemonitor.yaml.patch
new file mode 100644
index 000000000..a1b3bf46d
--- /dev/null
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-proxy/servicemonitor.yaml.patch
@@ -0,0 +1,15 @@
+--- charts-original/templates/exporters/kube-proxy/servicemonitor.yaml
++++ charts/templates/exporters/kube-proxy/servicemonitor.yaml
+@@ -32,10 +32,10 @@
+     {{- end}}
+ {{- if .Values.kubeProxy.serviceMonitor.metricRelabelings }}
+     metricRelabelings:
+-{{ toYaml .Values.kubeProxy.serviceMonitor.metricRelabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeProxy.serviceMonitor.metricRelabelings | indent 4) . }}
+ {{- end }}
+ {{- if .Values.kubeProxy.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeProxy.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeProxy.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-scheduler/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-scheduler/servicemonitor.yaml.patch
new file mode 100644
index 000000000..43ea83a20
--- /dev/null
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-scheduler/servicemonitor.yaml.patch
@@ -0,0 +1,10 @@
+--- charts-original/templates/exporters/kube-scheduler/servicemonitor.yaml
++++ charts/templates/exporters/kube-scheduler/servicemonitor.yaml
+@@ -42,6 +42,6 @@
+ {{- end }}
+ {{- if .Values.kubeScheduler.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeScheduler.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeScheduler.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch
index 84957f7d7..3af394275 100644
--- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kube-state-metrics/serviceMonitor.yaml.patch
@@ -9,3 +9,21 @@
      {{- if .Values.kubeStateMetrics.serviceMonitor.interval }}
      interval: {{ .Values.kubeStateMetrics.serviceMonitor.interval }}
      {{- end }}
+@@ -27,7 +27,7 @@
+ {{- end }}
+ {{- if .Values.kubeStateMetrics.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- if .Values.kubeStateMetrics.serviceMonitor.selfMonitor.enabled }}
+   - port: metrics
+@@ -44,7 +44,7 @@
+ {{- end }}
+ {{- if .Values.kubeStateMetrics.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubeStateMetrics.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
+   namespaceSelector:
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch
index 29cd80d07..ba9291435 100644
--- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/kubelet/servicemonitor.yaml.patch
@@ -15,7 +15,32 @@
    labels:
      app: {{ template "kube-prometheus-stack.name" . }}-kubelet
  {{- include "kube-prometheus-stack.labels" . | indent 4 }}
-@@ -85,7 +88,7 @@
+@@ -29,7 +32,7 @@
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubelet.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubelet.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.cAdvisor }}
+   - port: https-metrics
+@@ -55,7 +58,7 @@
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.cAdvisorRelabelings }}
+     relabelings:
+-{{ toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.probes }}
+@@ -79,13 +82,13 @@
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.probesRelabelings }}
+     relabelings:
+-{{ toYaml .Values.kubelet.serviceMonitor.probesRelabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubelet.serviceMonitor.probesRelabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
  {{- if .Values.kubelet.serviceMonitor.resource }}
    - port: https-metrics
      scheme: https
@@ -24,7 +49,30 @@
      {{- if .Values.kubelet.serviceMonitor.interval }}
      interval: {{ .Values.kubelet.serviceMonitor.interval }}
      {{- end }}
-@@ -143,7 +146,7 @@
+@@ -103,7 +106,7 @@
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.resourceRelabelings }}
+     relabelings:
+-{{ toYaml .Values.kubelet.serviceMonitor.resourceRelabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubelet.serviceMonitor.resourceRelabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
+   {{- else }}
+@@ -121,7 +124,7 @@
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.kubelet.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubelet.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.cAdvisor }}
+   - port: http-metrics
+@@ -139,11 +142,11 @@
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.cAdvisorRelabelings }}
+     relabelings:
+-{{ toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | indent 4) . }}
  {{- end }}
  {{- if .Values.kubelet.serviceMonitor.resource }}
    - port: http-metrics
@@ -33,3 +81,12 @@
      {{- if .Values.kubelet.serviceMonitor.interval }}
      interval: {{ .Values.kubelet.serviceMonitor.interval }}
      {{- end }}
+@@ -157,7 +160,7 @@
+ {{- end }}
+ {{- if .Values.kubelet.serviceMonitor.resourceRelabelings }}
+     relabelings:
+-{{ toYaml .Values.kubelet.serviceMonitor.resourceRelabelings | indent 4 }}
++{{ tpl (toYaml .Values.kubelet.serviceMonitor.resourceRelabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch
index ea2734462..3b982db5c 100644
--- a/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/templates/exporters/node-exporter/servicemonitor.yaml.patch
@@ -9,3 +9,11 @@
  apiVersion: monitoring.coreos.com/v1
  kind: ServiceMonitor
  metadata:
+@@ -33,6 +36,6 @@
+ {{- end }}
+ {{- if .Values.nodeExporter.serviceMonitor.relabelings }}
+     relabelings:
+-{{ toYaml .Values.nodeExporter.serviceMonitor.relabelings | indent 4 }}
++{{ tpl (toYaml .Values.nodeExporter.serviceMonitor.relabelings | indent 4) . }}
+ {{- end }}
+ {{- end }}
diff --git a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch
index c8b6f6b2b..ff4190798 100644
--- a/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch
+++ b/packages/rancher-monitoring/generated-changes/patch/values.yaml.patch
@@ -471,7 +471,26 @@
    templateFiles: {}
    #
    ## An example template:
-@@ -395,7 +834,7 @@
+@@ -366,14 +805,16 @@
+ 
+     bearerTokenFile:
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -395,7 +836,7 @@
      ## Image of Alertmanager
      ##
      image:
@@ -480,7 +499,7 @@
        tag: v0.22.2
        sha: ""
  
-@@ -507,9 +946,13 @@
+@@ -507,9 +948,13 @@
      ## Define resources requests and limits for single Pods.
      ## ref: https://kubernetes.io/docs/user-guide/compute-resources/
      ##
@@ -497,7 +516,7 @@
  
      ## Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node.
      ## The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided.
-@@ -623,6 +1066,30 @@
+@@ -623,6 +1068,30 @@
    enabled: true
    namespaceOverride: ""
  
@@ -528,7 +547,7 @@
    ## ForceDeployDatasources Create datasource configmap even if grafana deployment has been disabled
    ##
    forceDeployDatasources: false
-@@ -679,6 +1146,7 @@
+@@ -679,6 +1148,7 @@
      dashboards:
        enabled: true
        label: grafana_dashboard
@@ -536,7 +555,7 @@
  
        ## Annotations for Grafana dashboard configmaps
        ##
-@@ -737,7 +1205,60 @@
+@@ -737,7 +1207,60 @@
    ## Passed to grafana subchart and used by servicemonitor below
    ##
    service:
@@ -598,7 +617,27 @@
  
    ## If true, create a serviceMonitor for grafana
    ##
-@@ -767,6 +1288,14 @@
+@@ -751,14 +1274,17 @@
+     # in grafana.ini
+     path: "/metrics"
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -767,6 +1293,14 @@
      #   targetLabel: nodename
      #   replacement: $1
      #   action: replace
@@ -613,7 +652,103 @@
  
  ## Component scraping the kube api server
  ##
-@@ -928,7 +1457,7 @@
+@@ -789,12 +1323,17 @@
+         component: apiserver
+         provider: kubernetes
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
++
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
++    ##
+     relabelings: []
+     # - sourceLabels:
+     #     - __meta_kubernetes_namespace
+@@ -839,7 +1378,9 @@
+     resource: false
+     # From kubernetes 1.18, /metrics/resource/v1alpha1 renamed to /metrics/resource
+     resourcePath: "/metrics/resource/v1alpha1"
+-    ## Metric relabellings to apply to samples before ingestion
++
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     cAdvisorMetricRelabelings: []
+     # - sourceLabels: [__name__, image]
+@@ -853,7 +1394,8 @@
+     #   replacement: $1
+     #   action: drop
+ 
+-    ## Metric relabellings to apply to samples before ingestion
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     probesMetricRelabelings: []
+     # - sourceLabels: [__name__, image]
+@@ -867,9 +1409,10 @@
+     #   replacement: $1
+     #   action: drop
+ 
+-    #   relabel configs to apply to samples before ingestion.
+-    #   metrics_path is required to match upstream rules and charts
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
++    ## metrics_path is required to match upstream rules and charts
+     cAdvisorRelabelings:
+       - sourceLabels: [__metrics_path__]
+         targetLabel: metrics_path
+@@ -880,6 +1423,9 @@
+     #   replacement: $1
+     #   action: replace
+ 
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
++    ##
+     probesRelabelings:
+       - sourceLabels: [__metrics_path__]
+         targetLabel: metrics_path
+@@ -890,6 +1436,9 @@
+     #   replacement: $1
+     #   action: replace
+ 
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
++    ##
+     resourceRelabelings:
+       - sourceLabels: [__metrics_path__]
+         targetLabel: metrics_path
+@@ -900,6 +1449,9 @@
+     #   replacement: $1
+     #   action: replace
+ 
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
++    ##
+     metricRelabelings: []
+     # - sourceLabels: [__name__, image]
+     #   separator: ;
+@@ -912,9 +1464,10 @@
+     #   replacement: $1
+     #   action: drop
+ 
+-    #   relabel configs to apply to samples before ingestion.
+-    #   metrics_path is required to match upstream rules and charts
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
++    ## metrics_path is required to match upstream rules and charts
+     relabelings:
+       - sourceLabels: [__metrics_path__]
+         targetLabel: metrics_path
+@@ -928,7 +1481,7 @@
  ## Component scraping the kube controller manager
  ##
  kubeControllerManager:
@@ -622,7 +757,83 @@
  
    ## If your kube controller manager is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -1075,7 +1604,7 @@
+@@ -967,14 +1520,16 @@
+     # Name of the server to use when validating TLS certificate
+     serverName: null
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1002,14 +1557,16 @@
+     ##
+     proxyUrl: ""
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1041,14 +1598,16 @@
+     ##
+     proxyUrl: ""
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1057,12 +1616,17 @@
+     #   targetLabel: nodename
+     #   replacement: $1
+     #   action: replace
++
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
++    ##
+     dnsmasqMetricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     dnsmasqRelabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1075,7 +1639,7 @@
  ## Component scraping etcd
  ##
  kubeEtcd:
@@ -631,7 +842,26 @@
  
    ## If your etcd is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -1140,7 +1669,7 @@
+@@ -1119,14 +1683,16 @@
+     certFile: ""
+     keyFile: ""
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1140,7 +1706,7 @@
  ## Component scraping kube scheduler
  ##
  kubeScheduler:
@@ -640,7 +870,26 @@
  
    ## If your kube scheduler is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -1198,7 +1727,7 @@
+@@ -1177,14 +1743,16 @@
+     ## Name of the server to use when validating TLS certificate
+     serverName: null
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1198,7 +1766,7 @@
  ## Component scraping kube proxy
  ##
  kubeProxy:
@@ -649,7 +898,45 @@
  
    ## If your kube proxy is not deployed as a pod, specify IPs it can be found on
    ##
-@@ -1294,6 +1823,13 @@
+@@ -1229,14 +1797,16 @@
+     ##
+     https: false
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - action: keep
+@@ -1262,14 +1832,16 @@
+     ##
+     selectorOverride: {}
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - action: keep
+     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
+     #   sourceLabels: [__name__]
+ 
+-    #   relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1294,6 +1866,13 @@
      create: true
    podSecurityPolicy:
      enabled: true
@@ -663,7 +950,27 @@
  
  ## Deploy node exporter as a daemonset to all nodes
  ##
-@@ -1347,6 +1883,16 @@
+@@ -1317,7 +1896,8 @@
+     ##
+     scrapeTimeout: ""
+ 
+-    ## Metric relabel configs to apply to samples before ingestion.
++    ## MetricRelabelConfigs to apply to samples after scraping, but before ingestion.
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     metricRelabelings: []
+     # - sourceLabels: [__name__]
+@@ -1326,7 +1906,8 @@
+     #   replacement: $1
+     #   action: drop
+ 
+-    ## relabel configs to apply to samples before ingestion.
++    ## RelabelConfigs to apply to samples before scraping
++    ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#relabelconfig
+     ##
+     relabelings: []
+     # - sourceLabels: [__meta_kubernetes_pod_node_name]
+@@ -1347,6 +1928,16 @@
    extraArgs:
      - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/.+)($|/)
      - --collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$
@@ -680,7 +987,7 @@
  
  ## Manages Prometheus and Alertmanager components
  ##
-@@ -1359,8 +1905,8 @@
+@@ -1359,8 +1950,8 @@
      enabled: true
      # Value must match version names from https://golang.org/pkg/crypto/tls/#pkg-constants
      tlsMinVersion: VersionTLS13
@@ -691,7 +998,7 @@
  
    ## Admission webhook support for PrometheusRules resources added in Prometheus Operator 0.30 can be enabled to prevent incorrectly formatted
    ## rules from making their way into prometheus and potentially preventing the container from starting
-@@ -1377,7 +1923,7 @@
+@@ -1377,7 +1968,7 @@
      patch:
        enabled: true
        image:
@@ -700,7 +1007,7 @@
          tag: v1.0
          sha: "f3b6b39a6062328c095337b4cadcefd1612348fdd5190b1dcbcb9b9e90bd8068"
          pullPolicy: IfNotPresent
-@@ -1526,13 +2072,13 @@
+@@ -1526,13 +2117,13 @@
  
    ## Resource limits & requests
    ##
@@ -721,7 +1028,7 @@
  
    # Required for use in managed kubernetes clusters (such as AWS EKS) with custom CNI (such as calico),
    # because control-plane managed by AWS cannot communicate with pods' IP CIDR and admission webhooks are not working
-@@ -1585,7 +2131,7 @@
+@@ -1585,7 +2176,7 @@
    ## Prometheus-operator image
    ##
    image:
@@ -730,7 +1037,7 @@
      tag: v0.50.0
      sha: ""
      pullPolicy: IfNotPresent
-@@ -1601,7 +2147,7 @@
+@@ -1601,7 +2192,7 @@
    ## Prometheus-config-reloader image to use for config and rule reloading
    ##
    prometheusConfigReloaderImage:
@@ -739,7 +1046,7 @@
      tag: v0.50.0
      sha: ""
  
-@@ -1736,7 +2282,7 @@
+@@ -1736,7 +2327,7 @@
      port: 9090
  
      ## To be used with a proxy extraContainer port
@@ -748,7 +1055,7 @@
  
      ## List of IP addresses at which the Prometheus server service is available
      ## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
-@@ -2009,7 +2555,7 @@
+@@ -2009,7 +2600,7 @@
      ## Image of Prometheus.
      ##
      image:
@@ -757,7 +1064,7 @@
        tag: v2.28.1
        sha: ""
  
-@@ -2072,6 +2618,11 @@
+@@ -2072,6 +2663,11 @@
      ##
      externalUrl: ""
  
@@ -769,7 +1076,7 @@
      ## Define which Nodes the Pods are scheduled on.
      ## ref: https://kubernetes.io/docs/user-guide/node-selection/
      ##
-@@ -2104,7 +2655,7 @@
+@@ -2104,7 +2700,7 @@
      ## prometheus resource to be created with selectors based on values in the helm deployment,
      ## which will also match the PrometheusRule resources created
      ##
@@ -778,7 +1085,7 @@
  
      ## PrometheusRules to be selected for target discovery.
      ## If {}, select all PrometheusRules
-@@ -2129,7 +2680,7 @@
+@@ -2129,7 +2725,7 @@
      ## prometheus resource to be created with selectors based on values in the helm deployment,
      ## which will also match the servicemonitors created
      ##
@@ -787,7 +1094,7 @@
  
      ## ServiceMonitors to be selected for target discovery.
      ## If {}, select all ServiceMonitors
-@@ -2152,7 +2703,7 @@
+@@ -2152,7 +2748,7 @@
      ## prometheus resource to be created with selectors based on values in the helm deployment,
      ## which will also match the podmonitors created
      ##
@@ -796,7 +1103,7 @@
  
      ## PodMonitors to be selected for target discovery.
      ## If {}, select all PodMonitors
-@@ -2283,9 +2834,13 @@
+@@ -2283,9 +2879,13 @@
  
      ## Resource limits & requests
      ##
@@ -813,7 +1120,7 @@
  
      ## Prometheus StorageSpec for persistent data
      ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md
-@@ -2308,7 +2863,13 @@
+@@ -2308,7 +2908,13 @@
      #    medium: Memory
  
      # Additional volumes on the output StatefulSet definition.
@@ -828,19 +1135,26 @@
  
      # Additional VolumeMounts on the output StatefulSet definition.
      volumeMounts: []
-@@ -2423,6 +2984,11 @@
+@@ -2422,6 +3028,18 @@
+     ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#thanosspec
      ##
      thanos: {}
- 
++      # secretProviderClass:
++      #   provider: gcp
++      #   parameters:
++      #     secrets: |
++      #       - resourceName: "projects/$PROJECT_ID/secrets/testsecret/versions/latest"
++      #         fileName: "objstore.yaml"
++      # objectStorageConfigFile: /var/secrets/object-store.yaml
++
 +    proxy:
 +      image:
 +        repository: rancher/mirrored-library-nginx
 +        tag: 1.21.1-alpine
-+
+ 
      ## Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod.
      ## if using proxy extraContainer update targetPort with proxy container port
-     containers: []
-@@ -2433,7 +2999,7 @@
+@@ -2433,7 +3051,7 @@
  
      ## PortName to use for Prometheus.
      ##