expanded facts
This commit is contained in:
parent
fa51e8f36d
commit
a93db1948e
1 changed files with 23 additions and 0 deletions
|
@ -571,6 +571,8 @@ class LinuxHardware(Hardware):
|
|||
|
||||
platform = 'Linux'
|
||||
MEMORY_FACTS = ['MemTotal', 'SwapTotal', 'MemFree', 'SwapFree']
|
||||
EXTRA_MEMORY_FACTS = ['Buffers', 'Cached', 'SwapCached']
|
||||
|
||||
|
||||
def __init__(self):
|
||||
Hardware.__init__(self)
|
||||
|
@ -587,6 +589,7 @@ class LinuxHardware(Hardware):
|
|||
return self.facts
|
||||
|
||||
def get_memory_facts(self):
|
||||
memstats = {}
|
||||
if not os.access("/proc/meminfo", os.R_OK):
|
||||
return
|
||||
for line in open("/proc/meminfo").readlines():
|
||||
|
@ -595,6 +598,26 @@ class LinuxHardware(Hardware):
|
|||
if key in LinuxHardware.MEMORY_FACTS:
|
||||
val = data[1].strip().split(' ')[0]
|
||||
self.facts["%s_mb" % key.lower()] = long(val) / 1024
|
||||
if key in LinuxHardware.MEMORY_FACTS or key in LinuxHardware.EXTRA_MEMORY_FACTS:
|
||||
val = data[1].strip().split(' ')[0]
|
||||
memstats[key.lower()] = long(val) / 1024
|
||||
self.facts['memory_mb'] = {
|
||||
'real' : {
|
||||
'total': memstats['memtotal'],
|
||||
'used': (memstats['memtotal'] - memstats['memfree']),
|
||||
'free': memstats['memfree']
|
||||
},
|
||||
'nocache' : {
|
||||
'free': memstats['cached'] + memstats['memfree'] + memstats['buffers'],
|
||||
'used': memstats['memtotal'] - (memstats['cached'] + memstats['memfree'] + memstats['buffers'])
|
||||
},
|
||||
'swap' : {
|
||||
'total': memstats['swaptotal'],
|
||||
'free': memstats['swapfree'],
|
||||
'used': memstats['swaptotal'] - memstats['swapfree'],
|
||||
'cached': memstats['swapcached']
|
||||
}
|
||||
}
|
||||
|
||||
def get_cpu_facts(self):
|
||||
i = 0
|
||||
|
|
Loading…
Reference in a new issue