diff options
| author | Dan Yocum <dyocum@redhat.com> | 2018-01-26 15:39:50 -0500 |
|---|---|---|
| committer | Dan Yocum <dyocum@redhat.com> | 2018-01-26 15:39:50 -0500 |
| commit | 7dceb6260a333e29c922dad8613ae6a0946fa07b (patch) | |
| tree | 1c7c40a6c68e0668af2e2a5d0b865a4ef6af371d /roles/openshift_prometheus | |
| parent | 501e7897b7becb1e5a5c7875b40675d1e7296ed7 (diff) | |
| parent | 13e73c31a827d6fca810e120a7b3b6573b2eeb4b (diff) | |
| download | openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.gz openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.bz2 openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.tar.xz openshift-7dceb6260a333e29c922dad8613ae6a0946fa07b.zip | |
Merge branch 'master' of github.com:openshift/openshift-ansible into rm_origin-components
Diffstat (limited to 'roles/openshift_prometheus')
| -rw-r--r-- | roles/openshift_prometheus/README.md | 2 | ||||
| -rw-r--r-- | roles/openshift_prometheus/defaults/main.yaml | 2 |
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'] |