valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Streamline wmic command returns for easier parsing

Browse Source
This commit is contained in:
twangboy 2017-02-21 12:06:56 -07:00
parent 6d2cf8171e
commit c258cb3f73
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
salt/modules/win_status.py
View File

@ -82,17 +82,11 @@ def cpuload():
'''
# Pull in the information from WMIC
cmd = list2cmdline(['wmic', 'cpu'])
info = __salt__['cmd.run'](cmd).split('\r\n')
# Find the location of LoadPercentage
column = info[0].index('LoadPercentage')
# Get the end of the number.
end = info[1].index(' ', column+1)
cmd = list2cmdline(['wmic', 'cpu', 'get', 'loadpercentage', '/value'])
info = __salt__['cmd.run'](cmd).split('=')
# Return pull it out of the informatin and cast it to an int
return int(info[1][column:end])
return int(info[1])
def diskusage(human_readable=False, path=None):
@ -216,18 +210,9 @@ def uptime(human_readable=False):
'''
# Open up a subprocess to get information from WMIC
cmd = list2cmdline(['wmic', 'os', 'get', 'lastbootuptime'])
outs = __salt__['cmd.run'](cmd)
cmd = list2cmdline(['wmic', 'os', 'get', 'lastbootuptime', '/value'])
startup_time = __salt__['cmd.run'](cmd).split('=')[1][:14]
# Get the line that has when the computer started in it:
stats_line = ''
# use second line from output
stats_line = outs.split('\r\n')[1]
# Extract the time string from the line and parse
#
# Get string, just use the leading 14 characters
startup_time = stats_line[:14]
# Convert to time struct
startup_time = time.strptime(startup_time, '%Y%m%d%H%M%S')
# Convert to datetime object