From 8a51f8c720ea7e9a0ed8c05283399fbac8d0c1e5 Mon Sep 17 00:00:00 2001 From: John Sanda Date: Fri, 7 Jul 2017 14:44:14 -0400 Subject: Enable JMX reporting of internal metrics We need to enable jmx reporting of our internal, dropwizard metrics so that they can be exposed over prometheus endpoint. --- roles/openshift_metrics/templates/hawkular_metrics_rc.j2 | 1 + 1 file changed, 1 insertion(+) (limited to 'roles') diff --git a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 index 9a9363075..feb17ab98 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: -- cgit v1.2.3 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 +++ roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 | 2 ++ roles/openshift_metrics/templates/hawkular_metrics_rc.j2 | 2 ++ 3 files changed, 7 insertions(+) (limited to 'roles') 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: -- cgit v1.2.3 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') 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.3 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 ++-- roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 | 4 ++-- roles/openshift_metrics/templates/hawkular_metrics_rc.j2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'roles') 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 diff --git a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 index d4d574aca..6f341bcfb 100644 --- a/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_cassandra_rc.j2 @@ -56,8 +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: 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 a3c51c5d6..59f7fb44a 100644 --- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 +++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 @@ -67,8 +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: ENABLE_PROMETHEUS_ENDPOINT + value: "{{ openshift_metrics_hawkular_enable_prometheus_endpoint }}" - name: OPENSHIFT_KUBE_PING_NAMESPACE valueFrom: fieldRef: -- cgit v1.2.3