diff options
| author | John Sanda <jsanda@redhat.com> | 2017-07-24 22:22:11 -0400 |
|---|---|---|
| committer | John Sanda <jsanda@redhat.com> | 2017-07-24 22:22:11 -0400 |
| commit | c281aa8b025a25a91ce55e379516274a7cf22261 (patch) | |
| tree | a2181493870504baaa689dd41b535c0ee0cc740b | |
| parent | 8a51f8c720ea7e9a0ed8c05283399fbac8d0c1e5 (diff) | |
| download | openshift-c281aa8b025a25a91ce55e379516274a7cf22261.tar.gz openshift-c281aa8b025a25a91ce55e379516274a7cf22261.tar.bz2 openshift-c281aa8b025a25a91ce55e379516274a7cf22261.tar.xz openshift-c281aa8b025a25a91ce55e379516274a7cf22261.zip | |
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.
| -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 | 2 |
3 files changed, 7 insertions, 0 deletions
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: "" diff --git a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 index fc82f49b1..d4d574aca 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: DISABLE_PROMETHEUS_ENDPOINT + value: "{{ openshift_metrics_cassandra_disable_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 feb17ab98..a3c51c5d6 100644 --- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 @@ -67,6 +67,8 @@ spec: value: "{{ 17 | oo_random_word }}" - name: TRUSTSTORE_AUTHORITIES value: "/hawkular-metrics-certs/tls.truststore.crt" + - name: DISABLE_PROMETHEUS_ENDPOINT + value: "{{ openshift_metrics_hawkular_disable_prometheus_endpoint }}" - name: OPENSHIFT_KUBE_PING_NAMESPACE valueFrom: fieldRef: |