Merge pull request #3350 from mwringe/bz1421860

BZ1421860: increase Heapster's metric resolution to 30s

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

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