diff --git a/viz/charts/linkerd-viz/README.md b/viz/charts/linkerd-viz/README.md index a64b54969b7e5..70e35a698e9de 100644 --- a/viz/charts/linkerd-viz/README.md +++ b/viz/charts/linkerd-viz/README.md @@ -145,6 +145,7 @@ Kubernetes: `>=1.21.0-0` | prometheus.logFormat | string | defaultLogLevel | log format (plain, json) of the prometheus instance | | prometheus.logLevel | string | defaultLogLevel | log level of the prometheus instance | | prometheus.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information | +| prometheus.podAnnotations | object | `{}` | annotations for the prometheus pod | | prometheus.proxy | string | `nil` | | | prometheus.remoteWrite | string | `nil` | Allows transparently sending samples to an endpoint. Mostly used for long term storage. | | prometheus.resources.cpu.limit | string | `nil` | Maximum amount of CPU units that the prometheus container can use | diff --git a/viz/charts/linkerd-viz/templates/prometheus.yaml b/viz/charts/linkerd-viz/templates/prometheus.yaml index d7615c0ffca05..9c2927d186e83 100644 --- a/viz/charts/linkerd-viz/templates/prometheus.yaml +++ b/viz/charts/linkerd-viz/templates/prometheus.yaml @@ -218,6 +218,7 @@ spec: {{- include "partials.proxy.config.annotations" .resources | nindent 8 }} {{- end }} {{- with .Values.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }} + {{- with .Values.prometheus.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }} linkerd.io/inject: enabled config.alpha.linkerd.io/proxy-wait-before-exit-seconds: "0" labels: diff --git a/viz/charts/linkerd-viz/values.yaml b/viz/charts/linkerd-viz/values.yaml index dbbf37ac14997..9bd31407f87b4 100644 --- a/viz/charts/linkerd-viz/values.yaml +++ b/viz/charts/linkerd-viz/values.yaml @@ -440,6 +440,9 @@ prometheus: scrape_interval: 10s scrape_timeout: 10s evaluation_interval: 10s + + # -- annotations for the prometheus pod + podAnnotations: {} # -- Alert relabeling is applied to alerts before they are sent to the # Alertmanager.