[kube-prometheus-stack] move relabelings filed to servicemonitor in kubeApiServer (#1014)

* move relabelings filed to servicemonitor in kubeApiServer

Signed-off-by: devincd <505259926@qq.com>

* raise chart version

Signed-off-by: devincd <505259926@qq.com>

* fix bug

Signed-off-by: devincd <505259926@qq.com>

Co-authored-by: André Bauer <monotek@users.noreply.github.com>
Co-authored-by: Bismarck Paliz <bismarck.paliz@jet.com>

charts/kube-prometheus-stack/Chart.yaml

@@ -18,7 +18,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 16.4.0
+version: 16.4.1
 appVersion: 0.48.0
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml

@@ -22,9 +22,9 @@ spec:
     metricRelabelings:
 {{ tpl (toYaml .Values.kubeApiServer.serviceMonitor.metricRelabelings | indent 6) . }}
 {{- end }}
-{{- if .Values.kubeApiServer.relabelings }}
+{{- if .Values.kubeApiServer.serviceMonitor.relabelings }}
     relabelings:
-{{ toYaml .Values.kubeApiServer.relabelings | indent 6 }}
+{{ toYaml .Values.kubeApiServer.serviceMonitor.relabelings | indent 6 }}
 {{- end }}
     tlsConfig:
       caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt

charts/kube-prometheus-stack/values.yaml

@@ -754,19 +754,6 @@ kubeApiServer:
   tlsConfig:
     serverName: kubernetes
     insecureSkipVerify: false
-
-  ## If your API endpoint address is not reachable (as in AKS) you can replace it with the kubernetes service
-  ##
-  relabelings: []
-  # - sourceLabels:
-  #     - __meta_kubernetes_namespace
-  #     - __meta_kubernetes_service_name
-  #     - __meta_kubernetes_endpoint_port_name
-  #   action: keep
-  #   regex: default;kubernetes;https
-  # - targetLabel: __address__
-  #   replacement: kubernetes.default.svc:443
-
   serviceMonitor:
     ## Scrape interval. If not set, the Prometheus default scrape interval is used.
     ##
@@ -787,6 +774,15 @@ kubeApiServer:
     # - action: keep
     #   regex: 'kube_(daemonset|deployment|pod|namespace|node|statefulset).+'
     #   sourceLabels: [__name__]
+    relabelings: []
+    # - sourceLabels:
+    #     - __meta_kubernetes_namespace
+    #     - __meta_kubernetes_service_name
+    #     - __meta_kubernetes_endpoint_port_name
+    #   action: keep
+    #   regex: default;kubernetes;https
+    # - targetLabel: __address__
+    #   replacement: kubernetes.default.svc:443
 
 ## Component scraping the kubelet and kubelet-hosted cAdvisor
 ##