From c281aa8b025a25a91ce55e379516274a7cf22261 Mon Sep 17 00:00:00 2001 From: John Sanda Date: Mon, 24 Jul 2017 22:22:11 -0400 Subject: add options to disable prometheus endpoints The prometheus endpoints for cassandra and for hawkular-metrics are enabled by default. This commit adds the option to disable them. --- roles/openshift_metrics/defaults/main.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'roles/openshift_metrics/defaults') diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index c34936930..e4082577f 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -59,3 +59,6 @@ openshift_metrics_cassandra_pvc_access: "{{ openshift_hosted_metrics_storage_acc openshift_metrics_hawkular_user_write_access: False openshift_metrics_heapster_allowed_users: system:master-proxy + +openshift_metrics_cassandra_disable_prometheus_endpoint: "" +openshift_metrics_hawkular_disable_prometheus_endpoint: "" -- cgit v1.2.1 From 09722458d9551f3ce2ad6d3a2c5e58dbce1f0719 Mon Sep 17 00:00:00 2001 From: John Sanda Date: Wed, 9 Aug 2017 13:09:55 -0400 Subject: set prometheus endpoint properties to false by default --- roles/openshift_metrics/defaults/main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_metrics/defaults') diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index e4082577f..f738dada9 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -60,5 +60,5 @@ openshift_metrics_hawkular_user_write_access: False openshift_metrics_heapster_allowed_users: system:master-proxy -openshift_metrics_cassandra_disable_prometheus_endpoint: "" -openshift_metrics_hawkular_disable_prometheus_endpoint: "" +openshift_metrics_cassandra_disable_prometheus_endpoint: False +openshift_metrics_hawkular_disable_prometheus_endpoint: False -- cgit v1.2.1 From b9314a085d5cb498a50ffeaf5d8a756c37a67eb7 Mon Sep 17 00:00:00 2001 From: John Sanda Date: Mon, 14 Aug 2017 15:35:46 -0400 Subject: rename vars to avoid double negatives and ensuing confusion --- roles/openshift_metrics/defaults/main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_metrics/defaults') diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml index f738dada9..1336e182f 100644 --- a/roles/openshift_metrics/defaults/main.yaml +++ b/roles/openshift_metrics/defaults/main.yaml @@ -60,5 +60,5 @@ openshift_metrics_hawkular_user_write_access: False openshift_metrics_heapster_allowed_users: system:master-proxy -openshift_metrics_cassandra_disable_prometheus_endpoint: False -openshift_metrics_hawkular_disable_prometheus_endpoint: False +openshift_metrics_cassandra_enable_prometheus_endpoint: True +openshift_metrics_hawkular_enable_prometheus_endpoint: True -- cgit v1.2.1