Merge pull request #417 from DataDog/agent-diagnostic

add command line option to run a particular agent check

agent.py

@@ -180,6 +180,7 @@ def main():
         'foreground',
         'status',
         'info',
+        'check',
     ]
 
     if len(args) < 1:
@@ -194,7 +195,7 @@ def main():
     pid_file = PidFile('dd-agent')
 
     # Only initialize the Agent if we're starting or stopping it.
-    if command in ['start', 'stop', 'restart', 'foreground']:
+    if command in ['start', 'stop', 'restart', 'foreground', 'check']:
 
         if options.clean:
             pid_file.clean()
@@ -226,6 +227,21 @@ def parent_func(): agent.start_event = False
                 # Run in the standard foreground.
                 agent.run(config=agentConfig)
 
+        elif 'check' == command:
+            check_name = args[1]
+            try:
+                import checks.collector
+                # Try the old-style check first
+                print getattr(checks.collector, check_name)(log).check(agentConfig)
+            except Exception:
+                # If not an old-style check, try checks.d
+                checks = load_check_directory(agentConfig)
+                for check in checks:
+                    if check.name == check_name:
+                        check.run()
+                        print check.get_metrics()
+                        print check.get_events()
+
     # Commands that don't need the agent to be initialized.
     else:
         if 'status' == command: