Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234543
Change subject: Set up varnishkafka instance on cache servers to log raw client
side events to kafka
......................................................................
Set up varnishkafka instance on cache servers to log raw client side events to
kafka
This will soon fully deprecate the UDP based varnishncsa instance, allow us
to turn off the eventlogging client side UDP -> ZMQ forwarder.
Bug: T106255
Change-Id: I470e37575fae87cd85665af88c7212229e68b16b
---
M manifests/role/eventlogging.pp
M modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/text.pp
4 files changed, 16 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/43/234543/1
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 213f0bc..dd48997 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -269,10 +269,10 @@
# This will be replaced by configuring varnishkafka on cache servers to
send
# events directly to kafka topic 'eventlogging-client-side'.
- eventlogging::service::forwarder { 'client-side-raw':
- input =>
"tcp://${forwarder_host}:8422?identity=server-side-raw-kafka",
- outputs => ["${kafka_base_uri}?topic=eventlogging-client-side"],
- }
+ # eventlogging::service::forwarder { 'client-side-raw':
+ # input =>
"tcp://${forwarder_host}:8422?identity=server-side-raw-kafka",
+ # outputs => ["${kafka_base_uri}?topic=eventlogging-client-side"],
+ # }
}
diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp
b/modules/role/manifests/cache/kafka/eventlogging.pp
index 7959365..c85fd2e 100644
--- a/modules/role/manifests/cache/kafka/eventlogging.pp
+++ b/modules/role/manifests/cache/kafka/eventlogging.pp
@@ -11,7 +11,7 @@
topic => 'eventlogging-client-side',
varnish_name => $varnish_name,
varnish_svc_name => $varnish_svc_name,
- varnish_opts => { 'm' => 'RxURL:^/beacon/event(\.gif)?\?.' },
- topic_request_required_acks => '-1',
+ varnish_opts => { 'm' => 'RxURL:^/(beacon/)?event(\.gif)?\?' },
+ topic_request_required_acks => '1',
}
}
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index fd088c8..b67ee30 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -141,9 +141,14 @@
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',
}
+ class { '::role::cache::kafka::eventlogging':
+ varnish_name => 'frontend',
+ }
# ToDo: Remove production conditional once this works
# is verified to work in labs.
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index cb62b95..d3807f3 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -172,9 +172,14 @@
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',
}
+ class { '::role::cache::kafka::eventlogging':
+ varnish_name => 'frontend',
+ }
# ToDo: Remove production conditional once this works
# is verified to work in labs.
--
To view, visit https://gerrit.wikimedia.org/r/234543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I470e37575fae87cd85665af88c7212229e68b16b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
