Just report MemAvailable as usable if it's in meminfo.

Typo. Typo.
DataDog · Oct 23, 2015 · a0efe9a · a0efe9a
1 parent 7262df0
commit a0efe9a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/checks/collector.py b/checks/collector.py
@@ -319,10 +319,6 @@ def run(self, checksd=None, start_event=True):
                     'memBuffers': memory.get('physBuffers'),
                     'memShared': memory.get('physShared')
                 }
-                if 'physAvailable' in memory:
-                    memstats['memPhysAvailable'] = memory.get('physAvailable'),
-                if 'physPctAvailable' in memory:
-                    memstats['memPhysPctAvailable'] = memory.get('physPctAvailable'),
                 payload.update(memstats)
 
             ioStats = sys_checks['io'].check(self.agentConfig)

diff --git a/checks/system/unix.py b/checks/system/unix.py
@@ -156,7 +156,7 @@ def check(self, agentConfig):
                     # cols[0] is the device
                     # cols[1:] are the values
                     io[cols[0]] = {}
-                    for i in range(2, len(cols)):
+                    for i in range(1, len(cols)):
                         io[cols[0]][self.xlate(headers[i], "sunos")] = cols[i]
 
             elif sys.platform.startswith("freebsd"):
@@ -366,20 +366,19 @@ def check(self, agentConfig):
                 memData['physTotal'] = int(meminfo.get('MemTotal', 0)) / 1024
                 memData['physFree'] = int(meminfo.get('MemFree', 0)) / 1024
                 if 'MemAvailable' in meminfo:
-                    memData['physAvailable'] = int(meminfo.get('MemAvailable', 0)) / 1024
+                    memData['physUsable'] = int(meminfo.get('MemAvailable', 0)) / 1024
+                else:
+                    # Usable is relative since cached and buffers are actually used to speed things up.
+                    memData['physUsable'] = memData['physFree'] + memData['physBuffers'] + memData['physCached']
 
                 memData['physBuffers'] = int(meminfo.get('Buffers', 0)) / 1024
                 memData['physCached'] = int(meminfo.get('Cached', 0)) / 1024
                 memData['physShared'] = int(meminfo.get('Shmem', 0)) / 1024
 
                 memData['physUsed'] = memData['physTotal'] - memData['physFree']
-                # Usable is relative since cached and buffers are actually used to speed things up.
-                memData['physUsable'] = memData['physFree'] + memData['physBuffers'] + memData['physCached']
 
                 if memData['physTotal'] > 0:
                     memData['physPctUsable'] = float(memData['physUsable']) / float(memData['physTotal'])
-                    if 'physAvailable' in memData:
-                        memData['physPctAvailable'] = float(memData['physAvailable']) / float(memData['physTotal'])
             except Exception:
                 self.logger.exception('Cannot compute stats from /proc/meminfo')