Ema has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280646
Change subject: ganglia-varnish.py: get rid of dangerous characters
......................................................................
ganglia-varnish.py: get rid of dangerous characters
Many Varnish metric descriptions reported by varnishstat have been
changed in Varnish 4. Some of these new strings include characters that
break our Ganglia aggregators in spectacular ways.
Get rid of those characters.
Bug: T122880
Change-Id: Id36c15faa2b3ee23d8ff824f217f1f445851bd6b
---
M modules/varnish/files/ganglia/ganglia-varnish.py
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/280646/1
diff --git a/modules/varnish/files/ganglia/ganglia-varnish.py
b/modules/varnish/files/ganglia/ganglia-varnish.py
index f1ed58f..f1374dc 100644
--- a/modules/varnish/files/ganglia/ganglia-varnish.py
+++ b/modules/varnish/files/ganglia/ganglia-varnish.py
@@ -16,6 +16,13 @@
instances = ['']
+def fix_description(value):
+ # Encode into ascii and remove single quotes
+ value = value.encode('ascii').replace("'", "")
+ # Remove brackets
+ return value.replace("(", "").replace(")", "")
+
+
def metric_init(params):
global varnishstat_path, instances, stats_cache
@@ -44,7 +51,7 @@
'units': (slope == 'positive' and 'N/s' or 'N'),
'slope': slope,
'format': '%u',
- 'description':
properties['description'].encode('ascii').replace("'", '"'),
+ 'description': fix_description(properties['description']),
'groups': "varnish " + (instance == "varnish" and
"(default instance)" or instance)
}
--
To view, visit https://gerrit.wikimedia.org/r/280646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id36c15faa2b3ee23d8ff824f217f1f445851bd6b
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
