summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics/defaults
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-29 02:45:13 -0700
committerGitHub <noreply@github.com>2017-09-29 02:45:13 -0700
commit615e5421137fd786a70b7f7962fe3c6ce6a19cf7 (patch)
tree7b4b6a86c7aa3de3a400215d9bd9fdbe74ca79ad /roles/openshift_metrics/defaults
parentbf61775799fc7fb0fccf63ef11102bf48d5a2d7a (diff)
parentb9314a085d5cb498a50ffeaf5d8a756c37a67eb7 (diff)
downloadopenshift-615e5421137fd786a70b7f7962fe3c6ce6a19cf7.tar.gz
openshift-615e5421137fd786a70b7f7962fe3c6ce6a19cf7.tar.bz2
openshift-615e5421137fd786a70b7f7962fe3c6ce6a19cf7.tar.xz
openshift-615e5421137fd786a70b7f7962fe3c6ce6a19cf7.zip
Merge pull request #5020 from jsanda/prometheus-endpoint-config
Automatic merge from submit-queue. Prometheus endpoint config for hawkular-metrics and cassandra Prometheus endpoints are exposed in hawkular-metrics and in cassandra by default. This PR adds options to disable them.
Diffstat (limited to 'roles/openshift_metrics/defaults')
-rw-r--r--roles/openshift_metrics/defaults/main.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_metrics/defaults/main.yaml b/roles/openshift_metrics/defaults/main.yaml
index ed0182ba8..084b734ee 100644
--- a/roles/openshift_metrics/defaults/main.yaml
+++ b/roles/openshift_metrics/defaults/main.yaml
@@ -61,3 +61,6 @@ openshift_metrics_cassandra_pvc_access: "{{ openshift_metrics_storage_access_mod
openshift_metrics_hawkular_user_write_access: False
openshift_metrics_heapster_allowed_users: system:master-proxy
+
+openshift_metrics_cassandra_enable_prometheus_endpoint: True
+openshift_metrics_hawkular_enable_prometheus_endpoint: True