updated reqs and test

datadog/dogshell/monitor.py

@@ -8,6 +8,7 @@
 # datadog
 from datadog import api
 from datadog.dogshell.common import report_errors, report_warnings
+import warnings
 
 
 class MonitorClient(object):
@@ -39,10 +40,24 @@ def setup_parser(cls, subparsers):
 
         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. "
-                                   "'metric alert' 'service check'")
-        update_parser.add_argument('query', help="query to notify on with syntax varying"
-                                   " depending on what type of monitor you are creating")
+        update_parser.add_argument(
+            'type',
+            nargs='?',
+            help="[Deprecated] optional argument preferred"
+                 "type of the monitor, e.g. 'metric alert' 'service check'",
+            default=None
+        )
+        update_parser.add_argument(
+            'query',
+            nargs='?',
+            help="[Deprecated] optional argument preferred"
+                 "query to notify on with syntax varying depending on monitor type",
+            default=None
+        )
+        update_parser.add_argument('--type', help="type of the monitor, e.g. "
+                                   "'metric alert' 'service check'", default=None, dest='type_opt')
+        update_parser.add_argument('--query', help="query to notify on with syntax varying"
+                                   " depending on monitor type", default=None, dest='query_opt')
         update_parser.add_argument('--name', help="name of the alert", default=None)
         update_parser.add_argument('--message', help="message to include with "
                                    "notifications for this monitor", default=None)
@@ -148,14 +163,41 @@ def _file_post(cls, args):
     def _update(cls, args):
         api._timeout = args.timeout
         format = args.format
-        options = None
+
+        to_update = {}
+        if args.type:
+            if args.type_opt:
+                msg = '[WARNING] Duplicate arguments for `type`. Using optional value --type'
+                print(msg)
+            else:
+                to_update['type'] = args.type
+            msg = "[DEPRECATION] `type` is no longer required to `update` and may be omitted"
+            warnings.warn(msg, DeprecationWarning)
+        if args.query:
+            if args.query_opt:
+                msg = '[WARNING] Duplicate arguments for `query`. Using optional value --query'
+                print(msg)
+            else:
+                to_update['query'] = args.query
+            msg = "[DEPRECATION] `query` is no longer required to `update` and may be omitted"
+            warnings.warn(msg, DeprecationWarning)
+        if args.name:
+            to_update['name'] = args.name
+        if args.message:
+            to_update['message'] = args.message
+        if args.type_opt:
+            to_update['type'] = args.type_opt
+        if args.query_opt:
+            to_update['query'] = args.query_opt
+
         if args.options is not None:
             try:
-                options = json.loads(args.options)
+                to_update['options'] = json.loads(args.options)
             except:
                 raise Exception('bad json parameter')
-        res = api.Monitor.update(args.monitor_id, type=args.type, query=args.query,
-                                 name=args.name, message=args.message, options=options)
+
+        res = api.Monitor.update(args.monitor_id, **to_update)
+
         report_warnings(res)
         report_errors(res)
         if format == 'pretty':

tests/integration/dogshell/test_dogshell.py

@@ -296,6 +296,7 @@ def test_monitors(self):
         assert out["query"] == query
         assert out["type"] == type_alert
         monitor_id = str(out["id"])
+        monitor_name = out["name"]
 
         out, _, _ = self.dogshell(["monitor", "show", monitor_id])
         out = json.loads(out)
@@ -304,16 +305,41 @@ def test_monitors(self):
 
         # Update options
         options = {"notify_no_data": True, "no_data_timeframe": 20}
-
         out, _, _ = self.dogshell(
             ["monitor", "update", monitor_id, type_alert, query, "--options", json.dumps(options)]
         )
 
         out = json.loads(out)
-        assert out["query"] == query
+        assert query in out['query']
         assert out["options"]["notify_no_data"] == options["notify_no_data"]
         assert out["options"]["no_data_timeframe"] == options["no_data_timeframe"]
 
+        # Update message only
+        updated_message = "monitor updated"
+        current_options = out['options']
+        out, err, return_code = self.dogshell(
+            ["monitor", "update", monitor_id, "--message", updated_message]
+        )
+
+        out = json.loads(out)
+        assert updated_message == out["message"]
+        assert query == out['query']
+        assert monitor_name == out ['name']
+        assert current_options == out['options']
+
+        # Updating query only
+        updated_query = "avg(last_15m):sum:system.net.bytes_rcvd{*} by {env} > 222"
+
+        out, err, return_code = self.dogshell(
+            ["monitor", "update", monitor_id, "--query", updated_query]
+        )
+
+        out = json.loads(out)
+        assert updated_query in out["query"]
+        assert updated_message in out['message'] # updated_message updated in previous step
+        assert monitor_name in out ['name']
+        assert current_options == out['options']
+
         # Mute monitor
         out, _, _ = self.dogshell(["monitor", "mute", str(out["id"])])
         out = json.loads(out)