From e9f2998d5ee81043d9ce0e43cb49b1bae27aa5fa Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 6 Aug 2014 12:38:34 +0200
Subject: [PATCH] Bugfix with device alerts
---
action_plugins/serverdensity.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/action_plugins/serverdensity.py b/action_plugins/serverdensity.py
index 86445db..ee8e634 100644
--- a/action_plugins/serverdensity.py
+++ b/action_plugins/serverdensity.py
@@ -131,6 +131,7 @@ class ActionModule(object):
for alertname in alerts:
vv('- - - ' + alertname)
alert = alerts.get(alertname)
+ alert.__setitem__('host', host)
self.ensure_alert(alert, 'device')
vv('Ensure device group alerts...')
@@ -206,8 +207,11 @@ class ActionModule(object):
if request_result.status_code != 200:
msg = content['message']
if content['errors']:
- for error in content['errors']:
- msg += ' // ' + error['description']
+ for error in content['errors']:
+ if error['message']:
+ msg += ' // ' + error['message']
+ if error['description']:
+ msg += ' // ' + error['description']
raise ae('%s' % msg)
return content
--
GitLab