diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-24 14:56:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-24 14:56:05 +0000 |
| commit | 6d70e8efba26710534b5b0b003b2568295c6111a (patch) | |
| tree | d1d2ee630aa0b049c7e2ee5c91afa0e25a2e948c | |
| parent | b337581df8a0bc7f9f0c6c9fe5818b1269a971d1 (diff) | |
| parent | fa21fc6bf5d246a13507ddc0b68e5677796ec582 (diff) | |
| download | python-ceilometerclient-6d70e8efba26710534b5b0b003b2568295c6111a.tar.gz | |
Merge "Add statistic in rule information"
| -rw-r--r-- | ceilometerclient/v2/shell.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index d16797a..9bf6176 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -299,11 +299,12 @@ def _display_alarm_list(alarms, sortby=None): def _display_rule(type, rule): if type == 'threshold': - return ('%(meter_name)s %(comparison_operator)s ' + return ('%(statistic)s(%(meter_name)s) %(comparison_operator)s ' '%(threshold)s during %(evaluation_periods)s x %(period)ss' % { 'meter_name': rule['meter_name'], 'threshold': rule['threshold'], + 'statistic': rule['statistic'], 'evaluation_periods': rule['evaluation_periods'], 'period': rule['period'], 'comparison_operator': OPERATORS_STRING.get( |