Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/209179
Change subject: EventLogging log tailers: simplify regexes ...................................................................... EventLogging log tailers: simplify regexes With I019944f42 in place, the only path being logged to is /beacon/event, so we can make the regex less accomodating. Change-Id: I30d19ac6060bf27d2b51eb36e0e9975a92974de3 --- M modules/role/manifests/cache/kafka/eventlogging.pp M modules/role/manifests/cache/logging/eventlistener.pp 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/209179/1 diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp b/modules/role/manifests/cache/kafka/eventlogging.pp index 7959365..a7405ab 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)?\?.' }, + varnish_opts => { 'm' => 'RxURL:^/beacon/event\?.' }, topic_request_required_acks => '-1', } } diff --git a/modules/role/manifests/cache/logging/eventlistener.pp b/modules/role/manifests/cache/logging/eventlistener.pp index 98136d7..249dd12 100644 --- a/modules/role/manifests/cache/logging/eventlistener.pp +++ b/modules/role/manifests/cache/logging/eventlistener.pp @@ -8,7 +8,7 @@ listener_address => $event_listener, port => '8422', instance_name => $instance_name, - cli_args => '-m RxURL:^/(beacon/)?event(\.gif)?\?. -D', + cli_args => '-m RxURL:^/beacon/event\?. -D', log_fmt => '%q\t%l\t%n\t%t\t%h\t"%{User-agent}i"', monitor => false, } -- To view, visit https://gerrit.wikimedia.org/r/209179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30d19ac6060bf27d2b51eb36e0e9975a92974de3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits