Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379734 )
Change subject: profile::kafka::broker: remove graphite metrics config
......................................................................
profile::kafka::broker: remove graphite metrics config
Bug: T175922
Change-Id: Ia9343e3ed5501a525cfbf2eae5f85621916e370f
---
M hieradata/role/common/kafka/jumbo/broker.yaml
M hieradata/role/common/kafka/simple/broker.yaml
M modules/profile/manifests/kafka/broker.pp
3 files changed, 0 insertions(+), 22 deletions(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/kafka/jumbo/broker.yaml
b/hieradata/role/common/kafka/jumbo/broker.yaml
index 3f5f88d..d20132a 100644
--- a/hieradata/role/common/kafka/jumbo/broker.yaml
+++ b/hieradata/role/common/kafka/jumbo/broker.yaml
@@ -5,9 +5,6 @@
# Enable the Prometheus JMX Exporter
profile::kafka::broker::prometheus_monitoring_enabled: true
-# Disable jmxtrans/graphite monitoring
-profile::kafka::broker::monitoring_enabled: false
-
profile::kafka::broker::log_dirs: [/srv/kafka/data]
profile::kafka::broker::plaintext: true
# TODO: does not yet work.
diff --git a/hieradata/role/common/kafka/simple/broker.yaml
b/hieradata/role/common/kafka/simple/broker.yaml
index 0cd7bec..a285e39 100644
--- a/hieradata/role/common/kafka/simple/broker.yaml
+++ b/hieradata/role/common/kafka/simple/broker.yaml
@@ -1,7 +1,6 @@
kafka_cluster_name: simple
profile::kafka::broker::prometheus_monitoring_enabled: false
-profile::kafka::broker::monitoring_enabled: false
profile::kafka::broker::log_dirs: [/srv/kafka/data]
profile::kafka::broker::plaintext: true
profile::kafka::broker::tls_secrets_path: false
diff --git a/modules/profile/manifests/kafka/broker.pp
b/modules/profile/manifests/kafka/broker.pp
index fc7d0a6..b7b06e2 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -65,10 +65,6 @@
# than 0.10.2, the consumers' fetch size must also be increased
# so that the they can fetch record batches this large.
#
-# [*monitoring_enabled*]
-# Enable jmxtrans to export metrics to graphite and set up alerts
-# based on its metrics.
-#
# [*prometheus_monitoring_enabled*]
# Enable the Prometheus jmx exporter.
#
@@ -91,7 +87,6 @@
$replica_maxlag_critical =
hiera('profile::kafka::broker::replica_maxlag_critical'),
# This is set via top level hiera variable so it can be synchronized
between roles and clients.
$message_max_bytes = hiera('kafka_message_max_bytes'),
- $monitoring_enabled =
hiera('profile::kafka::broker::monitoring_enabled'),
$prometheus_monitoring_enabled =
hiera('profile::kafka::broker::prometheus_monitoring_enabled'),
) {
# TODO: WIP
@@ -244,19 +239,6 @@
auto_leader_rebalance_enable => $auto_leader_rebalance_enable,
num_replica_fetchers => $num_replica_fetchers,
message_max_bytes => $message_max_bytes,
- }
-
- if $monitoring_enabled {
- class { '::confluent::kafka::broker::jmxtrans':
- # Cluster metrics prefix for graphite, etc.
- group_prefix => "kafka.cluster.${cluster_name}.",
- statsd => $statsd,
- }
-
- class { '::confluent::kafka::broker::alerts':
- replica_maxlag_warning => $replica_maxlag_warning,
- replica_maxlag_critical => $replica_maxlag_critical,
- }
}
$ferm_plaintext_ensure = $plaintext ? {
--
To view, visit https://gerrit.wikimedia.org/r/379734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9343e3ed5501a525cfbf2eae5f85621916e370f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
Gerrit-Reviewer: Elukey <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
