openstack
/
monasca-api
Code Issues Proposed changes

Merge "Fix:No alarms created if metric name in alarm def. expr. is mix case"

This commit is contained in:
Zuul 2018-02-22 13:49:56 +00:00 committed by Gerrit Code Review
parent 83df80adf0 404fe5e932
commit 33588ed09c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monasca_api/common/repositories/sqla/alarm_definitions_repository.py
View File

@ -417,8 +417,7 @@ class AlarmDefinitionsRepository(sql_repository.SQLRepository,
for sub_expr in sub_expr_list:
sub_alarm_definition_id = uuidutils.generate_uuid()
sub_expr.id = sub_alarm_definition_id
metric_name = sub_expr.normalized_metric_name.encode("utf8")
metric_name = sub_expr.metric_name.encode("utf8")
operator = sub_expr.normalized_operator.encode('utf8')
conn.execute(self.create_alarm_definition_insert_sad_query,
b_id=sub_alarm_definition_id,

2
monasca_api/v2/reference/alarm_definitions.py
View File

@ -585,7 +585,7 @@ class AlarmDefinitions(alarm_definitions_api_v2.AlarmDefinitionsV2API,
for sub_expr in sub_expr_list:
sub_expr_event_msg[sub_expr.id] = {
u'function': sub_expr.normalized_func}
metric_definition = {u'name': sub_expr.normalized_metric_name}
metric_definition = {u'name': sub_expr.metric_name}
sub_expr_event_msg[sub_expr.id][
u'metricDefinition'] = metric_definition
dimensions = {}