From cb24f67be756b8a92cee1ee3284207e95a03e6d3 Mon Sep 17 00:00:00 2001 From: yayogev Date: Thu, 7 Sep 2017 15:14:03 +0300 Subject: fix sensu check handling for link checks Change-Id: I481d68d90708af194e58f213f1f4c070da76ebc1 Signed-off-by: yayogev --- app/monitoring/handlers/monitoring_check_handler.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'app/monitoring/handlers/monitoring_check_handler.py') diff --git a/app/monitoring/handlers/monitoring_check_handler.py b/app/monitoring/handlers/monitoring_check_handler.py index ef14c54..a299076 100644 --- a/app/monitoring/handlers/monitoring_check_handler.py +++ b/app/monitoring/handlers/monitoring_check_handler.py @@ -78,16 +78,20 @@ class MonitoringCheckHandler(SpecialCharConverter): self.keep_message(doc, check_result) def keep_message(self, doc, check_result, error_level=None): + is_link = 'link_type' in doc msg_id = check_result['id'] - obj_id = doc['id'] - display_context = doc['network_id'] if doc['type'] == 'port'\ + obj_id = 'link_{}_{}'.format(doc['source_id'], doc['target_id']) \ + if is_link \ else doc['id'] + obj_type = 'link_{}'.format(doc['link_type']) if is_link else doc['type'] + display_context = obj_id if is_link \ + else doc['network_id'] if doc['type'] == 'port' else doc['id'] level = error_level if error_level\ else ERROR_LEVEL[check_result['status']] dt = datetime.datetime.utcfromtimestamp(check_result['executed']) ts = stringify_datetime(dt) message = Message(msg_id=msg_id, env=self.env, source=SOURCE_SYSTEM, - object_id=obj_id, object_type=doc['type'], + object_id=obj_id, object_type=obj_type, display_context=display_context, level=level, msg=check_result, ts=ts) collection = self.inv.collections['messages'] -- cgit 1.2.3-korg