Ottomata has submitted this change and it was merged.
Change subject: Remove unused role::cache::logging::eventlistener, add comments
describing different varnish loggers
......................................................................
Remove unused role::cache::logging::eventlistener, add comments describing
different varnish loggers
Change-Id: I1e5cac20586b27469cad2bbabb7dc10d50cbdc0d
---
D modules/role/manifests/cache/logging/eventlistener.pp
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
5 files changed, 27 insertions(+), 35 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/logging/eventlistener.pp
b/modules/role/manifests/cache/logging/eventlistener.pp
deleted file mode 100644
index d5103d1..0000000
--- a/modules/role/manifests/cache/logging/eventlistener.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class role::cache::logging::eventlistener( $instance_name = '' ) {
- $event_listener = $::realm ? {
- # default to eventlog1001
- 'production' => hiera('eventlogging_host', '10.64.32.167'),
- # default to deployment-eventlogging03
- 'labs' => hiera('eventlogging_host', '10.68.18.111'),
- }
-
- varnish::logging { 'eventlogging' :
- listener_address => $event_listener,
- port => '8422',
- instance_name => $instance_name,
- 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',
- }
-}
diff --git a/modules/role/manifests/cache/maps.pp
b/modules/role/manifests/cache/maps.pp
index ccd2985..51548c5 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -103,6 +103,8 @@
]),
}
+ # varnish::logging UDP based varnishncsa to be removed once
+ # all uses of udp2log are ported to Kafka.
include role::cache::logging
# ToDo: Remove production conditional once this works
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index 1caff9b..105f983 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -163,19 +163,23 @@
]),
}
- # varnish::logging to be removed once
- # udp2log kafka consumer is implemented and deployed.
+ # varnish::logging UDP based varnishncsa to be removed once
+ # all uses of udp2log are ported to Kafka.
include role::cache::logging
+ # varnishkafka statsv listens for special stats related requests
+ # and sends them to the 'statsv' topic in Kafka.
+ # A kafka consumer then consumes these and emits
+ # metrics.
class { '::role::cache::kafka::statsv':
varnish_name => 'frontend',
}
- # role::cache::logging::eventlistener will soon be fully
- # replaced by role::cache::kafka::eventlogging.
- class { '::role::cache::logging::eventlistener':
- instance_name => 'frontend',
- }
+ # varnishkafka eventlogging listens for eventlogging
+ # requests and logs them to the eventlogging-client-side
+ # topic. EventLogging servers consume and process this
+ # topic into many JSON based kafka topics for further
+ # consumption.
class { '::role::cache::kafka::eventlogging':
varnish_name => 'frontend',
}
@@ -184,7 +188,7 @@
# is verified to work in labs.
if $::realm == 'production' {
# Install a varnishkafka producer to send
- # varnish webrequest logs to Kafka.
+ # all varnish webrequest logs to Kafka.
class { 'role::cache::kafka::webrequest': topic => 'webrequest_mobile'
}
}
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 8da1971..422bde7 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -164,19 +164,23 @@
]),
}
- # varnish::logging to be removed once
- # udp2log kafka consumer is implemented and deployed.
+ # varnish::logging UDP based varnishncsa to be removed once
+ # all uses of udp2log are ported to Kafka.
include role::cache::logging
+ # varnishkafka statsv listens for special stats related requests
+ # and sends them to the 'statsv' topic in Kafka.
+ # A kafka consumer then consumes these and emits
+ # metrics.
class { '::role::cache::kafka::statsv':
varnish_name => 'frontend',
}
- # role::cache::logging::eventlistener will soon be fully
- # replaced by role::cache::kafka::eventlogging.
- class { '::role::cache::logging::eventlistener':
- instance_name => 'frontend',
- }
+ # varnishkafka eventlogging listens for eventlogging
+ # requests and logs them to the eventlogging-client-side
+ # topic. EventLogging servers consume and process this
+ # topic into many JSON based kafka topics for further
+ # consumption.
class { '::role::cache::kafka::eventlogging':
varnish_name => 'frontend',
}
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index c75cea5..aeb1cbf 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -123,6 +123,8 @@
]),
}
+ # varnish::logging UDP based varnishncsa to be removed once
+ # all uses of udp2log are ported to Kafka.
include role::cache::logging
# ToDo: Remove production conditional once this works
--
To view, visit https://gerrit.wikimedia.org/r/247566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e5cac20586b27469cad2bbabb7dc10d50cbdc0d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: BBlack <[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
