diff --git a/bitnami/kube-prometheus/Chart.yaml b/bitnami/kube-prometheus/Chart.yaml index ef468d8e93..f34b9ae1e0 100644 --- a/bitnami/kube-prometheus/Chart.yaml +++ b/bitnami/kube-prometheus/Chart.yaml @@ -32,4 +32,4 @@ maintainers: name: kube-prometheus sources: - https://github.com/bitnami/charts/tree/main/bitnami/kube-prometheus -version: 8.13.1 +version: 8.14.0 diff --git a/bitnami/kube-prometheus/README.md b/bitnami/kube-prometheus/README.md index 638f574e20..b2112eefde 100644 --- a/bitnami/kube-prometheus/README.md +++ b/bitnami/kube-prometheus/README.md @@ -666,6 +666,8 @@ The command removes all the Kubernetes components associated with the chart and | `kubeApiServer.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `component` | | `kubeApiServer.serviceMonitor.metricRelabelings` | Metric relabeling | `[]` | | `kubeApiServer.serviceMonitor.relabelings` | Relabel configs | `[]` | +| `kubeApiServer.serviceMonitor.labels` | Extra labels for the ServiceMonitor | `{}` | +| `kubeApiServer.serviceMonitor.annotations` | Extra annotations for the ServiceMonitor | `{}` | | `kubeControllerManager.enabled` | Create a ServiceMonitor to scrape kube-controller-manager service | `true` | | `kubeControllerManager.endpoints` | If your kube controller manager is not deployed as a pod, specify IPs it can be found on | `[]` | | `kubeControllerManager.namespace` | Namespace where kube-controller-manager service is deployed. | `kube-system` | @@ -681,6 +683,8 @@ The command removes all the Kubernetes components associated with the chart and | `kubeControllerManager.serviceMonitor.serverName` | Name of the server to use when validating TLS certificate | `""` | | `kubeControllerManager.serviceMonitor.metricRelabelings` | Metric relabeling | `[]` | | `kubeControllerManager.serviceMonitor.relabelings` | Relabel configs | `[]` | +| `kubeControllerManager.serviceMonitor.labels` | Extra labels for the ServiceMonitor | `{}` | +| `kubeControllerManager.serviceMonitor.annotations` | Extra annotations for the ServiceMonitor | `{}` | | `kubeScheduler.enabled` | Create a ServiceMonitor to scrape kube-scheduler service | `true` | | `kubeScheduler.endpoints` | If your kube scheduler is not deployed as a pod, specify IPs it can be found on | `[]` | | `kubeScheduler.namespace` | Namespace where kube-scheduler service is deployed. | `kube-system` | @@ -709,6 +713,8 @@ The command removes all the Kubernetes components associated with the chart and | `coreDns.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus. | `k8s-app` | | `coreDns.serviceMonitor.metricRelabelings` | Metric relabel configs to apply to samples before ingestion. | `[]` | | `coreDns.serviceMonitor.relabelings` | Relabel configs to apply to samples before ingestion. | `[]` | +| `coreDns.serviceMonitor.labels` | Extra labels for the ServiceMonitor | `{}` | +| `coreDns.serviceMonitor.annotations` | Extra annotations for the ServiceMonitor | `{}` | | `kubeProxy.enabled` | Create a ServiceMonitor to scrape the kube-proxy Service | `true` | | `kubeProxy.endpoints` | If your kube-proxy is not deployed as a pod, specify IPs it can be found on | `[]` | | `kubeProxy.namespace` | Namespace where kube-proxy service is deployed. | `kube-system` | diff --git a/bitnami/kube-prometheus/templates/alertmanager/servicemonitor.yaml b/bitnami/kube-prometheus/templates/alertmanager/servicemonitor.yaml index f6bda52176..96f312e39a 100644 --- a/bitnami/kube-prometheus/templates/alertmanager/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/alertmanager/servicemonitor.yaml @@ -11,6 +11,7 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.alertmanager.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} @@ -18,6 +19,7 @@ metadata: {{- if .Values.alertmanager.serviceMonitor.annotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.alertmanager.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: jobLabel: {{ .Values.alertmanager.serviceMonitor.jobLabel | quote }} selector: diff --git a/bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml index 9a1e92c7aa..3c4432789f 100644 --- a/bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml @@ -6,19 +6,21 @@ metadata: namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: {{ template "kube-prometheus.fullname" . }}-coredns - {{- if .Values.kubeProxy.serviceMonitor.labels }} - {{- include "common.tplvalues.render" ( dict "value" .Values.kubeProxy.serviceMonitor.labels "context" $ ) | nindent 4 }} + {{- if .Values.coreDns.serviceMonitor.labels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.coreDns.serviceMonitor.labels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.coreDns.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} - {{- if .Values.kubeProxy.serviceMonitor.annotations }} - {{- include "common.tplvalues.render" ( dict "value" .Values.kubeProxy.serviceMonitor.annotations "context" $ ) | nindent 4 }} + {{- if .Values.coreDns.serviceMonitor.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.coreDns.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: jobLabel: {{ .Values.coreDns.serviceMonitor.jobLabel }} selector: diff --git a/bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml index 9c5c2f080b..e6e90b01b8 100644 --- a/bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml @@ -6,19 +6,21 @@ metadata: namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: apiserver - {{- if .Values.kubeProxy.serviceMonitor.labels }} - {{- include "common.tplvalues.render" ( dict "value" .Values.kubeProxy.serviceMonitor.labels "context" $ ) | nindent 4 }} + {{- if .Values.kubeApiServer.serviceMonitor.labels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.kubeApiServer.serviceMonitor.labels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.kubeApiServer.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} - {{- if .Values.kubeProxy.serviceMonitor.annotations }} - {{- include "common.tplvalues.render" ( dict "value" .Values.kubeProxy.serviceMonitor.annotations "context" $ ) | nindent 4 }} + {{- if .Values.kubeApiServer.serviceMonitor.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.kubeApiServer.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: jobLabel: {{ .Values.kubeApiServer.serviceMonitor.jobLabel }} selector: diff --git a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml index de89395c6b..10ea854fca 100644 --- a/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml @@ -6,19 +6,21 @@ metadata: namespace: {{ include "common.names.namespace" . | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: kube-controller-manager - {{- if .Values.kubeProxy.serviceMonitor.labels }} - {{- include "common.tplvalues.render" ( dict "value" .Values.kubeProxy.serviceMonitor.labels "context" $ ) | nindent 4 }} + {{- if .Values.kubeControllerManager.serviceMonitor.labels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.kubeControllerManager.serviceMonitor.labels "context" $ ) | nindent 4 }} {{- end }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.kubeControllerManager.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} - {{- if .Values.kubeProxy.serviceMonitor.annotations }} - {{- include "common.tplvalues.render" ( dict "value" .Values.kubeProxy.serviceMonitor.annotations "context" $ ) | nindent 4 }} + {{- if .Values.kubeControllerManager.serviceMonitor.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.kubeControllerManager.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: jobLabel: {{ .Values.kubeControllerManager.serviceMonitor.jobLabel }} selector: diff --git a/bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml index 3f0d4ee439..1cbdda6083 100644 --- a/bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml @@ -12,6 +12,7 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.kubeProxy.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} @@ -19,6 +20,7 @@ metadata: {{- if .Values.kubeProxy.serviceMonitor.annotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.kubeProxy.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: jobLabel: {{ .Values.kubeProxy.serviceMonitor.jobLabel }} selector: diff --git a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml index 3fa6b2bd9d..d979f73a79 100644 --- a/bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml @@ -12,6 +12,7 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.kubeScheduler.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} @@ -19,6 +20,7 @@ metadata: {{- if .Values.kubeScheduler.serviceMonitor.annotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.kubeScheduler.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: jobLabel: {{ .Values.kubeScheduler.serviceMonitor.jobLabel }} selector: diff --git a/bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml b/bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml index 8018d35d37..01fd8753bf 100644 --- a/bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml @@ -12,6 +12,7 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.kubelet.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} @@ -19,6 +20,7 @@ metadata: {{- if .Values.kubelet.serviceMonitor.annotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: jobLabel: {{ .Values.kubelet.serviceMonitor.jobLabel }} selector: diff --git a/bitnami/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml b/bitnami/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml index 38c502efcd..88486d537c 100644 --- a/bitnami/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml +++ b/bitnami/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml @@ -11,6 +11,7 @@ metadata: {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} {{- end }} + {{- if or .Values.commonAnnotations .Values.operator.serviceMonitor.annotations }} annotations: {{- if .Values.commonAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} @@ -18,6 +19,7 @@ metadata: {{- if .Values.operator.serviceMonitor.annotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.operator.serviceMonitor.annotations "context" $ ) | nindent 4 }} {{- end }} + {{- end }} spec: endpoints: - port: http diff --git a/bitnami/kube-prometheus/values.yaml b/bitnami/kube-prometheus/values.yaml index ee42a048bc..7591837c56 100644 --- a/bitnami/kube-prometheus/values.yaml +++ b/bitnami/kube-prometheus/values.yaml @@ -2518,6 +2518,12 @@ kubeApiServer: ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config ## relabelings: [] + ## @param kubeApiServer.serviceMonitor.labels Extra labels for the ServiceMonitor + ## + labels: { } + ## @param kubeApiServer.serviceMonitor.annotations Extra annotations for the ServiceMonitor + ## + annotations: { } ## Component scraping the kube-controller-manager ## kubeControllerManager: @@ -2579,6 +2585,12 @@ kubeControllerManager: ## ref: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config ## relabelings: [] + ## @param kubeControllerManager.serviceMonitor.labels Extra labels for the ServiceMonitor + ## + labels: { } + ## @param kubeControllerManager.serviceMonitor.annotations Extra annotations for the ServiceMonitor + ## + annotations: { } ## Component scraping kube scheduler ## kubeScheduler: @@ -2706,6 +2718,12 @@ coreDns: ## action: replace ## relabelings: [] + ## @param coreDns.serviceMonitor.labels Extra labels for the ServiceMonitor + ## + labels: {} + ## @param coreDns.serviceMonitor.annotations Extra annotations for the ServiceMonitor + ## + annotations: {} ## Component scraping the kube-proxy ## kubeProxy: