summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjfcoz <you@example.com>2016-05-20 15:46:18 +0200
committerjfcoz <you@example.com>2016-05-23 13:19:16 +0200
commitb05bdfc68305eec6faaebd84d95c64247ed4182e (patch)
tree0dbe9312c2f720ac85bfa92bdb51cc5bd73e5af6
parentc78e91c7d4a304cc5d20135e96206008407c5f6f (diff)
downloadopenshift-b05bdfc68305eec6faaebd84d95c64247ed4182e.tar.gz
openshift-b05bdfc68305eec6faaebd84d95c64247ed4182e.tar.bz2
openshift-b05bdfc68305eec6faaebd84d95c64247ed4182e.tar.xz
openshift-b05bdfc68305eec6faaebd84d95c64247ed4182e.zip
add unit in seconds for metrics resolution
-rw-r--r--playbooks/common/openshift-master/config.yml2
-rw-r--r--roles/openshift_metrics/README.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 125aab0ae..7717f41f1 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_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: