Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402070 )

Change subject: cassandra: switch to using jmx-exporter jar from Debian package
......................................................................

cassandra: switch to using jmx-exporter jar from Debian package

Bug: T181728
Change-Id: I1c1e5b868684aae5ba29f5a98d18652bdac7622f
---
M modules/cassandra/templates/cassandra-env.sh-2.2.erb
M modules/cassandra/templates/cassandra-env.sh-3.x.erb
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/402070/1

diff --git a/modules/cassandra/templates/cassandra-env.sh-2.2.erb 
b/modules/cassandra/templates/cassandra-env.sh-2.2.erb
index 12267cc..56d29d8 100644
--- a/modules/cassandra/templates/cassandra-env.sh-2.2.erb
+++ b/modules/cassandra/templates/cassandra-env.sh-2.2.erb
@@ -344,5 +344,5 @@
 <% end -%>
 
 <% if @jmx_exporter_enabled -%>
-JVM_OPTS="$JVM_OPTS 
-javaagent:/srv/deployment/prometheus/jmx_exporter/lib/jmx_prometheus_javaagent-0.8-20170117.190412-1.jar=<%=
 @listen_address %>:7800:<%= @config_directory %>/prometheus_jmx_exporter.yaml"
+JVM_OPTS="$JVM_OPTS 
-javaagent:/usr/share/java/prometheus/jmx_prometheus_javaagent.jar=<%= 
@listen_address %>:7800:<%= @config_directory %>/prometheus_jmx_exporter.yaml"
 <% end -%>
diff --git a/modules/cassandra/templates/cassandra-env.sh-3.x.erb 
b/modules/cassandra/templates/cassandra-env.sh-3.x.erb
index d05bd5b..7ec619b 100644
--- a/modules/cassandra/templates/cassandra-env.sh-3.x.erb
+++ b/modules/cassandra/templates/cassandra-env.sh-3.x.erb
@@ -302,5 +302,5 @@
 <% end -%>
 
 <% if @jmx_exporter_enabled -%>
-JVM_OPTS="$JVM_OPTS 
-javaagent:/srv/deployment/prometheus/jmx_exporter/lib/jmx_prometheus_javaagent-0.8-20170117.190412-1.jar=<%=
 @listen_address %>:7800:<%= @config_directory %>/prometheus_jmx_exporter.yaml"
+JVM_OPTS="$JVM_OPTS 
-javaagent:/usr/share/java/prometheus/jmx_prometheus_javaagent.jar=<%= 
@listen_address %>:7800:<%= @config_directory %>/prometheus_jmx_exporter.yaml"
 <% end -%>

-- 
To view, visit https://gerrit.wikimedia.org/r/402070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c1e5b868684aae5ba29f5a98d18652bdac7622f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to