From acfd703ac1b3b275b4b1247d5f7c2ab17c59d752 Mon Sep 17 00:00:00 2001 From: mwringe Date: Mon, 13 Feb 2017 16:13:17 -0500 Subject: BZ1421834: increase the Heapster metric resolution to 30s --- .../files/v1.5/enterprise/metrics-deployer.yaml | 4 ++-- .../files/v1.5/origin/metrics-deployer.yaml | 4 ++-- roles/openshift_metrics/defaults/main.yaml | 2 +- 3 files changed, 5 insertions(+), 5 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 diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index 0cfbac8a9..83843f126 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/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 -- cgit v1.2.3