Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/399686 )
Change subject: confluent:kafka:jmxtrans: remove Ganglia support ...................................................................... confluent:kafka:jmxtrans: remove Ganglia support Since Ganglia has been removed, also drop the support from Confluent module. Bug: T177225 Change-Id: I9c4346a6162d09fb7dbb11cc41a62f20c45ee34c --- M modules/confluent/manifests/kafka/broker/jmxtrans.pp M modules/confluent/manifests/kafka/mirror/jmxtrans.pp 2 files changed, 3 insertions(+), 16 deletions(-) Approvals: Ottomata: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/confluent/manifests/kafka/broker/jmxtrans.pp b/modules/confluent/manifests/kafka/broker/jmxtrans.pp index 292bc29..254f9e6 100644 --- a/modules/confluent/manifests/kafka/broker/jmxtrans.pp +++ b/modules/confluent/manifests/kafka/broker/jmxtrans.pp @@ -5,9 +5,6 @@ # https://github.com/wikimedia/puppet-jmxtrans. # # == Parameters -# [*ganglia*] -# Ganglia host:port. Default: under -# # [*graphite*] # Graphite host:port. Default: under # @@ -32,12 +29,12 @@ # Level at which jmxtrans should log. Default: info # # == Usage -# class { 'confluent::kafka::broker::jmxtrans': -# ganglia => 'ganglia.example.org:8649' +# class { '::confluent::kafka::broker::jmxtrans': +# group_prefix => 'kafka.cluster.example', +# statsd => hiera('statsd', undef), # } # class confluent::kafka::broker::jmxtrans( - $ganglia = undef, $graphite = undef, $statsd = undef, $outfile = undef, @@ -70,7 +67,6 @@ # query for metrics from Kafka's JVM jmxtrans::metrics::jvm { $jmx: - ganglia => $ganglia, graphite => $graphite, statsd => $statsd, outfile => $outfile, @@ -335,8 +331,6 @@ jmxtrans::metrics { "kafka-${::hostname}-${jmx_port}": jmx => $jmx, outfile => $outfile, - ganglia => $ganglia, - ganglia_group_name => "${group_prefix}kafka", graphite => $graphite, graphite_root_prefix => "${group_prefix}kafka", statsd => $statsd, diff --git a/modules/confluent/manifests/kafka/mirror/jmxtrans.pp b/modules/confluent/manifests/kafka/mirror/jmxtrans.pp index b608d3e..0bfbb7b 100644 --- a/modules/confluent/manifests/kafka/mirror/jmxtrans.pp +++ b/modules/confluent/manifests/kafka/mirror/jmxtrans.pp @@ -13,9 +13,6 @@ # [*jmx_port*] # Kafka MirrorMaker JMX port # -# [*ganglia*] -# Ganglia host:port -# # [*graphite*] # Graphite host:port # @@ -45,7 +42,6 @@ # define confluent::kafka::mirror::jmxtrans( $jmx_port = 9997, - $ganglia = undef, $graphite = undef, $statsd = undef, $outfile = undef, @@ -59,7 +55,6 @@ # query for metrics from Kafka's JVM jmxtrans::metrics::jvm { $jmx: - ganglia => $ganglia, graphite => $graphite, statsd => $statsd, outfile => $outfile, @@ -317,8 +312,6 @@ jmxtrans::metrics { "kafka-mirror-${title}-${jmx_port}": jmx => $jmx, outfile => $outfile, - ganglia => $ganglia, - ganglia_group_name => "${group_prefix}kafka-mirror", graphite => $graphite, graphite_root_prefix => "${group_prefix}kafka-mirror", statsd => $statsd, -- To view, visit https://gerrit.wikimedia.org/r/399686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c4346a6162d09fb7dbb11cc41a62f20c45ee34c Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Ottomata <ao...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
