Ema has submitted this change and it was merged. Change subject: ganglia-varnish.py: use double quotes in metric description ......................................................................
ganglia-varnish.py: use double quotes in metric description Varnish 4 introduced a metric description including single quotes: MAIN.bans_completed Number of bans marked 'completed' However, ganglia metric titles as defined in /etc/ganglia/conf.d/varnish.pyconf are delimited by single quotes. Use double quotes instead. Bug: T122880 Change-Id: Ic8aa4894383732a91ebe2232a8a5ff98f7035e85 --- M modules/varnish/files/ganglia/ganglia-varnish.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ema: Verified; Looks good to me, approved BBlack: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/varnish/files/ganglia/ganglia-varnish.py b/modules/varnish/files/ganglia/ganglia-varnish.py index 6f5a39f..f1ed58f 100644 --- a/modules/varnish/files/ganglia/ganglia-varnish.py +++ b/modules/varnish/files/ganglia/ganglia-varnish.py @@ -44,7 +44,7 @@ 'units': (slope == 'positive' and 'N/s' or 'N'), 'slope': slope, 'format': '%u', - 'description': properties['description'].encode('ascii'), + 'description': properties['description'].encode('ascii').replace("'", '"'), 'groups': "varnish " + (instance == "varnish" and "(default instance)" or instance) } -- To view, visit https://gerrit.wikimedia.org/r/280412 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8aa4894383732a91ebe2232a8a5ff98f7035e85 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits