summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-25 09:18:27 -0500
committerGitHub <noreply@github.com>2017-01-25 09:18:27 -0500
commitc5a1e1eb9238f33983ade2917805f7da6e87bcb9 (patch)
treefa4e80c13fc62a308b34fafcdee0e3fa31863d69
parent18da6147f5f0e1689219b22dca0efcbf45d6aaa3 (diff)
parentbf85a7183b19b0d7cfa0e29d0c8c774cfd745547 (diff)
downloadopenshift-c5a1e1eb9238f33983ade2917805f7da6e87bcb9.tar.gz
openshift-c5a1e1eb9238f33983ade2917805f7da6e87bcb9.tar.bz2
openshift-c5a1e1eb9238f33983ade2917805f7da6e87bcb9.tar.xz
openshift-c5a1e1eb9238f33983ade2917805f7da6e87bcb9.zip
Merge pull request #3133 from mwringe/hawkular-metrics-0.23-update
Template update for Hawkular Metrics 0.23
-rw-r--r--roles/openshift_metrics/templates/hawkular_metrics_rc.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2 b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
index e6954ea44..f78621674 100644
--- a/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
+++ b/roles/openshift_metrics/templates/hawkular_metrics_rc.j2
@@ -37,6 +37,7 @@ spec:
- "-Dhawkular.metrics.openshift.htpasswd-file=/secrets/hawkular-metrics.htpasswd.file"
- "-Dhawkular.metrics.allowed-cors-access-control-allow-headers=authorization"
- "-Dhawkular.metrics.default-ttl={{openshift_metrics_duration}}"
+ - "-Dhawkular.metrics.admin-tenant=_hawkular_admin"
- "-Dhawkular-alerts.cassandra-nodes=hawkular-cassandra"
- "-Dhawkular-alerts.cassandra-use-ssl"
- "-Dhawkular.alerts.openshift.auth-methods=openshift-oauth,htpasswd"
@@ -44,6 +45,7 @@ spec:
- "-Dhawkular.alerts.allowed-cors-access-control-allow-headers=authorization"
- "-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
- "-Dorg.apache.catalina.connector.CoyoteAdapter.ALLOW_BACKSLASH=true"
+ - "-Dcom.datastax.driver.FORCE_NIO=true"
- "-DKUBERNETES_MASTER_URL={{openshift_metrics_master_url}}"
- "-DUSER_WRITE_ACCESS={{openshift_metrics_hawkular_user_write_access}}"
- "--hmw.keystore=/secrets/hawkular-metrics.keystore"