Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/71640
Change subject: Adding support for arbitrary ganglia output writer settings ...................................................................... Adding support for arbitrary ganglia output writer settings Change-Id: Ia1db93ab0756b4bbd9eb073abe303524dfec606a --- M manifests/metrics.pp M templates/jmxtrans.json.erb 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/jmxtrans refs/changes/40/71640/1 diff --git a/manifests/metrics.pp b/manifests/metrics.pp index 3c2dccf..7c337e9 100644 --- a/manifests/metrics.pp +++ b/manifests/metrics.pp @@ -14,6 +14,8 @@ # $jmx_password - JMX password (if there is one) Optional. # $ganglia - host:port of Ganglia gmond. Optional. # $ganglia_group_name - Ganglia metrics group. Optional. +# $ganglia_settings - Any extra ganglia output writer settings. +# See: https://github.com/jmxtrans/jmxtrans/wiki/GangliaWriter. # $graphite - host:port of Graphite server Optional. # $graphite_root_prefix - rootPrefix for Graphite. Optional. # $outfile - local file path in which to save metric query results. Optional. @@ -26,6 +28,7 @@ $jmx_password = undef, $ganglia = undef, $ganglia_group_name = undef, + $ganglia_settings = undef, $graphite = undef, $graphite_root_prefix = undef, $outfile = undef diff --git a/templates/jmxtrans.json.erb b/templates/jmxtrans.json.erb index d268efe..af6160b 100644 --- a/templates/jmxtrans.json.erb +++ b/templates/jmxtrans.json.erb @@ -26,6 +26,12 @@ \"host\" : \"#{ganglia_host}\", \"port\" : #{ganglia_port}" ganglia_output_writer += ",\n \"groupName\" : \"#{ganglia_group_name}\"" if @ganglia_group_name + # render any extra ganglia settings + if (@ganglia_settings) + @ganglia_settings.each_pair do |key, value| + ganglia_output_writer += ",\n \"#{key}\" : \"#{value}\"" + end + end ganglia_output_writer += "\n }\n }" output_writers.push(ganglia_output_writer) end -- To view, visit https://gerrit.wikimedia.org/r/71640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1db93ab0756b4bbd9eb073abe303524dfec606a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/jmxtrans Gerrit-Branch: master Gerrit-Owner: Ottomata <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
