Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-12 14:57:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/kube-prometheus] operator/alertmanager serviceMonitor extraParams (#16088)

Browse Source 
* [bitnami/kube-prometheus] extraParameters for the operator/alertmanager serviceMonitors http endpoint

Signed-off-by: Leo Tomas <tomasl@rcvs.org.uk>

* [bitnami/kube-prometheus] Bump version

Signed-off-by: Leo Tomas <tomasl@rcvs.org.uk>

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

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* [bitnami/kube-prometheus] Bumping minor version

Signed-off-by: Leo Tomas <tomasl@rcvs.org.uk>

---------

Signed-off-by: Leo Tomas <tomasl@rcvs.org.uk>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
leotomas837
2023-04-19 09:19:29 +01:00
committed by GitHub
parent c12bc0a28f
commit e2d2275988
5 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,4 +35,4 @@ sources:
- https://github.com/bitnami/containers/tree/main/bitnami/prometheus
- https://github.com/bitnami/containers/tree/main/bitnami/alertmanager
- https://github.com/prometheus-operator/kube-prometheus
version: 8.5.0
version: 8.6.0

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

@@ -141,6 +141,7 @@ The command removes all the Kubernetes components associated with the chart and
| `operator.serviceMonitor.scrapeTimeout` | Timeout after which the scrape is ended | `""` |
| `operator.serviceMonitor.labels` | Extra labels for the ServiceMonitor | `{}` |
| `operator.serviceMonitor.annotations` | Extra annotations for the ServiceMonitor | `{}` |
| `operator.serviceMonitor.extraParameters` | Any extra parameter to be added to the endpoint configured in the ServiceMonitor | `{}` |
| `operator.resources` | Configure resource requests and limits | `{}` |
| `operator.podAffinityPreset` | Pod affinity preset | `""` |
| `operator.podAntiAffinityPreset` | Prometheus Operator Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |
@@ -453,6 +454,7 @@ The command removes all the Kubernetes components associated with the chart and
| `alertmanager.serviceMonitor.labels` | Extra labels for the ServiceMonitor | `{}` |
| `alertmanager.serviceMonitor.annotations` | Extra annotations for the ServiceMonitor | `{}` |
| `alertmanager.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels | `false` |
| `alertmanager.serviceMonitor.extraParameters` | Any extra parameter to be added to the endpoint configured in the ServiceMonitor | `{}` |
| `alertmanager.ingress.enabled` | Enable ingress controller resource | `false` |
| `alertmanager.ingress.pathType` | Ingress Path type | `ImplementationSpecific` |
| `alertmanager.ingress.apiVersion` | Override API Version (automatically detected if not set) | `""` |

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

@@ -46,4 +46,7 @@ spec:
{{- if .Values.alertmanager.serviceMonitor.relabelings }}
relabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.alertmanager.serviceMonitor.relabelings "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.alertmanager.serviceMonitor.extraParameters }}
{{- toYaml .Values.alertmanager.serviceMonitor.extraParameters | nindent 6 }}
{{- end }}
{{- end }}

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

@@ -34,6 +34,9 @@ spec:
{{- if .Values.operator.serviceMonitor.relabelings }}
relabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.operator.serviceMonitor.relabelings "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.operator.serviceMonitor.extraParameters }}
{{- toYaml .Values.operator.serviceMonitor.extraParameters | nindent 6 }}
{{- end }}
jobLabel: {{ .Values.operator.serviceMonitor.jobLabel | quote }}
selector:
matchLabels: {{- include "kube-prometheus.operator.matchLabels" . | nindent 6 }}

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

@@ -290,6 +290,11 @@ operator:
## @param operator.serviceMonitor.annotations Extra annotations for the ServiceMonitor
##
annotations: {}
## @param operator.serviceMonitor.extraParameters Any extra parameter to be added to the endpoint configured in the ServiceMonitor
## (e.g. tlsConfig for further customization of the HTTPS behavior)
## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.Endpoint
##
extraParameters: {}
## @param operator.resources Configure resource requests and limits
## ref: https://kubernetes.io/docs/user-guide/compute-resources/
##
@@ -1610,6 +1615,11 @@ alertmanager:
## @param alertmanager.serviceMonitor.honorLabels honorLabels chooses the metric's labels on collisions with target labels
##
honorLabels: false
## @param alertmanager.serviceMonitor.extraParameters Any extra parameter to be added to the endpoint configured in the ServiceMonitor
## (e.g. tlsConfig for further customization of the HTTPS behavior)
## ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#monitoring.coreos.com/v1.Endpoint
##
extraParameters: {}
## Configure the ingress resource that allows you to access the
## Alertmanager installation. Set up the URL
## ref: https://kubernetes.io/docs/user-guide/ingress/