[MediaWiki-commits] [Gerrit] EventLogging varnish log tailers: make '.gif' suffix optional - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: EventLogging varnish log tailers: make '.gif' suffix optional
......................................................................


EventLogging varnish log tailers: make '.gif' suffix optional

Since we're migrating the EventLogging end-point off of bits and nesting it
under /beacon, we may as well perform the other outstanding clean-up task,
which is to drop the '.gif' suffix, which was never really needed.

Change-Id: Ie482863e00e3245cffec2c44c0be6a5b1848f759
---
M modules/role/manifests/cache/kafka/eventlogging.pp
M modules/role/manifests/cache/logging/eventlistener.pp
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp 
b/modules/role/manifests/cache/kafka/eventlogging.pp
index 849a445..7959365 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(\.gif)?\?.' },
         topic_request_required_acks  => '-1',
     }
 }
diff --git a/modules/role/manifests/cache/logging/eventlistener.pp 
b/modules/role/manifests/cache/logging/eventlistener.pp
index decf642..98136d7 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(\.gif)?\?. -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/209175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie482863e00e3245cffec2c44c0be6a5b1848f759
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits