[MediaWiki-commits] [Gerrit] operations/puppet[production]: mtail: update varnishbackend.mtail regex

2018-01-04 Thread Ema (Code Review) 
Ema has submitted this change and it was merged. ( 
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/mtail/files/test/logs/varnishbackend.test
M modules/mtail/files/test/varnish_test.py
3 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Ema: Looks good to me, approved
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, but someone else must approve



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[0-9][0-9][0-9])\thttp_method 
(?P[A-Z]+)\tbackend vcl-[a-z0-9-]+\.(?P\S+)\t/ {
+/http_status (?P[0-9][0-9][0-9])\thttp_method 
(?P[A-Z]+)\tbackend (vcl-[a-z0-9-]+|boot)\.(?P\S+)\t/ {
   varnish_backend_requests_seconds_count[$status][$method][$backend]++
 }
diff --git a/modules/mtail/files/test/logs/varnishbackend.test 
b/modules/mtail/files/test/logs/varnishbackend.test
index c376434..7c07f66 100644
--- a/modules/mtail/files/test/logs/varnishbackend.test
+++ b/modules/mtail/files/test/logs/varnishbackend.test
@@ -1,3 +1,4 @@
+http_status 301http_method GET backend boot.be_cp1065_eqiad_wmnet  
ttfb 0.001797   
 http_status 200http_method GET backend 
vcl-root-4d6ee02a-4455-43f6-aebd-f6a5f538b139.be_wdqs_svc_eqiad_wmnet   ttfb 
0.071747   
 http_status 200http_method GET backend 
vcl-root-4d6ee02a-4455-43f6-aebd-f6a5f538b139.be_wdqs_svc_eqiad_wmnet   ttfb 
0.015312   
 http_status 200http_method GET backend 
vcl-root-4d6ee02a-4455-43f6-aebd-f6a5f538b139.be_wdqs_svc_eqiad_wmnet   ttfb 
0.018608   
diff --git a/modules/mtail/files/test/varnish_test.py 
b/modules/mtail/files/test/varnish_test.py
index 56c6997..c48fb80 100644
--- a/modules/mtail/files/test/varnish_test.py
+++ b/modules/mtail/files/test/varnish_test.py
@@ -92,3 +92,4 @@
 
self.assertIn(('status=200,method=GET,backend=be_wdqs_svc_eqiad_wmnet', 12), s)
 self.assertIn(('status=204,method=GET,backend=be_bohrium_eqiad_wmnet', 
2), s)
 
self.assertIn(('status=200,method=POST,backend=be_bohrium_eqiad_wmnet', 1), s)
+self.assertIn(('status=301,method=GET,backend=be_cp1065_eqiad_wmnet', 
1), s)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89f458f92cf32f7c30062546507c24234bb07bc3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mtail: update varnishbackend.mtail regex

2018-01-04 Thread Ema (Code Review) 
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[0-9][0-9][0-9])\thttp_method 
(?P[A-Z]+)\tbackend vcl-[a-z0-9-]+\.(?P\S+)\t/ {
+/http_status (?P[0-9][0-9][0-9])\thttp_method 
(?P[A-Z]+)\tbackend (vcl-[a-z0-9-]+|boot)\.(?P\S+)\t/ {
   varnish_backend_requests_seconds_count[$status][$method][$backend]++
 }
diff --git a/modules/varnishkafka b/modules/varnishkafka
index 573a656..36fafe3 16
--- 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 

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