Merge pull request #213 from luck3y/JBEAP-20552

luck3y · web-flow · commit f75cb267b1d9 · 2020-11-24T11:58:14.000-06:00
JBEAP-20552 - Fix for starting prometheus java-agent
diff --git a/jboss/container/eap/prometheus/config/added/src/main/resources/packages/eap.s2i.prometheus/content/bin/prometheus-conf.conf b/jboss/container/eap/prometheus/config/added/src/main/resources/packages/eap.s2i.prometheus/content/bin/prometheus-conf.conf
@@ -1,3 +1,3 @@
 
 # add prometheus options
-JAVA_OPTS="${JAVA_OPTS} $(source ${JBOSS_CONTAINER_PROMETHEUS_MODULE}/prometheus-opts && get_prometheus_opts)"
+MODULE_OPTS="${MODULE_OPTS} $(source ${JBOSS_CONTAINER_PROMETHEUS_MODULE}/prometheus-opts && get_prometheus_opts)"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`
`2`	`2`	`# add prometheus options`
`3`		`-JAVA_OPTS="${JAVA_OPTS} $(source ${JBOSS_CONTAINER_PROMETHEUS_MODULE}/prometheus-opts && get_prometheus_opts)"`
	`3`	`+MODULE_OPTS="${MODULE_OPTS} $(source ${JBOSS_CONTAINER_PROMETHEUS_MODULE}/prometheus-opts && get_prometheus_opts)"`