Ottomata has submitted this change and it was merged.
Change subject: Turn off varnishncsa udp logging for eventlogging
......................................................................
Turn off varnishncsa udp logging for eventlogging
Bug: T106260
Change-Id: Ic2ed59f60fe6885d79998fe4a0ef1a7c970d1f29
---
M manifests/role/eventlogging.pp
M manifests/site.pp
M modules/role/manifests/cache/logging/eventlistener.pp
3 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 5473df7..a82cf7d 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -10,12 +10,9 @@
# PHP and mw.eventLog.logEvent() in JavaScript. Events generated in PHP
# are sent by the app servers directly to eventlog* servers on UDP port 8421.
# JavaScript-generated events are URL-encoded and sent to our servers by
-# means of an HTTP/S request to bits, which a varnishncsa instance
-# forwards to eventlog* on port 8422. These event streams are parsed,
-# validated, and multiplexed into an output stream that is published via
-# ZeroMQ on TCP port 8600. Data sinks are implemented as subscribers
-# that connect to this endpoint and read data into some storage medium.
-#
+# means of an HTTP/S request to bits, which a varnishkafka instance
+# forwards to Kafka. These event streams are parsed,
+# validated, and multiplexed into an output streams in Kafka.
# == Class role::eventlogging
diff --git a/manifests/site.pp b/manifests/site.pp
index d7543bd..b1213e9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -986,8 +986,8 @@
include role::etherpad
}
-# Receives log data from varnishes (udp 8422) and Apaches (udp 8421),
-# processes it, and broadcasts to internal subscribers.
+# Receives log data from Kafka and Apaches (udp 8421),
+# processes it, and broadcasts to Kafka Schema based topics.
node 'eventlog1001.eqiad.wmnet' {
role eventlogging,
eventlogging::forwarder,
diff --git a/modules/role/manifests/cache/logging/eventlistener.pp
b/modules/role/manifests/cache/logging/eventlistener.pp
index 2a350ac..d5103d1 100644
--- a/modules/role/manifests/cache/logging/eventlistener.pp
+++ b/modules/role/manifests/cache/logging/eventlistener.pp
@@ -13,5 +13,8 @@
cli_args => '-m RxURL:^/(beacon/)?event(\.gif)?\?. -D',
log_fmt => '%q\t%l\t%n\t%t\t%h\t"%{User-agent}i"',
monitor => false,
+ # This is being replaced by varnishkafka.
+ # This class will be removed.
+ ensure => 'absent',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/237490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2ed59f60fe6885d79998fe4a0ef1a7c970d1f29
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Madhuvishy <[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
