diff --git a/charts/add-ons/prometheus/values.yaml b/charts/add-ons/prometheus/values.yaml index 5a91f4938..f068a8da0 100644 --- a/charts/add-ons/prometheus/values.yaml +++ b/charts/add-ons/prometheus/values.yaml @@ -3,7 +3,7 @@ # when installing with the parent linkerd2 chart # Do not override them in this file! # If installing/upgrading with linkerd's CLI, use the `--addon-config` flag. -image: prom/prometheus:v2.15.2 +image: prom/prometheus:v2.19.3 args: storage.tsdb.path: /data storage.tsdb.retention.time: 6h @@ -12,4 +12,4 @@ args: globalConfig: scrape_interval: 10s scrape_timeout: 10s - evaluation_interval: 10s \ No newline at end of file + evaluation_interval: 10s diff --git a/charts/linkerd2/README.md b/charts/linkerd2/README.md index 5d10c09dd..0508c6182 100644 --- a/charts/linkerd2/README.md +++ b/charts/linkerd2/README.md @@ -220,7 +220,7 @@ The following table lists the configurable parameters for the Prometheus Add-On. | `prometheus.alertManagers` | Alertmanager instances the Prometheus server sends alerts to configured via the static_configs parameter. | `[]` | | `prometheus.args` | Command line options for Prometheus binary | `storage.tsdb.path: /data, storage.tsdb.retention.time: 6h, config.file: /etc/prometheus/prometheus.yml, log.level: *controller_log_level` | | `prometheus.globalConfig` | The global configuration specifies parameters that are valid in all other configuration contexts. | `scrape_interval: 10s, scrape_timeout: 10s, evaluation_interval: 10s` | -| `prometheus.image` | Docker image for the prometheus instance | `prom/prometheus:v2.15.2` | +| `prometheus.image` | Docker image for the prometheus instance | `prom/prometheus:v2.19.3` | | `prometheus.proxy.resources` | CPU and Memory resources required by proxy injected into prometheus pod (see `global.proxy.resources` for sub-fields) | values in `global.proxy.resources` | | `prometheus.persistence.storageClass` | Storage class used to create prometheus data PV. | `nil` | | `prometheus.persistence.accessMode` | PVC access mode. | `ReadWriteOnce` | diff --git a/cli/cmd/testdata/install_addon_control-plane.golden b/cli/cmd/testdata/install_addon_control-plane.golden index fa1ac14b5..76200aac5 100644 --- a/cli/cmd/testdata/install_addon_control-plane.golden +++ b/cli/cmd/testdata/install_addon_control-plane.golden @@ -2283,7 +2283,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_control-plane.golden b/cli/cmd/testdata/install_control-plane.golden index 43de37799..73f19a308 100644 --- a/cli/cmd/testdata/install_control-plane.golden +++ b/cli/cmd/testdata/install_control-plane.golden @@ -2276,7 +2276,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 60580793d..0ef2c8afd 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -3236,7 +3236,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index facccaa71..fde4351d2 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -3119,7 +3119,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index e6cf17ec6..84e0175b5 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -3119,7 +3119,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 38f4c5658..9f838e3c5 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -3119,7 +3119,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_grafana_existing.golden b/cli/cmd/testdata/install_grafana_existing.golden index 8ba6dca11..9d390ba8d 100644 --- a/cli/cmd/testdata/install_grafana_existing.golden +++ b/cli/cmd/testdata/install_grafana_existing.golden @@ -2795,7 +2795,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 084173c59..96cec68d1 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -3382,7 +3382,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 1b4248a3e..8b992821c 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -3382,7 +3382,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index ed2db9f4c..ce3558cde 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -3030,7 +3030,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_helm_output.golden b/cli/cmd/testdata/install_helm_output.golden index c566f4f5a..b0537e550 100644 --- a/cli/cmd/testdata/install_helm_output.golden +++ b/cli/cmd/testdata/install_helm_output.golden @@ -2609,7 +2609,7 @@ data: evaluation_interval: 10s scrape_interval: 10s scrape_timeout: 10s - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 tracing: enabled: false --- @@ -3179,7 +3179,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_helm_output_addons.golden b/cli/cmd/testdata/install_helm_output_addons.golden index d9db7b70a..a5c2e73ec 100644 --- a/cli/cmd/testdata/install_helm_output_addons.golden +++ b/cli/cmd/testdata/install_helm_output_addons.golden @@ -2610,7 +2610,7 @@ data: evaluation_interval: 10s scrape_interval: 10s scrape_timeout: 10s - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 tracing: collector: image: omnition/opencensus-collector:0.1.11 @@ -3186,7 +3186,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_helm_output_ha.golden b/cli/cmd/testdata/install_helm_output_ha.golden index 693a640bb..872071248 100644 --- a/cli/cmd/testdata/install_helm_output_ha.golden +++ b/cli/cmd/testdata/install_helm_output_ha.golden @@ -2852,7 +2852,7 @@ data: evaluation_interval: 10s scrape_interval: 10s scrape_timeout: 10s - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 resources: cpu: limit: "4" @@ -3442,7 +3442,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 950c289db..b32867b95 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -2812,7 +2812,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 52f97663e..cdba25f66 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -3119,7 +3119,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_restricted_dashboard.golden b/cli/cmd/testdata/install_restricted_dashboard.golden index ceda761f3..1620eab25 100644 --- a/cli/cmd/testdata/install_restricted_dashboard.golden +++ b/cli/cmd/testdata/install_restricted_dashboard.golden @@ -3051,7 +3051,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_tracing.golden b/cli/cmd/testdata/install_tracing.golden index 3080b48e7..86561af19 100644 --- a/cli/cmd/testdata/install_tracing.golden +++ b/cli/cmd/testdata/install_tracing.golden @@ -3126,7 +3126,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/install_tracing_overwrite.golden b/cli/cmd/testdata/install_tracing_overwrite.golden index 158db0a88..de0162449 100644 --- a/cli/cmd/testdata/install_tracing_overwrite.golden +++ b/cli/cmd/testdata/install_tracing_overwrite.golden @@ -3126,7 +3126,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_add-on_controlplane.golden b/cli/cmd/testdata/upgrade_add-on_controlplane.golden index 414dc2f7a..91b020816 100644 --- a/cli/cmd/testdata/upgrade_add-on_controlplane.golden +++ b/cli/cmd/testdata/upgrade_add-on_controlplane.golden @@ -2299,7 +2299,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_add-on_overwrite.golden b/cli/cmd/testdata/upgrade_add-on_overwrite.golden index d73fa7e97..6d7afc38b 100644 --- a/cli/cmd/testdata/upgrade_add-on_overwrite.golden +++ b/cli/cmd/testdata/upgrade_add-on_overwrite.golden @@ -3144,7 +3144,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_add_add-on.golden b/cli/cmd/testdata/upgrade_add_add-on.golden index 8513cff8e..6c81aafa3 100644 --- a/cli/cmd/testdata/upgrade_add_add-on.golden +++ b/cli/cmd/testdata/upgrade_add_add-on.golden @@ -3142,7 +3142,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_default.golden b/cli/cmd/testdata/upgrade_default.golden index 8f9ae3586..fb0a4258b 100644 --- a/cli/cmd/testdata/upgrade_default.golden +++ b/cli/cmd/testdata/upgrade_default.golden @@ -3135,7 +3135,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_external_issuer.golden b/cli/cmd/testdata/upgrade_external_issuer.golden index b57143110..c28c42d7f 100644 --- a/cli/cmd/testdata/upgrade_external_issuer.golden +++ b/cli/cmd/testdata/upgrade_external_issuer.golden @@ -3121,7 +3121,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_grafana_addon_overwrite.yaml b/cli/cmd/testdata/upgrade_grafana_addon_overwrite.yaml index bf162d667..9f324b243 100644 --- a/cli/cmd/testdata/upgrade_grafana_addon_overwrite.yaml +++ b/cli/cmd/testdata/upgrade_grafana_addon_overwrite.yaml @@ -3135,7 +3135,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_grafana_disabled.yaml b/cli/cmd/testdata/upgrade_grafana_disabled.yaml index efda3e28d..367a89548 100644 --- a/cli/cmd/testdata/upgrade_grafana_disabled.yaml +++ b/cli/cmd/testdata/upgrade_grafana_disabled.yaml @@ -2808,7 +2808,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_grafana_enabled.yaml b/cli/cmd/testdata/upgrade_grafana_enabled.yaml index bf162d667..9f324b243 100644 --- a/cli/cmd/testdata/upgrade_grafana_enabled.yaml +++ b/cli/cmd/testdata/upgrade_grafana_enabled.yaml @@ -3135,7 +3135,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_grafana_enabled_disabled.yaml b/cli/cmd/testdata/upgrade_grafana_enabled_disabled.yaml index efda3e28d..367a89548 100644 --- a/cli/cmd/testdata/upgrade_grafana_enabled_disabled.yaml +++ b/cli/cmd/testdata/upgrade_grafana_enabled_disabled.yaml @@ -2808,7 +2808,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_grafana_overwrite.yaml b/cli/cmd/testdata/upgrade_grafana_overwrite.yaml index 47b0d9589..b524b9f56 100644 --- a/cli/cmd/testdata/upgrade_grafana_overwrite.yaml +++ b/cli/cmd/testdata/upgrade_grafana_overwrite.yaml @@ -3135,7 +3135,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_ha.golden b/cli/cmd/testdata/upgrade_ha.golden index 66054632e..3883f7968 100644 --- a/cli/cmd/testdata/upgrade_ha.golden +++ b/cli/cmd/testdata/upgrade_ha.golden @@ -3398,7 +3398,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_keep_webhook_cabundle.golden b/cli/cmd/testdata/upgrade_keep_webhook_cabundle.golden index d682d867f..4a5bb7740 100644 --- a/cli/cmd/testdata/upgrade_keep_webhook_cabundle.golden +++ b/cli/cmd/testdata/upgrade_keep_webhook_cabundle.golden @@ -3135,7 +3135,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_nothing_addon.yaml b/cli/cmd/testdata/upgrade_nothing_addon.yaml index bf162d667..9f324b243 100644 --- a/cli/cmd/testdata/upgrade_nothing_addon.yaml +++ b/cli/cmd/testdata/upgrade_nothing_addon.yaml @@ -3135,7 +3135,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_overwrite_issuer.golden b/cli/cmd/testdata/upgrade_overwrite_issuer.golden index 65956ebd1..54e465588 100644 --- a/cli/cmd/testdata/upgrade_overwrite_issuer.golden +++ b/cli/cmd/testdata/upgrade_overwrite_issuer.golden @@ -3119,7 +3119,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_overwrite_trust_anchors-external-issuer.golden b/cli/cmd/testdata/upgrade_overwrite_trust_anchors-external-issuer.golden index 10dc1109c..9c2e2b6c5 100644 --- a/cli/cmd/testdata/upgrade_overwrite_trust_anchors-external-issuer.golden +++ b/cli/cmd/testdata/upgrade_overwrite_trust_anchors-external-issuer.golden @@ -3105,7 +3105,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_overwrite_trust_anchors.golden b/cli/cmd/testdata/upgrade_overwrite_trust_anchors.golden index 65956ebd1..54e465588 100644 --- a/cli/cmd/testdata/upgrade_overwrite_trust_anchors.golden +++ b/cli/cmd/testdata/upgrade_overwrite_trust_anchors.golden @@ -3119,7 +3119,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/cli/cmd/testdata/upgrade_two_level_webhook_cert.golden b/cli/cmd/testdata/upgrade_two_level_webhook_cert.golden index 60ec37bb3..ddbe985eb 100644 --- a/cli/cmd/testdata/upgrade_two_level_webhook_cert.golden +++ b/cli/cmd/testdata/upgrade_two_level_webhook_cert.golden @@ -3135,7 +3135,7 @@ spec: - --log.level=info - --storage.tsdb.path=/data - --storage.tsdb.retention.time=6h - image: prom/prometheus:v2.15.2 + image: prom/prometheus:v2.19.3 imagePullPolicy: IfNotPresent livenessProbe: httpGet: