Ottomata has submitted this change and it was merged.
Change subject: On second thought, remove new eventlogging::analytics role
......................................................................
On second thought, remove new eventlogging::analytics role
We will do this, but not as part of T118772
Change-Id: If5522a50da087a2899b7fa94ef8e34e62ad9b373
---
M manifests/role/eventlogging.pp
M manifests/site.pp
D modules/role/manifests/eventlogging/README.md
D modules/role/manifests/eventlogging/analytics.pp
4 files changed, 8 insertions(+), 37 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 6051696..e1d8c9c 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -76,8 +76,12 @@
$kafka_server_side_raw_uri =
"${kafka_base_uri}?topic=eventlogging-server-side"
$kafka_client_side_raw_uri =
"${kafka_base_uri}?topic=eventlogging-client-side"
+ # TODO: This include will be removed once eventlogging code is using
+ # the deploy out of /srv/deployment/eventlogging/analytics.
include ::eventlogging
+ eventlogging::deployment::target { 'analytics': }
+
# This check was written for eventlog1001, so only include it there.,
if $::hostname == 'eventlog1001' {
diff --git a/manifests/site.pp b/manifests/site.pp
index f38de3e..3a97187 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -985,25 +985,21 @@
role etherpad
}
-# Receives log data from Kafka and Apaches (udp 8421),
-# processes it, and broadcasts to Kafka Schema based topics.
+# Receives log data from Kafka processes it, and broadcasts
+# to Kafka Schema based topics.
node 'eventlog1001.eqiad.wmnet', 'eventlog2001.codfw.wmnet' {
role eventlogging,
eventlogging::forwarder,
eventlogging::processor,
eventlogging::consumer::mysql,
eventlogging::consumer::files,
- logging::mediawiki::errors,
- # TODO: This is in trial mode while we migrate away
- # from manifests/role classes into module/role, and
- # use scap3 for deployment.
- eventlogging::analytics
-
+ logging::mediawiki::errors
include standard
include base::firewall
}
+
# virtual machine for mailman list server
node 'fermium.wikimedia.org' {
role lists::server
diff --git a/modules/role/manifests/eventlogging/README.md
b/modules/role/manifests/eventlogging/README.md
deleted file mode 100644
index 7b045b6..0000000
--- a/modules/role/manifests/eventlogging/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# EventLogging role classes
-
-At the very least, each of these classes sets up a distinct scap deployment
-target for deploying the EventLogging python codebase. The
-eventlogging::deployment::target define in the eventlogging module
-sets up EventLoggging dependencies via the eventlogging::dependencies
-class, and also a scap::target for deploying the eventlogging code.
-
-- analytics: The original Analytics deployment of EventLogging. This
- role sets up and manages EventLogging daemon processes for processing
- Analytics events.
-
-TODO: Move eventbus/eventbus.pp role here to role::eventlogging::eventbus.
-
diff --git a/modules/role/manifests/eventlogging/analytics.pp
b/modules/role/manifests/eventlogging/analytics.pp
deleted file mode 100644
index c269b56..0000000
--- a/modules/role/manifests/eventlogging/analytics.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# == Class role::eventlogging::analytics
-#
-class role::eventlogging::analytics {
- system::role { 'role::eventlogging::analytics':
- description => 'EventLogging Analytics Processor and Consumer',
- }
-
- eventlogging::deployment::target { 'analytics':
- # TODO: Do we need this sudo rule for 'eventlogging' user here?
- # Allow eventlogging user to run eventloggingctl as root.
- # sudo_rules => ['ALL=(root) NOPASSWD: /sbin/eventloggingctl *']
- }
-
- # TODO: Move manifests/role/eventlogging.pp classes here.
-}
--
To view, visit https://gerrit.wikimedia.org/r/282212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5522a50da087a2899b7fa94ef8e34e62ad9b373
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[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
