Merge pull request #3346 from mwringe/BZ1421834

BZ1421834: increase the Heapster metric resolution to 30s

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

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

roles/openshift_metrics/defaults/main.yaml

@@ -35,7 +35,7 @@ openshift_metrics_heapster_nodeselector: ""
 openshift_metrics_hostname: "hawkular-metrics.{{openshift_master_default_subdomain}}"
 
 openshift_metrics_duration: 7
-openshift_metrics_resolution: 15s
+openshift_metrics_resolution: 30s
 
 #####
 # Caution should be taken for the following defaults before