Merge branch 'smartos'

DataDog · Dec 18, 2012 · 8565a55 · 8565a55
2 parents 78dad60 + 858bd06
commit 8565a55
Show file tree

Hide file tree

Showing 6 changed files with 394 additions and 90 deletions.
diff --git a/checks/__init__.py b/checks/__init__.py
@@ -1,14 +1,7 @@
 """Base class for Checks.
 
-If you are writing your own checks you should subclass the Check class.
-
-The typicall workflow works like this:
-1. Create your Check class
-2. Declare your metrics as gauges or counters
-3. Call save_sample for each metric
-4. Call get_metrics() to get results
-5. Plug the results into checks/common.py
-
+If you are writing your own checks you should subclass the AgentCheck class.
+The Check class is being deprecated so don't write new checks with it.
 """
 
 import logging

diff --git a/checks/collector.py b/checks/collector.py
@@ -60,11 +60,11 @@ def __init__(self, agentConfig, emitters, systemStats):
         # Unix System Checks
         self._unix_system_checks = {
             'disk': u.Disk(checks_logger),
-            'io': u.IO(),
+            'io': u.IO(checks_logger),
             'load': u.Load(checks_logger),
             'memory': u.Memory(checks_logger),
             'network': u.Network(checks_logger),
-            'processes': u.Processes(),
+            'processes': u.Processes(checks_logger),
             'cpu': u.Cpu(checks_logger)
         }
 
@@ -163,24 +163,25 @@ def run(self, checksd=None):
             payload.update(load)
 
             memory = sys_checks['memory'].check(self.agentConfig)
-            payload.update({
-                'memPhysUsed' : memory.get('physUsed'), 
-                'memPhysFree' : memory.get('physFree'), 
-                'memPhysTotal' : memory.get('physTotal'), 
-                'memPhysUsable' : memory.get('physUsable'), 
-                'memSwapUsed' : memory.get('swapUsed'), 
-                'memSwapFree' : memory.get('swapFree'), 
-                'memSwapTotal' : memory.get('swapTotal'), 
-                'memCached' : memory.get('physCached'), 
-                'memBuffers': memory.get('physBuffers'),
-                'memShared': memory.get('physShared')
-            })
-
-            ioStats = sys_checks['io'].check(checks_logger, self.agentConfig)
+            if memory:
+                payload.update({
+                    'memPhysUsed' : memory.get('physUsed'), 
+                    'memPhysFree' : memory.get('physFree'), 
+                    'memPhysTotal' : memory.get('physTotal'), 
+                    'memPhysUsable' : memory.get('physUsable'), 
+                    'memSwapUsed' : memory.get('swapUsed'), 
+                    'memSwapFree' : memory.get('swapFree'), 
+                    'memSwapTotal' : memory.get('swapTotal'), 
+                    'memCached' : memory.get('physCached'), 
+                    'memBuffers': memory.get('physBuffers'),
+                    'memShared': memory.get('physShared')
+                })
+
+            ioStats = sys_checks['io'].check(self.agentConfig)
             if ioStats:
                 payload['ioStats'] = ioStats
 
-            processes = sys_checks['processes'].check(checks_logger, self.agentConfig)
+            processes = sys_checks['processes'].check(self.agentConfig)
             payload.update({'processes': processes})
 
             networkTraffic = sys_checks['network'].check(self.agentConfig)