openstack
/
python-monascaclient
Code Issues Proposed changes

Expose state_updated_timestamp and created_timestamp in alarm table 

Change-Id: I19647a64780d05f9f0365d87eae97d7d5faca2d6
This commit is contained in:
Ryan Brandt 2015-03-26 14:52:35 -06:00
parent ee1e747800
commit feae3aef03
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
README.rst
View File

@ -299,14 +299,13 @@ alarm-definition-delete::
alarm-list::
monasca alarm-list
+--------------------------------------+--------------------------------------+--------------+--------------------+---------------------+----------+-------+
| id | alarm_definition_id | alarm_name | metric_name | metric_dimensions | severity | state |
+--------------------------------------+--------------------------------------+--------------+--------------------+---------------------+----------+-------+
| 35122ab6-3007-41e7-9654-22e97b387f75 | 754276aa-a892-47c0-b74a-9c96ed84a712 | alarmPerHost | cpu.load_avg_1_min | hostname: mini-mon | LOW | ALARM |
| | | | | service: monitoring | | |
| 54ab81e3-b4d6-4fd0-9fec-707909f2d576 | 754276aa-a892-47c0-b74a-9c96ed84a712 | alarmPerHost | cpu.load_avg_1_min | hostname: devstack | LOW | ALARM |
| | | | | service: monitoring | | |
+--------------------------------------+--------------------------------------+--------------+--------------------+---------------------+----------+-------+
+--------------------------------------+--------------------------------------+----------------+---------------+---------------------+----------+-------+--------------------------+--------------------------+
| id | alarm_definition_id | alarm_name | metric_name | metric_dimensions | severity | state | state_updated_timestamp | created_timestamp |
+--------------------------------------+--------------------------------------+----------------+---------------+---------------------+----------+-------+--------------------------+--------------------------+
| 11e8c15d-0263-4b71-a8b8-4ecdaeb2902c | af1f347b-cddb-46da-b7cc-924261eeecdf | High CPU usage | cpu.idle_perc | hostname: devstack | LOW | OK | 2015-03-26T21:45:15.000Z | 2015-03-26T21:41:50.000Z |
| e5797cfe-b66e-4d44-98cd-3c7fc62d4c33 | af1f347b-cddb-46da-b7cc-924261eeecdf | High CPU usage | cpu.idle_perc | hostname: mini-mon | LOW | OK | 2015-03-26T21:43:15.000Z | 2015-03-26T21:41:47.000Z |
| | | | | service: monitoring | | | | |
+--------------------------------------+--------------------------------------+----------------+---------------+---------------------+----------+-------+--------------------------+--------------------------+
alarm-history::

9
monascaclient/v2_0/shell.py
View File

@ -867,6 +867,8 @@ def do_alarm_definition_patch(mc, args):
action='append')
@utils.arg('--state', metavar='<ALARM_STATE>',
help='ALARM_STATE is one of [UNDETERMINED, OK, ALARM].')
@utils.arg('--state-updated-start-time', metavar='<UTC_STATE_UPDATED_START>',
help='Return all alarms whose state was updated on or after the time specified')
@utils.arg('--offset', metavar='<OFFSET LOCATION>',
help='The offset used to paginate the return data.')
@utils.arg('--limit', metavar='<RETURN LIMIT>',
@ -887,6 +889,8 @@ def do_alarm_list(mc, args):
print(errmsg)
return
fields['state'] = args.state
if args.state_updated_start_time:
fields['state_updated_start_time'] = args.state_updated_start_time
if args.limit:
fields['limit'] = args.limit
if args.offset:
@ -901,7 +905,8 @@ def do_alarm_list(mc, args):
if args.json:
print(utils.json_formatter(alarm))
return
cols = ['id', 'alarm_definition_id', 'alarm_name', 'metric_name', 'metric_dimensions', 'severity', 'state']
cols = ['id', 'alarm_definition_id', 'alarm_name', 'metric_name', 'metric_dimensions', 'severity', 'state',
'state_updated_timestamp', "created_timestamp"]
formatters = {
'id': lambda x: x['id'],
'alarm_definition_id': lambda x: x['alarm_definition']['id'],
@ -910,6 +915,8 @@ def do_alarm_list(mc, args):
'metric_dimensions': lambda x: format_metric_dimensions(x['metrics']),
'severity': lambda x: x['alarm_definition']['severity'],
'state': lambda x: x['state'],
'state_updated_timestamp': lambda x: x['state_updated_timestamp'],
'created_timestamp': lambda x: x['created_timestamp'],
}
if isinstance(alarm, list):
# print the list