Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93750
Change subject: Now using jmxtrans instead of KafkaGanglia class.
......................................................................
Now using jmxtrans instead of KafkaGanglia class.
A jmxtrans instance will be started on each Kafka broker. This
instance will query the Kafka JVM for relevant Kafka metrics and
send them to Ganglia.
This updates the jmxtrans and kafka modules.
Change-Id: I98589921656357a0fa8eaeb017cbb371efc5bac8
---
M manifests/role/analytics/kafka.pp
M modules/jmxtrans
M modules/kafka
3 files changed, 6 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/93750/1
diff --git a/manifests/role/analytics/kafka.pp
b/manifests/role/analytics/kafka.pp
index 5a78735..cda5414 100644
--- a/manifests/role/analytics/kafka.pp
+++ b/manifests/role/analytics/kafka.pp
@@ -78,15 +78,6 @@
$zookeeper_hosts = $role::analytics::zookeeper::config::hosts_array
$zookeeper_chroot = "/kafka/${kafka_cluster_name}"
$zookeeper_url = inline_template("<%= zookeeper_hosts.sort.join(',')
%><%= zookeeper_chroot %>")
-
- $metrics_properties = {
- 'kafka.metrics.reporters' =>
'com.criteo.kafka.KafkaGangliaMetricsReporter',
- 'kafka.ganglia.metrics.reporter.enabled' => 'true',
- 'kafka.ganglia.metrics.host' => $ganglia_host,
- 'kafka.ganglia.metrics.port' => $ganglia_port,
- 'kafka.ganglia.metrics.group' => 'kafka',
- 'kafka.ganglia.metrics.exclude.regex' =>
'^("kafka\.cluster".*)|("kafka\.log".*)|("kafka\.network".*)|("kafka\.server":name="ReplicaFetcherThread.*ConsumerLag.*)$'
- }
}
# == Class role::analytics::kafka::client
@@ -113,6 +104,11 @@
brokers => $brokers,
zookeeper_hosts => $zookeeper_hosts,
zookeeper_chroot => $zookeeper_chroot,
- metrics_properties => $metrics_properties,
+ }
+
+ # Include the Kafka Server Jmxtrans instance
+ # to send Kafka Broker metrics to Ganglia
+ class { '::kafka::server::jmxtrans':
+ ganglia => "${ganglia_host}:${ganglia_port}",
}
}
diff --git a/modules/jmxtrans b/modules/jmxtrans
index a73df97..0409d33 160000
--- a/modules/jmxtrans
+++ b/modules/jmxtrans
-Subproject commit a73df976f10d5cfe17bf54a168660b832b1e38b6
+Subproject commit 0409d33b0c2f3697c30005ecd285d021c6a363e7
diff --git a/modules/kafka b/modules/kafka
index e713546..7b39da6 160000
--- a/modules/kafka
+++ b/modules/kafka
-Subproject commit e713546f60be95b8946e089964013bb2afc4ac6e
+Subproject commit 7b39da613d910b5f8e4f8ed21c787941d5e4ed8c
--
To view, visit https://gerrit.wikimedia.org/r/93750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98589921656357a0fa8eaeb017cbb371efc5bac8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
