diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-23 13:57:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 13:57:38 -0400 |
| commit | 74cb9eb24b80d2f3146fc27c1cc7c34ccc47a1a5 (patch) | |
| tree | 769c427b500c50917896ebd60619eb149c5261ac | |
| parent | 4ee7f6fd40e3fbead666770f1041a7c9ba1465fe (diff) | |
| parent | e548b5a1ebea67ced3a9caf88b2fdc5fd0a8cab3 (diff) | |
| download | openshift-74cb9eb24b80d2f3146fc27c1cc7c34ccc47a1a5.tar.gz openshift-74cb9eb24b80d2f3146fc27c1cc7c34ccc47a1a5.tar.bz2 openshift-74cb9eb24b80d2f3146fc27c1cc7c34ccc47a1a5.tar.xz openshift-74cb9eb24b80d2f3146fc27c1cc7c34ccc47a1a5.zip | |
Merge pull request #1927 from jfcoz/metrics_resolution
add unit in seconds for metrics resolution
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/README.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 0ca148169..7a59f3ea3 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -46,7 +46,7 @@ openshift_hosted_metrics_duration: "{{ lookup('oo_option', 'openshift_hosted_metrics_duration') | default(7) }}" when: openshift_hosted_metrics_duration is not defined - set_fact: - openshift_hosted_metrics_resolution: "{{ lookup('oo_option', 'openshift_hosted_metrics_resolution') | default(10) }}" + openshift_hosted_metrics_resolution: "{{ lookup('oo_option', 'openshift_hosted_metrics_resolution') | default('10s', true) }}" when: openshift_hosted_metrics_resolution is not defined roles: - openshift_facts diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 2f8af2454..a5ccfb152 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1749,7 +1749,7 @@ class OpenShiftFacts(object): metrics=dict( deploy=False, duration=7, - resolution=10, + resolution='10s', storage=dict( kind=None, volume=dict( diff --git a/roles/openshift_metrics/README.md b/roles/openshift_metrics/README.md index 2e903379a..f7ec86c55 100644 --- a/roles/openshift_metrics/README.md +++ b/roles/openshift_metrics/README.md @@ -21,7 +21,7 @@ From this role: | openshift_hosted_metrics_storage_volume_size | 10Gi | Metrics volume size | | openshift_hosted_metrics_storage_nfs_options | *(rw,root_squash) | NFS options for configured exports. | | openshift_hosted_metrics_duration | 7 | Metrics query duration | -| openshift_hosted_metrics_resolution | 10 | Metrics resolution | +| openshift_hosted_metrics_resolution | 10s | Metrics resolution | From openshift_common: |