summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-24 21:46:25 -0800
committerGitHub <noreply@github.com>2018-01-24 21:46:25 -0800
commit2487fa87fc198bffb61052c5e51da8c618dc939e (patch)
tree09d7337aec8ce88ca4619a80ff01dbfb66ba7427
parentab7fae1c776915d834a2a81a1a6b0f5d3e108336 (diff)
parent9c0b521bcd51aa2d2369b8d4eb64a9f3b01f97ed (diff)
downloadopenshift-2487fa87fc198bffb61052c5e51da8c618dc939e.tar.gz
openshift-2487fa87fc198bffb61052c5e51da8c618dc939e.tar.bz2
openshift-2487fa87fc198bffb61052c5e51da8c618dc939e.tar.xz
openshift-2487fa87fc198bffb61052c5e51da8c618dc939e.zip
Merge pull request #6626 from pgier/prometheus-remove-tsdb-block-config
Automatic merge from submit-queue. openshift_prometheus: remove block duration settings The prometheus block duration settings should not be changed from their defaults. See also: https://github.com/prometheus/prometheus/pull/3618
-rw-r--r--roles/openshift_prometheus/README.md2
-rw-r--r--roles/openshift_prometheus/defaults/main.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_prometheus/README.md b/roles/openshift_prometheus/README.md
index 1ebeacabf..6079e6016 100644
--- a/roles/openshift_prometheus/README.md
+++ b/roles/openshift_prometheus/README.md
@@ -31,7 +31,7 @@ For default values, see [`defaults/main.yaml`](defaults/main.yaml).
e.g
```
-openshift_prometheus_args=['--storage.tsdb.retention=6h', '--storage.tsdb.min-block-duration=5s', '--storage.tsdb.max-block-duration=6m']
+openshift_prometheus_args=['--storage.tsdb.retention=6h', '--query.timeout=2m']
```
## PVC related variables
diff --git a/roles/openshift_prometheus/defaults/main.yaml b/roles/openshift_prometheus/defaults/main.yaml
index e30108d2c..1b21c4739 100644
--- a/roles/openshift_prometheus/defaults/main.yaml
+++ b/roles/openshift_prometheus/defaults/main.yaml
@@ -14,7 +14,7 @@ openshift_prometheus_node_selector: {"region":"infra"}
openshift_prometheus_additional_rules_file: null
#prometheus application arguments
-openshift_prometheus_args: ['--storage.tsdb.retention=6h', '--storage.tsdb.min-block-duration=2m']
+openshift_prometheus_args: ['--storage.tsdb.retention=6h']
# storage
# One of ['emptydir', 'pvc']