Display messages returned by send_alert() (#104)

* Display messages returned by send_alert()

* Fix tests for send_alert()

Author: satterly

alertaclient/api.py

@@ -65,7 +65,8 @@ def send_alert(self, resource, event, **kwargs):
             'rawData': kwargs.get('raw_data')
         }
         r = self.http.post('/alert', data)
-        return Alert.parse(r['alert'])
+        alert = Alert.parse(r['alert']) if 'alert' in r else None
+        return r.get('id', '-'), alert, r.get('message', None)
 
     def get_alert(self, id):
         return Alert.parse(self.http.get('/alert/%s' % id)['alert'])

alertaclient/commands/cmd_send.py

@@ -25,7 +25,7 @@ def cli(obj, resource, event, environment, severity, correlate, service, group,
     """Send an alert."""
     client = obj['client']
     try:
-        alert = client.send_alert(
+        id, alert, message = client.send_alert(
             resource=resource,
             event=event,
             environment=environment,
@@ -45,7 +45,10 @@ def cli(obj, resource, event, environment, severity, correlate, service, group,
     except Exception as e:
         click.echo('ERROR: {}'.format(e))
         sys.exit(1)
-    if alert.repeat:
-        click.echo('{} ({} duplicates)'.format(alert.id, alert.duplicate_count))
-    else:
-        click.echo('{} {} -> {}'.format(alert.id, alert.previous_severity, alert.severity))
+
+    if alert:
+        if alert.repeat:
+            message = '{} duplicates'.format(alert.duplicate_count)
+        else:
+            message = '{} -> {}'.format(alert.previous_severity, alert.severity)
+    click.echo('{} ({})'.format(id, message))

examples/send.py

@@ -5,7 +5,7 @@
 client = Client()
 
 try:
-    alert = client.send_alert(
+    id, alert, message = client.send_alert(
         resource='web-server-01',
         event='HttpError',
         correlate=['HttpOK'],

tests/test_alerts.py

@@ -60,7 +60,7 @@ def setUp(self):
     @requests_mock.mock()
     def test_alert(self, m):
         m.post('http://localhost:8080/alert', text=self.alert)
-        alert = self.client.send_alert(
+        id, alert, message = self.client.send_alert(
             environment='Production', resource='web01', event='node_down', correlated=['node_up', 'node_down'],
             service=['Web', 'App'], severity='critical', tags=["london", "linux"], value=4
         )