Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-02 16:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/kube-prometheus] fix: Fix servicemonitor annotations and ArgoCD sync (#17142)

Browse Source 
* fix: Fix servicemonitor annotations and ArgoCD sync
Signed-off-by: Jakub Stehlik <jubo.stehlik@gmail.com>

Signed-off-by: Jakub Stehlik <jubo.stehlik@gmail.com>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Signed-off-by: Jakub Stehlik <jubo.stehlik@gmail.com>

* chore: Bump version

Signed-off-by: Jakub Stehlik <jubo.stehlik@gmail.com>

---------

Signed-off-by: Jakub Stehlik <jubo.stehlik@gmail.com>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Jakub Stehlík
2023-06-19 09:58:47 +02:00
committed by GitHub
parent 4290ffe6a9
commit 7e5877d3a4
11 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/kube-prometheus/Chart.yaml
View File

@@ -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

6
bitnami/kube-prometheus/README.md
View File

@@ -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` |

2
bitnami/kube-prometheus/templates/alertmanager/servicemonitor.yaml
View File

@@ -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:

10
bitnami/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml
View File

@@ -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:

10
bitnami/kube-prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml
View File

@@ -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:

10
bitnami/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml
View File

@@ -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:

2
bitnami/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml
View File

@@ -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:

2
bitnami/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml
View File

@@ -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:

2
bitnami/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml
View File

@@ -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:

2
bitnami/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml
View File

@@ -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

18
bitnami/kube-prometheus/values.yaml
View File

@@ -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: