mirror of https://github.com/linkerd/linkerd2.git
fix alertmanagers casing (one word) (#5377)
fixes #5371 Signed-off-by: naseemkullah <naseem@transit.app>
This commit is contained in:
parent
e7f2a3fba3
commit
2cc96d4ab9
|
@ -697,7 +697,7 @@ data:
|
|||
values:
|
||||
- disabled
|
||||
prometheus:
|
||||
alertManagers:
|
||||
alertmanagers:
|
||||
- scheme: http
|
||||
static_configs:
|
||||
- targets:
|
||||
|
|
|
@ -18,7 +18,7 @@ prometheus:
|
|||
relabel_configs:
|
||||
- action: labelmap
|
||||
regex: __meta_kubernetes_node_label_(.+)
|
||||
alertManagers:
|
||||
alertmanagers:
|
||||
- scheme: http
|
||||
static_configs:
|
||||
- targets:
|
||||
|
|
|
@ -106,8 +106,8 @@ Kubernetes: `>=1.13.0-0`
|
|||
| linkerdVersion | string | `"linkerdVersionValue"` | control plane version. See Proxy section for proxy version |
|
||||
| namespace | string | `"linkerd-viz"` | Namespace in which the Linkerd Viz extension has to be installed |
|
||||
| nodeSelector | object | `{"beta.kubernetes.io/os":"linux"}` | NodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information |
|
||||
| prometheus.alertManagers | string | `nil` | Alertmanager instances the Prometheus server sends alerts to configured via the static_configs parameter. |
|
||||
| prometheus.alertRelabelConfigs | string | `nil` | Alert relabeling is applied to alerts before they are sent to the Alertmanager. |
|
||||
| prometheus.alertmanagers | string | `nil` | Alertmanager instances the Prometheus server sends alerts to configured via the static_configs parameter. |
|
||||
| prometheus.args | object | `{"config.file":"/etc/prometheus/prometheus.yml","log.level":"info","storage.tsdb.path":"/data","storage.tsdb.retention.time":"6h"}` | Command line options for Prometheus binary |
|
||||
| prometheus.enabled | bool | `true` | toggle field to enable or disable prometheus |
|
||||
| prometheus.globalConfig | object | `{"evaluation_interval":"10s","scrape_interval":"10s","scrape_timeout":"10s"}` | The global configuration specifies parameters that are valid in all other configuration contexts. |
|
||||
|
|
|
@ -154,15 +154,15 @@ data:
|
|||
{{- toYaml .Values.prometheus.scrapeConfigs | trim | nindent 4 }}
|
||||
{{- end }}
|
||||
|
||||
{{- if (or .Values.prometheus.alertManagers .Values.prometheus.alertRelabelConfigs) }}
|
||||
{{- if (or .Values.prometheus.alertmanagers .Values.prometheus.alertRelabelConfigs) }}
|
||||
alerting:
|
||||
alert_relabel_configs:
|
||||
{{- if .Values.prometheus.alertRelabelConfigs }}
|
||||
{{- toYaml .Values.prometheus.alertRelabelConfigs | trim | nindent 6 }}
|
||||
{{- end }}
|
||||
alertmanagers:
|
||||
{{- if .Values.prometheus.alertManagers }}
|
||||
{{- toYaml .Values.prometheus.alertManagers | trim | nindent 6 }}
|
||||
{{- if .Values.prometheus.alertmanagers }}
|
||||
{{- toYaml .Values.prometheus.alertmanagers | trim | nindent 6 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
|
|
|
@ -264,7 +264,7 @@ prometheus:
|
|||
|
||||
# -- Alertmanager instances the Prometheus server sends alerts to configured via
|
||||
# the static_configs parameter.
|
||||
alertManagers:
|
||||
alertmanagers:
|
||||
# Ex:
|
||||
# - scheme: http
|
||||
# static_configs:
|
||||
|
|
Loading…
Reference in New Issue