Merge pull request #80 from alerta/release-5-rc2

Release 5 RC2

Author: satterly

alertaclient/commands/cmd_send.py

@@ -18,7 +18,7 @@
 @click.option('--attributes', '-A', multiple=True, metavar='KEY=VALUE', help='List of attributes eg. priority=high')
 @click.option('--origin', '-O', metavar='ORIGIN', help='Origin of alert in form app/host')
 @click.option('--type', metavar='EVENT_TYPE', help='Event type eg. exceptionAlert, performanceAlert, nagiosAlert')
-@click.option('--timeout', metavar='EXPIRES', help='Seconds before an open alert will be expired')
+@click.option('--timeout', metavar='EXPIRES', type=int, help='Seconds before an open alert will be expired')
 @click.option('--raw-data', metavar='STRING', help='Raw data of orignal alert eg. SNMP trap PDU')
 @click.pass_obj
 def cli(obj, resource, event, environment, severity, correlate, service, group, value, text, tags, attributes, origin, type, timeout, raw_data):

alertaclient/commands/cmd_unack.py

@@ -20,4 +20,4 @@ def cli(obj, ids, filters, text):
 
     with click.progressbar(ids, label='Un-acking {} alerts'.format(total)) as bar:
         for id in bar:
-            client.set_status(id, status='unack', text=text or 'status changed using CLI')
+            client.set_status(id, status='open', text=text or 'status changed using CLI')

alertaclient/models/alert.py

@@ -19,7 +19,7 @@ def __init__(self, resource, event, **kwargs):
         self.resource = resource
         self.event = event
         self.environment = kwargs.get('environment', None) or ""
-        self.severity = kwargs.get('severity', None) #or current_app.config['DEFAULT_NORMAL_SEVERITY']
+        self.severity = kwargs.get('severity', None)
         self.correlate = kwargs.get('correlate', None) or list()
         if self.correlate and event not in self.correlate:
             self.correlate.append(event)
@@ -30,10 +30,10 @@ def __init__(self, resource, event, **kwargs):
         self.text = kwargs.get('text', None) or ""
         self.tags = kwargs.get('tags', None) or list()
         self.attributes = kwargs.get('attributes', None) or dict()
-        self.origin = kwargs.get('origin', None) #or '%s/%s' % (os.path.basename(sys.argv[0]), platform.uname()[1])
+        self.origin = kwargs.get('origin', None)
         self.event_type = kwargs.get('event_type', kwargs.get('type', None)) or "exceptionAlert"
         self.create_time = kwargs.get('create_time', None) or datetime.utcnow()
-        self.timeout = kwargs.get('timeout', None) # or current_app.config['ALERT_TIMEOUT']
+        self.timeout = kwargs.get('timeout', None)
         self.raw_data = str(kwargs.get('raw_data', kwargs.get('rawData', "")))
         self.customer = kwargs.get('customer', None)
 

alertaclient/models/user.py

@@ -31,9 +31,9 @@ def parse(cls, json):
         return User(
             id=json.get('id'),
             name=json.get('name'),
-            email=json.get('email'),
+            email=json.get('email', None) or json.get('login'),
             status=json.get('status'),
-            roles=json.get('roles', list()),
+            roles=json.get('roles', None) or ([json['role']] if 'role' in json else list()),
             attributes=json.get('attributes', dict()),
             create_time=DateTime.parse(json.get('createTime')),
             last_login=DateTime.parse(json.get('lastLogin')),