Skip to content

Commit

Permalink
Add description in alarm sandesh
Browse files Browse the repository at this point in the history
Change-Id: I3c5d346d188507a69a0c53af93e85b7de9eff4da
Closes-Bug: #1600118
(cherry picked from commit 41b9e41)
  • Loading branch information
Sundaresan Rajangam committed Jul 13, 2016
1 parent 1cfb4a1 commit c8b260b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/opserver/alarmgen.py
Expand Up @@ -230,14 +230,17 @@ def process_alarms(self, alarm_fqname, alarm, uv, local_uve):
if or_list:
self.uve_alarms[alarm_name] = UVEAlarmInfo(type=alarm_name,
severity=sev, timestamp=0, token="",
alarm_rules=AlarmRules(or_list), ack=False)
alarm_rules=AlarmRules(or_list),
description=alarm.description(), ack=False)
except Exception as ex:
template = "Exception {0} in Alarm Processing. Arguments:\n{1!r}"
messag = template.format(type(ex).__name__, ex.args)
self._logger.error("%s : traceback %s" % \
(messag, traceback.format_exc()))
self.uve_alarms[alarm_name] = UVEAlarmInfo(type=alarm_name, severity=sev,
timestamp=0, token="", rules=[], ack=False)
self.uve_alarms[alarm_name] = UVEAlarmInfo(type=alarm_name,
severity=sev, timestamp=0, token="",
alarm_rules=AlarmRules(None),
description=alarm.description(), ack=False)
# end process_alarms

def _get_uve_attribute(self, tuve, puve, attr_list):
Expand Down
5 changes: 5 additions & 0 deletions src/opserver/plugins/alarm_base.py
Expand Up @@ -30,6 +30,11 @@ def config(self):
"""
return self._config

def description(self):
"""Return alarm description
"""
return self._config.get_id_perms().get_description()

def severity(self):
"""Return the severity of the alarm
This should not depend on UVE contents
Expand Down

0 comments on commit c8b260b

Please sign in to comment.