* Clean trigger functions

debian/patches/16_clean_trigger_functions.patch

@@ -0,0 +1,163 @@
+diff --git a/shinken/trigger_functions.py b/shinken/trigger_functions.py
+index be0db41..a5a56c1 100644
+--- a/shinken/trigger_functions.py
++++ b/shinken/trigger_functions.py
+@@ -29,7 +29,8 @@ import re
+
+ from shinken.objects.item import Item, Items
+ from shinken.misc.perfdata import PerfDatas
+-from shinken.property import BoolProp, IntegerProp, FloatProp, CharProp, StringProp, ListProp
++from shinken.property import (BoolProp, IntegerProp, FloatProp,
++                              CharProp, StringProp, ListProp)
+ from shinken.log import logger
+
+ objs = {'hosts': [], 'services': []}
+@@ -37,6 +38,8 @@ trigger_functions = {}
+
+
+ class declared(object):
++    """ Decorator to add function in trigger environnement
++    """
+     def __init__(self, f):
+         self.f = f
+         global functions
+@@ -50,36 +53,63 @@ class declared(object):
+
+
+ @declared
++def up(obj, output):
++    """ Set a host in UP state
++    """
++    set_value(obj, output, None, 0)
++
++
++@declared
++def down(obj, output):
++    """ Set a host in DOWN state
++    """
++    set_value(obj, output, None, 1)
++
++
++@declared
++def ok(obj, output):
++    """ Set a service in OK state
++    """
++    set_value(obj, output, None, 0)
++
++
++@declared
++def warning(obj, output):
++    """ Set a service in WARNING state
++    """
++    set_value(obj, output, None, 1)
++
++
++@declared
+ def critical(obj, output):
+-    logger.debug("[trigger::%s] I am in critical for object" % obj.get_name())
+-    now = time.time()
+-    cls = obj.__class__
+-    i = obj.launch_check(now, force=True)
+-    for chk in obj.checks_in_progress:
+-        if chk.id == i:
+-            logger.debug("[trigger] I found the check I want to change")
+-            c = chk
+-            # Now we 'transform the check into a result'
+-            # So exit_status, output and status is eaten by the host
+-            c.exit_status = 2
+-            c.get_outputs(output, obj.max_plugins_output_length)
+-            c.status = 'waitconsume'
+-            c.check_time = now
+-            #self.sched.nb_check_received += 1
+-            # Ok now this result will be read by scheduler the next loop
++    """ Set a service in CRITICAL state
++    """
++    set_value(obj, output, None, 2)
++
++
++@declared
++def unknown(obj, output):
++    """ Set a service in UNKNOWN state
++    """
++    set_value(obj, output, None, 3)
+
+
+ @declared
+ def set_value(obj_ref, output=None, perfdata=None, return_code=None):
++    """ Set output, state and perfdata to a service or host
++    """
+     obj = get_object(obj_ref)
+     if not obj:
+         return
+     output = output or obj.output
+     perfdata = perfdata or obj.perf_data
+     if return_code is None:
+-      return_code = obj.state_id
++        return_code = obj.state_id
+
+-    logger.debug("[trigger] Setting %s %s %s for object %s" % (output, perfdata, return_code, obj.get_full_name()))
++    logger.debug("[trigger] Setting %s %s %s for object %s" % (output,
++                                                               perfdata,
++                                                               return_code,
++                                                               obj.get_full_name()))
+
+     if perfdata:
+         output = output + ' | ' + perfdata
+@@ -105,6 +135,8 @@ def set_value(obj_ref, output=None, perfdata=None, return_code=None):
+
+ @declared
+ def perf(obj_ref, metric_name):
++    """ Get perf data from a service
++    """
+     obj = get_object(obj_ref)
+     p = PerfDatas(obj.perf_data)
+     if metric_name in p:
+@@ -116,6 +148,8 @@ def perf(obj_ref, metric_name):
+
+ @declared
+ def get_custom(obj_ref, cname, default=None):
++    """ Get custom varialbe from a service or a host
++    """
+     obj = get_objects(obj_ref)
+     if not obj:
+         return default
+@@ -127,6 +161,9 @@ def get_custom(obj_ref, cname, default=None):
+
+ @declared
+ def perfs(objs_ref, metric_name):
++    """ TODO: check this description
++        Get perfdatas from multiple services/hosts
++    """
+     objs = get_objects(objs_ref)
+     r = []
+     for o in objs:
+@@ -136,7 +173,19 @@ def perfs(objs_ref, metric_name):
+
+
+ @declared
++def allperfs(obj_ref):
++    """ Get all perfdatas from a service or a host
++    """
++    obj = get_object(obj_ref)
++    p = PerfDatas(obj.perf_data)
++    logger.debug("[trigger] I get all perfdatas")
++    return dict([(metric_name, p[metric_name].value) for metric_name in p])
++
++
++@declared
+ def get_object(ref):
++    """ Retrive object (service/host) from name
++    """
+     # Maybe it's already a real object, if so, return it :)
+     if not isinstance(ref, basestring):
+         return ref
+@@ -152,6 +201,9 @@ def get_object(ref):
+
+ @declared
+ def get_objects(ref):
++    """ TODO: check this description
++        Retrive objects (service/host) from names
++    """
+     # Maybe it's already a real object, if so, return it :)
+     if not isinstance(ref, basestring):
+         return ref

debian/patches/series

@@ -4,3 +4,4 @@
 13_fix_ndo_mysql.patch
 14_fix_fedora_init_shinken.patch
 15_fix_setup_python24.patch
+16_clean_trigger_functions.patch