summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted_templates
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-13 16:18:02 -0500
committerGitHub <noreply@github.com>2017-02-13 16:18:02 -0500
commit9c09ffbd4b1c2dc9593c6fb1f312172c538f2bec (patch)
tree1516b3cf5f2a92f8586bdad59bc07a6c640455a6 /roles/openshift_hosted_templates
parentacea04a67bd3aa62001af4fe426a894856609d2a (diff)
parentacfd703ac1b3b275b4b1247d5f7c2ab17c59d752 (diff)
downloadopenshift-9c09ffbd4b1c2dc9593c6fb1f312172c538f2bec.tar.gz
openshift-9c09ffbd4b1c2dc9593c6fb1f312172c538f2bec.tar.bz2
openshift-9c09ffbd4b1c2dc9593c6fb1f312172c538f2bec.tar.xz
openshift-9c09ffbd4b1c2dc9593c6fb1f312172c538f2bec.zip
Merge pull request #3346 from mwringe/BZ1421834
BZ1421834: increase the Heapster metric resolution to 30s
Diffstat (limited to 'roles/openshift_hosted_templates')
-rw-r--r--roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml4
-rw-r--r--roles/openshift_hosted_templates/files/v1.5/origin/metrics-deployer.yaml4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml
index 66051755c..6ead122c5 100644
--- a/roles/openshift_hosted_templates/files/v1.5/enterprise/metrics-deployer.yaml
+++ b/roles/openshift_hosted_templates/files/v1.5/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.5/origin/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.5/origin/metrics-deployer.yaml
index 54691572a..d191c0439 100644
--- a/roles/openshift_hosted_templates/files/v1.5/origin/metrics-deployer.yaml
+++ b/roles/openshift_hosted_templates/files/v1.5/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