diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-29 02:45:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 02:45:13 -0700 |
| commit | 615e5421137fd786a70b7f7962fe3c6ce6a19cf7 (patch) | |
| tree | 7b4b6a86c7aa3de3a400215d9bd9fdbe74ca79ad /roles/openshift_metrics | |
| parent | bf61775799fc7fb0fccf63ef11102bf48d5a2d7a (diff) | |
| parent | b9314a085d5cb498a50ffeaf5d8a756c37a67eb7 (diff) | |
| download | openshift-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')
| -rw-r--r-- | roles/openshift_metrics/defaults/main.yaml | 3 | ||||
| -rw-r--r-- | roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_metrics/templates/hawkular_metrics_rc.j2 | 3 |
3 files changed, 8 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 diff --git a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 index fc82f49b1..6f341bcfb 100644 --- a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 @@ -56,6 +56,8 @@ spec: value: "/cassandra_data" - name: JVM_OPTS value: "-Dcassandra.commitlog.ignorereplayerrors=true" + - name: ENABLE_PROMETHEUS_ENDPOINT + value: "{{ openshift_metrics_cassandra_enable_prometheus_endpoint }}" - name: TRUSTSTORE_NODES_AUTHORITIES value: "/hawkular-cassandra-certs/tls.peer.truststore.crt" - name: TRUSTSTORE_CLIENT_AUTHORITIES diff --git a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 index 9a9363075..59f7fb44a 100644 --- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 @@ -55,6 +55,7 @@ spec: - "-Dcom.datastax.driver.FORCE_NIO=true" - "-DKUBERNETES_MASTER_URL={{openshift_metrics_master_url}}" - "-DUSER_WRITE_ACCESS={{openshift_metrics_hawkular_user_write_access}}" + - "-Dhawkular.metrics.jmx-reporting-enabled" env: - name: POD_NAMESPACE valueFrom: @@ -66,6 +67,8 @@ spec: value: "{{ 17 | oo_random_word }}" - name: TRUSTSTORE_AUTHORITIES value: "/hawkular-metrics-certs/tls.truststore.crt" + - name: ENABLE_PROMETHEUS_ENDPOINT + value: "{{ openshift_metrics_hawkular_enable_prometheus_endpoint }}" - name: OPENSHIFT_KUBE_PING_NAMESPACE valueFrom: fieldRef: |