Ori.livneh has submitted this change and it was merged.

Change subject: ganglia: diskstats plugin using wrong default
......................................................................


ganglia: diskstats plugin using wrong default

The DEVICES global is supposed to list all devices we want to monitor,
whenever it is not set in diskstat.pyconf, it would end up being set to
None ( {}.get('nonexistent') -> None) but the device lookup code only
triggers when DEVICE is an empty string.

Change-Id: I167393e80d76d076be4d1823ef88aa304407be79
---
M files/ganglia/plugins/diskstat.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/ganglia/plugins/diskstat.py 
b/files/ganglia/plugins/diskstat.py
index ff8da7b..d49a0ec 100644
--- a/files/ganglia/plugins/diskstat.py
+++ b/files/ganglia/plugins/diskstat.py
@@ -381,7 +381,7 @@
                device_mapper = 'true'
                logging.debug('dm block devices: ' + str(devices))
        else:
-               DEVICES = params.get('devices')
+               DEVICES = params.get('devices', '')
 
        logging.debug('init: ' + str(params))
 

-- 
To view, visit https://gerrit.wikimedia.org/r/91360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I167393e80d76d076be4d1823ef88aa304407be79
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to