[MediaWiki-commits] [Gerrit] operations/puppet[production]: mtail: group invalid methods under a single metric
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402318 )
Change subject: mtail: group invalid methods under a single metric
..
mtail: group invalid methods under a single metric
This field is essentially user input, to avoid cardinality explosions and
general metric clutter group all HTTP methods we consider invalid under a single
metric.
Bug: T183926
Change-Id: I27b490f7c2e5acc323053dd1c72f2d75a9c9382b
---
M modules/mtail/files/programs/varnishreqstats.mtail
M modules/mtail/files/test/logs/varnish.test
M modules/mtail/files/test/varnish_test.py
3 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Ema: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/mtail/files/programs/varnishreqstats.mtail
b/modules/mtail/files/programs/varnishreqstats.mtail
index 764f0e2..a324f12 100644
--- a/modules/mtail/files/programs/varnishreqstats.mtail
+++ b/modules/mtail/files/programs/varnishreqstats.mtail
@@ -1,5 +1,9 @@
counter varnish_requests by status, method
/\thttp_status (?P[0-9][0-9][0-9])\thttp_method (?P[A-Z]+)\t/ {
-varnish_requests[$status][$method]++
+/http_method (OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT|PURGE|PATCH)/
{
+ varnish_requests[$status][$method]++
+} else {
+ varnish_requests[$status]["invalid"]++
+}
}
diff --git a/modules/mtail/files/test/logs/varnish.test
b/modules/mtail/files/test/logs/varnish.test
index a8f0da0..e5155da 100644
--- a/modules/mtail/files/test/logs/varnish.test
+++ b/modules/mtail/files/test/logs/varnish.test
@@ -7,3 +7,4 @@
url /wikipedia/commons/5/51/Tang_Shaoyi.jpgcache_status int-front
http_status 301 http_method GET cache_control - inm -
url
/wikipedia/commons/thumb/5/51/Flag_of_North_Korea.svg/250px-Flag_of_North_Korea.svg.png
cache_status hit-front http_status 200 http_method GET cache_control - inm
-
url /wikipedia/en/thumb/f/fd/Portal-puzzle.svg/16px-Portal-puzzle.svg.png
cache_status hit-front http_status 200 http_method GET cache_control - inm -
+url /test_for_invalid_method cache_status hit-front http_status 200
http_method FOOZcache_control - inm -
diff --git a/modules/mtail/files/test/varnish_test.py
b/modules/mtail/files/test/varnish_test.py
index c48fb80..0abe36e 100644
--- a/modules/mtail/files/test/varnish_test.py
+++ b/modules/mtail/files/test/varnish_test.py
@@ -14,7 +14,7 @@
def testCacheStatus(self):
s = self.store.get_samples('varnish_x_cache')
self.assertIn(('x_cache=int-front', 2), s)
-self.assertIn(('x_cache=hit-front', 7), s)
+self.assertIn(('x_cache=hit-front', 8), s)
class VarnishRlsTest(unittest.TestCase):
@@ -79,6 +79,7 @@
self.assertIn(('status=200,method=GET', 3), s)
self.assertIn(('status=301,method=GET', 2), s)
self.assertIn(('status=200,method=HEAD', 2), s)
+self.assertIn(('status=200,method=invalid', 1), s)
class VarnishBackendTest(unittest.TestCase):
--
To view, visit https://gerrit.wikimedia.org/r/402318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I27b490f7c2e5acc323053dd1c72f2d75a9c9382b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Ema
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Volans
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: group invalid methods under a single metric
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402318 )
Change subject: mtail: group invalid methods under a single metric
..
mtail: group invalid methods under a single metric
This field is essentially user input, to avoid cardinality explosions and
general metric clutter group all HTTP methods we consider invalid under a single
metric.
Bug: T183926
Change-Id: I27b490f7c2e5acc323053dd1c72f2d75a9c9382b
---
M modules/mtail/files/programs/varnishreqstats.mtail
M modules/mtail/files/test/logs/varnish.test
M modules/mtail/files/test/varnish_test.py
3 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/402318/1
diff --git a/modules/mtail/files/programs/varnishreqstats.mtail
b/modules/mtail/files/programs/varnishreqstats.mtail
index 764f0e2..a324f12 100644
--- a/modules/mtail/files/programs/varnishreqstats.mtail
+++ b/modules/mtail/files/programs/varnishreqstats.mtail
@@ -1,5 +1,9 @@
counter varnish_requests by status, method
/\thttp_status (?P[0-9][0-9][0-9])\thttp_method (?P[A-Z]+)\t/ {
-varnish_requests[$status][$method]++
+/http_method (OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT|PURGE|PATCH)/
{
+ varnish_requests[$status][$method]++
+} else {
+ varnish_requests[$status]["invalid"]++
+}
}
diff --git a/modules/mtail/files/test/logs/varnish.test
b/modules/mtail/files/test/logs/varnish.test
index a8f0da0..e5155da 100644
--- a/modules/mtail/files/test/logs/varnish.test
+++ b/modules/mtail/files/test/logs/varnish.test
@@ -7,3 +7,4 @@
url /wikipedia/commons/5/51/Tang_Shaoyi.jpgcache_status int-front
http_status 301 http_method GET cache_control - inm -
url
/wikipedia/commons/thumb/5/51/Flag_of_North_Korea.svg/250px-Flag_of_North_Korea.svg.png
cache_status hit-front http_status 200 http_method GET cache_control - inm
-
url /wikipedia/en/thumb/f/fd/Portal-puzzle.svg/16px-Portal-puzzle.svg.png
cache_status hit-front http_status 200 http_method GET cache_control - inm -
+url /test_for_invalid_method cache_status hit-front http_status 200
http_method FOOZcache_control - inm -
diff --git a/modules/mtail/files/test/varnish_test.py
b/modules/mtail/files/test/varnish_test.py
index c48fb80..0abe36e 100644
--- a/modules/mtail/files/test/varnish_test.py
+++ b/modules/mtail/files/test/varnish_test.py
@@ -14,7 +14,7 @@
def testCacheStatus(self):
s = self.store.get_samples('varnish_x_cache')
self.assertIn(('x_cache=int-front', 2), s)
-self.assertIn(('x_cache=hit-front', 7), s)
+self.assertIn(('x_cache=hit-front', 8), s)
class VarnishRlsTest(unittest.TestCase):
@@ -79,6 +79,7 @@
self.assertIn(('status=200,method=GET', 3), s)
self.assertIn(('status=301,method=GET', 2), s)
self.assertIn(('status=200,method=HEAD', 2), s)
+self.assertIn(('status=200,method=invalid', 1), s)
class VarnishBackendTest(unittest.TestCase):
--
To view, visit https://gerrit.wikimedia.org/r/402318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27b490f7c2e5acc323053dd1c72f2d75a9c9382b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
