Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397876 )
Change subject: varnishxcps.mtail: use prometheus labels
......................................................................
varnishxcps.mtail: use prometheus labels
Turn tls version, key_exchange, auth, and cipher into labels. By doing
this, we make it possible to use various combinations of those stats
together and answer questions such as: how many TLSv1.2 connections used
x25519 for key exchange?
Leave HTTP2, TLS session reuse and TLS full cipher stats as separate
counters.
Bug: T177199
Change-Id: I79c67927cb86b3bbbe0b8dccaba7c767b5296a7a
---
M modules/mtail/files/programs/varnishxcps.mtail
1 file changed, 9 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/397876/1
diff --git a/modules/mtail/files/programs/varnishxcps.mtail
b/modules/mtail/files/programs/varnishxcps.mtail
index b74f9cb..5ed7d84 100644
--- a/modules/mtail/files/programs/varnishxcps.mtail
+++ b/modules/mtail/files/programs/varnishxcps.mtail
@@ -1,36 +1,20 @@
-counter tls_h2
-counter tls_version by version
-counter tls_sess_reused
-counter tls_key_exchange by type
-counter tls_auth by type
-counter tls_cipher by name
-counter tls_full_cipher by name
+counter xcps_h2
+counter xcps_tls_sess_reused
+counter xcps_tls by version, key_exchange, auth, cipher
+counter xcps_tls_full_cipher by name
/\th2 1\t/ {
- tls_h2++
-}
-
-/\ttls_version (?P<version>TLSv[0-9\.]+)\t/ {
- tls_version[$version]++
+ xcps_h2++
}
/\tsession_reused 1\t/ {
- tls_sess_reused++
+ xcps_tls_sess_reused++
}
-/\tkey_exchange (?P<type>[a-zA-Z0-9-_]+)\t/ {
- tls_key_exchange[$type]++
-}
-
-/\tauth (?P<type>[a-zA-Z0-9-_]+)\t/ {
- tls_auth[$type]++
-}
-
-
-/\tcipher (?P<name>[a-zA-Z0-9-_]+)\t/ {
- tls_cipher[$name]++
+/\ttls_version (?P<version>TLSv[0-9\.]+)\t.*\tkey_exchange
(?P<key_exchange>[a-zA-Z0-9-_]+)\tauth (?P<auth>[a-zA-Z0-9-_]+)\tcipher
(?P<cipher>[a-zA-Z0-9-_]+)\t/ {
+ xcps_tls[$version][$key_exchange][$auth][$cipher]++
}
/\tfull_cipher (?P<name>[a-zA-Z0-9-_]+)\t/ {
- tls_full_cipher[$name]++
+ xcps_tls_full_cipher[$name]++
}
--
To view, visit https://gerrit.wikimedia.org/r/397876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79c67927cb86b3bbbe0b8dccaba7c767b5296a7a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
