Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260792
Change subject: Use $group_prefix for main kafka cluster checks
......................................................................
Use $group_prefix for main kafka cluster checks
Bug: T122330
Change-Id: I33ebb21107e1052e21ac3ecfc47fd1f2b579319d
---
M modules/kafka
M modules/role/manifests/kafka/main/broker.pp
2 files changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/260792/1
diff --git a/modules/kafka b/modules/kafka
index 1e4ab4b..39e0e7f 160000
--- a/modules/kafka
+++ b/modules/kafka
-Subproject commit 1e4ab4b7351f1e437729033128912c4dc6b3d91e
+Subproject commit 39e0e7f745e2ece7ebf996e885085110d36aff4b
diff --git a/modules/role/manifests/kafka/main/broker.pp
b/modules/role/manifests/kafka/main/broker.pp
index c833164..38a5641 100644
--- a/modules/role/manifests/kafka/main/broker.pp
+++ b/modules/role/manifests/kafka/main/broker.pp
@@ -75,8 +75,9 @@
# Include Kafka Server Jmxtrans class
# to send Kafka Broker metrics to Ganglia and statsd.
+ $group_prefix = "kafka.${cluster_name}."
class { '::kafka::server::jmxtrans':
- group_prefix => "kafka.${cluster_name}.",
+ group_prefix => $group_prefix,
ganglia => hiera('ganglia_aggregators', undef),
statsd => hiera('statsd', undef),
jmx_port =>$::role::kafka::analytics::config::jmx_port,
@@ -86,7 +87,8 @@
# Monitor kafka in production
if $::realm == 'production' {
class { '::kafka::server::monitoring':
- jmx_port => $::role::kafka::analytics::config::jmx_port,
+ jmx_port => $::role::kafka::analytics::config::jmx_port,
+ group_prefix => $group_prefix,
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/260792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33ebb21107e1052e21ac3ecfc47fd1f2b579319d
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
