From c8b260b88f8d5a9e1c45a47d20fbbfa1d12ec486 Mon Sep 17 00:00:00 2001 From: Sundaresan Rajangam Date: Mon, 11 Jul 2016 12:55:19 -0700 Subject: [PATCH] Add description in alarm sandesh Change-Id: I3c5d346d188507a69a0c53af93e85b7de9eff4da Closes-Bug: #1600118 (cherry picked from commit 41b9e41a76e27522f3210c9f47a011c296a41a4a) --- src/opserver/alarmgen.py | 9 ++++++--- src/opserver/plugins/alarm_base.py | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/opserver/alarmgen.py b/src/opserver/alarmgen.py index 204019859ff..f771262b812 100644 --- a/src/opserver/alarmgen.py +++ b/src/opserver/alarmgen.py @@ -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): diff --git a/src/opserver/plugins/alarm_base.py b/src/opserver/plugins/alarm_base.py index 0761505e546..de4f5e1deaf 100644 --- a/src/opserver/plugins/alarm_base.py +++ b/src/opserver/plugins/alarm_base.py @@ -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