BBlack has submitted this change and it was merged.
Change subject: stats bits endpoint: don't require a trailing slash
......................................................................
stats bits endpoint: don't require a trailing slash
Makes for nicer URLs, and URL length is at a premium when you're encoding
payload data as query parameters.
Change-Id: I6fd90b33a368149c8c73f567522777faaca41789
---
M manifests/role/cache.pp
M templates/varnish/bits.inc.vcl.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 9e2e564..940b208 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -488,7 +488,7 @@
format_type => 'json',
topic => 'statsv',
varnish_name => $varnish_name,
- varnish_opts => { 'm' => 'RxURL:^/statsv/', },
+ varnish_opts => { 'm' => 'RxURL:^/statsv[/?]', },
# By requiring 2 ACKs per message batch, we survive a
# single broker dropping out of its leader role,
# without seeing lost messages.
diff --git a/templates/varnish/bits.inc.vcl.erb
b/templates/varnish/bits.inc.vcl.erb
index 6f4e20e..18d24da 100644
--- a/templates/varnish/bits.inc.vcl.erb
+++ b/templates/varnish/bits.inc.vcl.erb
@@ -23,7 +23,7 @@
<% end -%>
sub vcl_recv {
- if (req.url ~ "^/(event\.gif|statsv/)") {
+ if (req.url ~ "^/(event\.gif|statsv[/?])") {
// URLs that start with 'event.gif' or 'statsv' are logging
beacon endpoints.
// They are handled by log tailers (varnishkafka and
varnishncsa) that filter
// the Varnish shm log for reqs to these endpoints and forward
them to log
--
To view, visit https://gerrit.wikimedia.org/r/177634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6fd90b33a368149c8c73f567522777faaca41789
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ori.livneh <[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
