linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Prometheus retention param (#2584) 

`storage.tsdb.retention` is deprecated in favor of
`storage.tsdb.retention.time`.

Replace all occurrences.

Signed-off-by: Andrew Seigner <siggy@buoyant.io>
This commit is contained in:
Andrew Seigner 2019-03-29 10:45:02 -07:00 committed by GitHub
parent e711ab7b15
commit e38ad7e9d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart/templates/prometheus.yaml
View File

@ -90,7 +90,7 @@ spec:
imagePullPolicy: {{.ImagePullPolicy}} imagePullPolicy: {{.ImagePullPolicy}}
args: args:
- "--storage.tsdb.path=/data" - "--storage.tsdb.path=/data"
- "--storage.tsdb.retention=6h" - "--storage.tsdb.retention.time=6h"
- "--config.file=/etc/prometheus/prometheus.yml" - "--config.file=/etc/prometheus/prometheus.yml"
- "--log.level={{.PrometheusLogLevel}}" - "--log.level={{.PrometheusLogLevel}}"
readinessProbe: readinessProbe:

2
cli/cmd/testdata/install_default.golden vendored
View File

@ -942,7 +942,7 @@ spec:
containers: containers:
- args: - args:
- --storage.tsdb.path=/data - --storage.tsdb.path=/data
- --storage.tsdb.retention=6h - --storage.tsdb.retention.time=6h
- --config.file=/etc/prometheus/prometheus.yml - --config.file=/etc/prometheus/prometheus.yml
- --log.level=info - --log.level=info
image: prom/prometheus:v2.7.1 image: prom/prometheus:v2.7.1

2
cli/cmd/testdata/install_ha_output.golden vendored
View File

@ -966,7 +966,7 @@ spec:
containers: containers:
- args: - args:
- --storage.tsdb.path=/data - --storage.tsdb.path=/data
- --storage.tsdb.retention=6h - --storage.tsdb.retention.time=6h
- --config.file=/etc/prometheus/prometheus.yml - --config.file=/etc/prometheus/prometheus.yml
- --log.level=info - --log.level=info
image: prom/prometheus:v2.7.1 image: prom/prometheus:v2.7.1

2
cli/cmd/testdata/install_ha_with_overrides_output.golden vendored
View File

@ -966,7 +966,7 @@ spec:
containers: containers:
- args: - args:
- --storage.tsdb.path=/data - --storage.tsdb.path=/data
- --storage.tsdb.retention=6h - --storage.tsdb.retention.time=6h
- --config.file=/etc/prometheus/prometheus.yml - --config.file=/etc/prometheus/prometheus.yml
- --log.level=info - --log.level=info
image: prom/prometheus:v2.7.1 image: prom/prometheus:v2.7.1

2
cli/cmd/testdata/install_no_init_container.golden vendored
View File

@ -870,7 +870,7 @@ spec:
containers: containers:
- args: - args:
- --storage.tsdb.path=/data - --storage.tsdb.path=/data
- --storage.tsdb.retention=6h - --storage.tsdb.retention.time=6h
- --config.file=/etc/prometheus/prometheus.yml - --config.file=/etc/prometheus/prometheus.yml
- --log.level=info - --log.level=info
image: prom/prometheus:v2.7.1 image: prom/prometheus:v2.7.1

2
cli/cmd/testdata/install_no_init_container_auto_inject.golden vendored
View File

@ -872,7 +872,7 @@ spec:
containers: containers:
- args: - args:
- --storage.tsdb.path=/data - --storage.tsdb.path=/data
- --storage.tsdb.retention=6h - --storage.tsdb.retention.time=6h
- --config.file=/etc/prometheus/prometheus.yml - --config.file=/etc/prometheus/prometheus.yml
- --log.level=info - --log.level=info
image: prom/prometheus:v2.7.1 image: prom/prometheus:v2.7.1

2
cli/cmd/testdata/install_output.golden vendored
View File

@ -839,7 +839,7 @@ spec:
containers: containers:
- args: - args:
- --storage.tsdb.path=/data - --storage.tsdb.path=/data
- --storage.tsdb.retention=6h - --storage.tsdb.retention.time=6h
- --config.file=/etc/prometheus/prometheus.yml - --config.file=/etc/prometheus/prometheus.yml
- --log.level=PrometheusLogLevel - --log.level=PrometheusLogLevel
image: PrometheusImage image: PrometheusImage