Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54464
Change subject: Fix swift-ganglia-report-global-stats for 3.5
......................................................................
Fix swift-ganglia-report-global-stats for 3.5
The Ganglia 3.5 apparently broke this; a simple shot-in-the-dark space
to underscore change seemed to have fixed this.
Change-Id: I4305ccf75f44b181975713311feabd1d297291a2
---
M files/swift/swift-ganglia-report-global-stats
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/54464/1
diff --git a/files/swift/swift-ganglia-report-global-stats
b/files/swift/swift-ganglia-report-global-stats
index f5531ce..2125c20 100755
--- a/files/swift/swift-ganglia-report-global-stats
+++ b/files/swift/swift-ganglia-report-global-stats
@@ -150,10 +150,10 @@
# let's use 'pmtpa prod' instead of 'pmtpa-prod'
clustername = conf['clustername'].replace('-', ' ')
- submit_to_ganglia(name="swift object count", value=stats['Objects'],
units='total objects', spoof="Swift %s:Swift %s" % (clustername, clustername))
- submit_to_ganglia(name="swift bytes count", value=stats['Bytes'],
units='total bytes', spoof="Swift %s:Swift %s" % (clustername, clustername))
- submit_to_ganglia(name="swift object change", value=deltastats['Objects'],
units='objects per second', spoof="Swift %s:Swift %s" % (clustername,
clustername))
- submit_to_ganglia(name="swift bytes change", value=deltastats['Bytes'],
units='bytes per second', spoof="Swift %s:Swift %s" % (clustername,
clustername))
+ submit_to_ganglia(name="swift_object_count", value=stats['Objects'],
units='total objects', spoof="Swift %s:Swift %s" % (clustername, clustername))
+ submit_to_ganglia(name="swift_bytes_count", value=stats['Bytes'],
units='total bytes', spoof="Swift %s:Swift %s" % (clustername, clustername))
+ submit_to_ganglia(name="swift_object_change", value=deltastats['Objects'],
units='objects per second', spoof="Swift %s:Swift %s" % (clustername,
clustername))
+ submit_to_ganglia(name="swift_bytes_change", value=deltastats['Bytes'],
units='bytes per second', spoof="Swift %s:Swift %s" % (clustername,
clustername))
# not reporting containers at the moment because it's not very interesting
if __name__ == '__main__':
--
To view, visit https://gerrit.wikimedia.org/r/54464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4305ccf75f44b181975713311feabd1d297291a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits