saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33474 from cachedout/issue_29451

Browse source 
Fix diskusage beacon
This commit is contained in:
Mike Place 2016-05-25 10:10:53 -07:00
commit e9b648e461
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/beacons/diskusage.py
View file

@ -62,8 +62,7 @@ def beacon(config):
- /mnt/nfs: 50%
'''
ret = []
for diskusage in config:
mount = diskusage.keys()[0]
for mount in config:
try:
_current_usage = psutil.disk_usage(mount)
@ -73,7 +72,7 @@ def beacon(config):
continue
current_usage = _current_usage.percent
monitor_usage = diskusage[mount]
monitor_usage = config[mount]
if '%' in monitor_usage:
monitor_usage = re.sub('%', '', monitor_usage)
monitor_usage = float(monitor_usage)