Ema has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402022 )

Change subject: mtail: update varnishbackend.mtail regex
......................................................................

mtail: update varnishbackend.mtail regex

Varnish backends are not always named "vcl-$uuid.$backend_name", but can
also be defined as "boot.$backend_name". Update regular expression
accordingly.

Bug: T177199
Change-Id: I89f458f92cf32f7c30062546507c24234bb07bc3
---
M modules/mtail/files/programs/varnishbackend.mtail
M modules/varnishkafka
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/402022/1

diff --git a/modules/mtail/files/programs/varnishbackend.mtail 
b/modules/mtail/files/programs/varnishbackend.mtail
index df4c527..06e7843 100644
--- a/modules/mtail/files/programs/varnishbackend.mtail
+++ b/modules/mtail/files/programs/varnishbackend.mtail
@@ -5,6 +5,6 @@
 
 # TODO(filippo): add proper ttfb histograms once a mtail version with
 # https://github.com/google/mtail/issues/106 is deployed.
-/http_status (?P<status>[0-9][0-9][0-9])\thttp_method 
(?P<method>[A-Z]+)\tbackend vcl-[a-z0-9-]+\.(?P<backend>\S+)\t/ {
+/http_status (?P<status>[0-9][0-9][0-9])\thttp_method 
(?P<method>[A-Z]+)\tbackend (vcl-[a-z0-9-]+|boot)\.(?P<backend>\S+)\t/ {
   varnish_backend_requests_seconds_count[$status][$method][$backend]++
 }
diff --git a/modules/varnishkafka b/modules/varnishkafka
index 573a656..36fafe3 160000
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
@@ -1 +1 @@
-Subproject commit 573a65641dc226104aa272bd8a76dd8e92fec81f
+Subproject commit 36fafe3832330623d4bef1d9cef517bf7c407e0f

-- 
To view, visit https://gerrit.wikimedia.org/r/402022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89f458f92cf32f7c30062546507c24234bb07bc3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>

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

Reply via email to