Merge pull request #322 from Hefeweizen/update_files

add monitor subcommands that work from file

Author: Yann

datadog/dogshell/monitor.py

@@ -1,4 +1,5 @@
 # stdlib
+import argparse
 import json
 
 # 3p
@@ -30,6 +31,11 @@ def setup_parser(cls, subparsers):
         post_parser.add_argument('--options', help="json options for the monitor", default=None)
         post_parser.set_defaults(func=cls._post)
 
+        file_post_parser = verb_parsers.add_parser('fpost', help="Create a monitor from file")
+        file_post_parser.add_argument('file', help='json file holding all details',
+                                      type=argparse.FileType('r'))
+        file_post_parser.set_defaults(func=cls._file_post)
+
         update_parser = verb_parsers.add_parser('update', help="Update existing monitor")
         update_parser.add_argument('monitor_id', help="monitor to replace with the new definition")
         update_parser.add_argument('type', help="type of the monitor, e.g. "
@@ -42,6 +48,12 @@ def setup_parser(cls, subparsers):
         update_parser.add_argument('--options', help="json options for the monitor", default=None)
         update_parser.set_defaults(func=cls._update)
 
+        file_update_parser = verb_parsers.add_parser('fupdate', help="Update existing"
+                                                     " monitor from file")
+        file_update_parser.add_argument('file', help='json file holding all details',
+                                        type=argparse.FileType('r'))
+        file_update_parser.set_defaults(func=cls._file_update)
+
         show_parser = verb_parsers.add_parser('show', help="Show a monitor definition")
         show_parser.add_argument('monitor_id', help="monitor to show")
         show_parser.set_defaults(func=cls._show)
@@ -110,6 +122,21 @@ def _post(cls, args):
         else:
             print(json.dumps(res))
 
+    @classmethod
+    def _file_post(cls, args):
+        api._timeout = args.timeout
+        format = args.format
+        monitor = json.load(args.file)
+        res = api.Monitor.create(type=monitor['type'], query=monitor['query'],
+                                 name=monitor['name'], message=monitor['message'],
+                                 options=monitor['options'])
+        report_warnings(res)
+        report_errors(res)
+        if format == 'pretty':
+            print(pretty_json(res))
+        else:
+            print(json.dumps(res))
+
     @classmethod
     def _update(cls, args):
         api._timeout = args.timeout
@@ -129,6 +156,21 @@ def _update(cls, args):
         else:
             print(json.dumps(res))
 
+    @classmethod
+    def _file_update(cls, args):
+        api._timeout = args.timeout
+        format = args.format
+        monitor = json.load(args.file)
+        res = api.Monitor.update(monitor['id'], type=monitor['type'], query=monitor['query'],
+                                 name=monitor['name'], message=monitor['message'],
+                                 options=monitor['options'])
+        report_warnings(res)
+        report_errors(res)
+        if format == 'pretty':
+            print(pretty_json(res))
+        else:
+            print(json.dumps(res))
+
     @classmethod
     def _show(cls, args):
         api._timeout = args.timeout