diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-14 14:40:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 14:40:33 -0500 |
| commit | 36bcb7e8a5068b584ee337e10133e56d2eaeccde (patch) | |
| tree | 76504bf29b3fdf19f288bc6377b37e07e1fbb284 | |
| parent | 7b33cdfaced1ca374b61b7222d32e8d13511f29a (diff) | |
| parent | c4e8652ab1399c8a9723473eb434610efa4d7506 (diff) | |
| download | openshift-36bcb7e8a5068b584ee337e10133e56d2eaeccde.tar.gz openshift-36bcb7e8a5068b584ee337e10133e56d2eaeccde.tar.bz2 openshift-36bcb7e8a5068b584ee337e10133e56d2eaeccde.tar.xz openshift-36bcb7e8a5068b584ee337e10133e56d2eaeccde.zip | |
Merge pull request #3350 from mwringe/bz1421860
BZ1421860: increase Heapster's metric resolution to 30s
| -rw-r--r-- | roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml | 4 | ||||
| -rw-r--r-- | roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml index 66051755c..6ead122c5 100644 --- a/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml +++ b/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml @@ -159,9 +159,9 @@ parameters: name: HEAPSTER_NODE_ID value: "nodename" - - description: "How often metrics should be gathered. Defaults value of '15s' for 15 seconds" + description: "How often metrics should be gathered. Defaults value of '30s' for 30 seconds" name: METRIC_RESOLUTION - value: "15s" + value: "30s" - description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart" name: STARTUP_TIMEOUT diff --git a/roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml index 54691572a..d191c0439 100644 --- a/roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml +++ b/roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml @@ -159,9 +159,9 @@ parameters: name: HEAPSTER_NODE_ID value: "nodename" - - description: "How often metrics should be gathered. Defaults value of '15s' for 15 seconds" + description: "How often metrics should be gathered. Defaults value of '30s' for 30 seconds" name: METRIC_RESOLUTION - value: "15s" + value: "30s" - description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart" name: STARTUP_TIMEOUT |