Ottomata has submitted this change and it was merged.

Change subject: Make burrow to monitor the proper eventlogging mysql kafka 
consumer group
......................................................................


Make burrow to monitor the proper eventlogging mysql kafka consumer group

Change-Id: I3a639df33bed198cbff71cb55b83eb4633245f14
---
M hieradata/role/common/analytics/burrow.yaml
M manifests/role/eventlogging.pp
2 files changed, 2 insertions(+), 5 deletions(-)

Approvals:
  Ottomata: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/analytics/burrow.yaml 
b/hieradata/role/common/analytics/burrow.yaml
index 692891e..52b60b5 100644
--- a/hieradata/role/common/analytics/burrow.yaml
+++ b/hieradata/role/common/analytics/burrow.yaml
@@ -1,5 +1,5 @@
 burrow::httpserver_port: 8000
 burrow::consumer_groups:
   - eventlogging-00
-  - eventlogging-mysql-00
+  - mysql-m4-master
   - eventlogging-files-00
\ No newline at end of file
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 95a5cf1..419b4cf 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -205,10 +205,6 @@
         'eventlogging_mysql_kafka_consumer_args',
         
'auto_commit_enable=True&auto_commit_interval_ms=1000&auto_offset_reset=-1'
     )
-    $kafka_consumer_group = hiera(
-        'eventlogging_mysql_kafka_consumer_group',
-        'eventlogging-mysql-00'
-    )
 
     class { 'passwords::mysql::eventlogging': }    # T82265
     $mysql_user = $passwords::mysql::eventlogging::user
@@ -218,6 +214,7 @@
         labs       => '127.0.0.1/log',
     }
 
+    # Kafka consumer group for this consumer is mysql-m4-master
     eventlogging::service::consumer { 'mysql-m4-master':
         input  => 
"${kafka_mixed_uri}&zookeeper_connect=${kafka_zookeeper_url}&${kafka_consumer_args}",
         output => 
"mysql://${mysql_user}:${mysql_pass}@${mysql_db}?charset=utf8&statsd_host=${statsd_host}&replace=True",

-- 
To view, visit https://gerrit.wikimedia.org/r/256728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a639df33bed198cbff71cb55b83eb4633245f14
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to