Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/402785 )
Change subject: kripton: one role() call ...................................................................... kripton: one role() call Change-Id: I3d3f75227382943fbccd31ce5c20c92ad361b5f2 --- D hieradata/role/common/kafka/analytics/burrow.yaml M hieradata/role/common/webserver_misc_apps.yaml M manifests/site.pp 3 files changed, 9 insertions(+), 8 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/kafka/analytics/burrow.yaml b/hieradata/role/common/kafka/analytics/burrow.yaml deleted file mode 100644 index 82a7289..0000000 --- a/hieradata/role/common/kafka/analytics/burrow.yaml +++ /dev/null @@ -1,7 +0,0 @@ -burrow::lagcheck_intervals: 100 -burrow::httpserver_port: 8000 -burrow::consumer_groups: - - eventlogging_processor_client_side_00 - - eventlogging_consumer_mysql_00 - - eventlogging_consumer_mysql_eventbus_00 - - eventlogging_consumer_files_00 diff --git a/hieradata/role/common/webserver_misc_apps.yaml b/hieradata/role/common/webserver_misc_apps.yaml index 7ad0377..7818b94 100644 --- a/hieradata/role/common/webserver_misc_apps.yaml +++ b/hieradata/role/common/webserver_misc_apps.yaml @@ -1 +1,8 @@ standard::has_default_mail_relay: false +burrow::lagcheck_intervals: 100 +burrow::httpserver_port: 8000 +burrow::consumer_groups: + - eventlogging_processor_client_side_00 + - eventlogging_consumer_mysql_00 + - eventlogging_consumer_mysql_eventbus_00 + - eventlogging_consumer_files_00 diff --git a/manifests/site.pp b/manifests/site.pp index 15e9db2..49e8038 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1093,7 +1093,8 @@ # profile::racktables - https://racktables.wikimedia.org # kafka::analytics::burrow is a Kafka consumer lag monitor node 'krypton.eqiad.wmnet' { - role(webserver_misc_apps,kafka::analytics::burrow) + role(webserver_misc_apps) + include ::role::kafka::analytics::burrow } node /kubernetes[12]00[1-4]\.(codfw|eqiad)\.wmnet/ { -- To view, visit https://gerrit.wikimedia.org/r/402785 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d3f75227382943fbccd31ce5c20c92ad361b5f2 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
