Improve heartbeat alert messages (#237)

Author: satterly

alertaclient/commands/cmd_heartbeat.py

@@ -8,7 +8,7 @@
 @click.command('heartbeat', short_help='Send a heartbeat')
 @click.option('--origin', '-O', metavar='ORIGIN', default=origin, help='Origin of heartbeat.')
 @click.option('--environment', '-E', metavar='ENVIRONMENT', help='Environment eg. Production, Development')
-@click.option('--severity', '-s', metavar='SEVERITY', default='major', help='Severity eg. critical, major, minor, warning')
+@click.option('--severity', '-s', metavar='SEVERITY', help='Severity override eg. critical, major, minor, warning')
 @click.option('--service', '-S', metavar='SERVICE', multiple=True, help='List of affected services eg. app name, Web, Network, Storage, Database, Security')
 @click.option('--group', '-g', metavar='GROUP', help='Group event by type eg. OS, Performance')
 @click.option('--tag', '-T', 'tags', multiple=True, metavar='TAG', help='List of tags eg. London, os:linux, AWS/EC2')
@@ -28,14 +28,17 @@ def cli(obj, origin, environment, severity, service, group, tags, timeout, custo
         client.delete_heartbeat(delete)
     else:
         if any(t.startswith('environment') or t.startswith('group') for t in tags):
-            click.secho('WARNING: Do not use tags for "environment" or "group". See help.', err=True)
+            click.secho('WARNING: Using tags for "environment" or "group" is deprecated. See help.', err=True)
 
         if severity in ['normal', 'ok', 'cleared']:
-            raise click.UsageError('Must be a non-normal severity.')
-
-        if severity not in obj['alarm_model']['severity'].keys():
-            raise click.UsageError('Must be a valid severity.')
-
+            raise click.UsageError('Must be a non-normal severity. "{}" is one of {}'.format(
+                severity, ', '.join(['normal', 'ok', 'cleared']))
+            )
+
+        if severity and severity not in obj['alarm_model']['severity'].keys():
+            raise click.UsageError('Must be a valid severity. "{}" is not one of {}'.format(
+                severity, ', '.join(obj['alarm_model']['severity'].keys()))
+            )
         attributes = dict()
         if environment:
             attributes['environment'] = environment

alertaclient/commands/cmd_heartbeats.py

@@ -23,10 +23,14 @@ def cli(obj, alert, severity, timeout, purge):
         default_normal_severity = 'normal'
 
     if severity in ['normal', 'ok', 'cleared']:
-        raise click.UsageError('Must be a non-normal severity.')
+        raise click.UsageError('Must be a non-normal severity. "{}" is one of {}'.format(
+            severity, ', '.join(['normal', 'ok', 'cleared']))
+        )
 
     if severity not in obj['alarm_model']['severity'].keys():
-        raise click.UsageError('Must be a valid severity.')
+        raise click.UsageError('Must be a valid severity. "{}" is not one of {}'.format(
+            severity, ', '.join(obj['alarm_model']['severity'].keys()))
+        )
 
     if obj['output'] == 'json':
         r = client.http.get('/heartbeats')