[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

Gerhard Lausser gerhard.lausser at consol.de
Tue Feb 28 22:21:24 UTC 2012


The following commit has been merged in the debian/master branch:
commit b230e8d963a898ea519d0de4accee3a67c9d19d9
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Fri Feb 17 00:50:07 2012 +0100

    Prepare names-list for modified attributes

diff --git a/shinken/modules/livestatus_broker/mapping.py b/shinken/modules/livestatus_broker/mapping.py
index 6e9f7ae..c6197fa 100644
--- a/shinken/modules/livestatus_broker/mapping.py
+++ b/shinken/modules/livestatus_broker/mapping.py
@@ -44,6 +44,7 @@ from shinken.brokerlink import BrokerLink
 from shinken.receiverlink import ReceiverLink
 from shinken.pollerlink import PollerLink
 from log_line import LOGCLASS_INFO, LOGCLASS_ALERT, LOGCLASS_PROGRAM, LOGCLASS_NOTIFICATION, LOGCLASS_PASSIVECHECK, LOGCLASS_COMMAND, LOGCLASS_STATE, LOGCLASS_INVALID, LOGCLASS_ALL, LOGOBJECT_INFO, LOGOBJECT_HOST, LOGOBJECT_SERVICE, LOGOBJECT_CONTACT, Logline, LoglineWrongFormat
+from shinken.external_command import MODATTR_NONE, MODATTR_NOTIFICATIONS_ENABLED, MODATTR_ACTIVE_CHECKS_ENABLED, MODATTR_PASSIVE_CHECKS_ENABLED, MODATTR_EVENT_HANDLER_ENABLED, MODATTR_FLAP_DETECTION_ENABLED, MODATTR_FAILURE_PREDICTION_ENABLED, MODATTR_PERFORMANCE_DATA_ENABLED, MODATTR_OBSESSIVE_HANDLER_ENABLED, MODATTR_EVENT_HANDLER_COMMAND, MODATTR_CHECK_COMMAND, MODATTR_NORMAL_CHECK_INTERVAL, MODATTR_RETRY_CHECK_INTERVAL, MODATTR_MAX_CHECK_ATTEMPTS, MODATTR_FRESHNESS_CHECKS_ENABLED, MODATTR_CHECK_TIMEPERIOD, MODATTR_CUSTOM_VARIABLE, MODATTR_NOTIFICATION_TIMEPERIOD
 
 
 class Problem:
@@ -51,6 +52,38 @@ class Problem:
         self.source = source
         self.impacts = impacts
 
+def modified_attributes_names(self):
+    names_list = []
+    names = {
+        MODATTR_NOTIFICATIONS_ENABLED: 'notifications_enabled',
+        MODATTR_ACTIVE_CHECKS_ENABLED: 'active_checks_enabled',
+        MODATTR_PASSIVE_CHECKS_ENABLED: 'passive_checks_enabled',
+        MODATTR_EVENT_HANDLER_ENABLED: 'event_handler_enabled',
+        MODATTR_FLAP_DETECTION_ENABLED: 'flap_detection_enabled',
+        MODATTR_FAILURE_PREDICTION_ENABLED: 'failure_prediction_enabled',
+        MODATTR_PERFORMANCE_DATA_ENABLED: 'performance_data_enabled',
+        MODATTR_OBSESSIVE_HANDLER_ENABLED: 'obsessive_handler_enabled',
+        MODATTR_EVENT_HANDLER_COMMAND: 'event_handler_command',
+        MODATTR_CHECK_COMMAND: 'check_command',
+        MODATTR_NORMAL_CHECK_INTERVAL: 'normal_check_interval',
+        MODATTR_RETRY_CHECK_INTERVAL: 'retry_check_interval',
+        MODATTR_MAX_CHECK_ATTEMPTS: 'max_check_attempts',
+        MODATTR_FRESHNESS_CHECKS_ENABLED: 'freshness_checks_enabled',
+        MODATTR_CHECK_TIMEPERIOD: 'check_timeperiod',
+        MODATTR_CUSTOM_VARIABLE: 'custom_variable',
+        MODATTR_NOTIFICATION_TIMEPERIOD: 'notification_timeperiod',
+    }
+    for attr in [MODATTR_NONE, MODATTR_NOTIFICATIONS_ENABLED
+, MODATTR_ACTIVE_CHECKS_ENABLED, MODATTR_PASSIVE_CHECKS_ENABLED, MODATTR_EVENT_H
+ANDLER_ENABLED, MODATTR_FLAP_DETECTION_ENABLED, MODATTR_FAILURE_PREDICTION_ENABL
+ED, MODATTR_PERFORMANCE_DATA_ENABLED, MODATTR_OBSESSIVE_HANDLER_ENABLED, MODATTR
+_EVENT_HANDLER_COMMAND, MODATTR_CHECK_COMMAND, MODATTR_NORMAL_CHECK_INTERVAL, MO
+DATTR_RETRY_CHECK_INTERVAL, MODATTR_MAX_CHECK_ATTEMPTS, MODATTR_FRESHNESS_CHECKS
+_ENABLED, MODATTR_CHECK_TIMEPERIOD, MODATTR_CUSTOM_VARIABLE, MODATTR_NOTIFICATIO
+N_TIMEPERIOD]:
+        if self.modified_attributes & attr:
+            names_list.append(names[attr])
+    return ','.join(names_list)
 
 def join_with_separators(request, *args):
     if request.response.outputformat == 'csv':

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list