From 9c0b521bcd51aa2d2369b8d4eb64a9f3b01f97ed Mon Sep 17 00:00:00 2001
From: Paul Gier <pgier@redhat.com>
Date: Fri, 5 Jan 2018 11:14:15 -0600
Subject: 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
---
roles/openshift_prometheus/README.md | 2 +-
roles/openshift_prometheus/defaults/main.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'roles/openshift_prometheus')
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']
--
cgit v1.2.3