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

[naparuba]

The following commit has been merged in the debian/master branch:
commit 171fd55823b0af16042bc5b06b7f5f25bdad7285
Merge: eccc1bfe2063fcf5913ef6f22c01fcb4f23ce02b d4fc121fdf5819249051844efb6fd49b9ed551df
Author: naparuba <naparuba at gmail.com>
Date:   Fri Nov 25 15:26:10 2011 +0100

    Merge branch 'master' of github.com:naparuba/shinken

diff --combined etc/templates.cfg
index 931ddfd,60c43e1..69964c7
--- a/etc/templates.cfg
+++ b/etc/templates.cfg
@@@ -3,7 -3,6 +3,6 @@@
  
  
  
- 
  ###############################################################################
  ###############################################################################
  #
@@@ -30,7 -29,7 +29,7 @@@ define host
  
  	# Notification part
  	contact_groups			admins
 -	notification_interval		1
 +	notification_interval		60
  	notification_period		24x7
  	notification_options		d,u,r,f
  	notifications_enabled		1
@@@ -134,7 -133,7 +133,7 @@@ define service
  	# Notification part
          notifications_enabled           1       		; Service notifications are enabled
  	notification_options		w,u,c,r			; Send notifications about warning, unknown, critical, and recovery events
 -        notification_interval           1			; Re-notify about service problems every hour
 +        notification_interval           60			; Re-notify about service problems every hour
  	notification_period             24x7
  	# If the contacts and contact_groups options are not set, it will notify host contacts instead
  	# contact_groups                  admins
@@@ -193,8 -192,6 +192,6 @@@ define contact
          register                        0       		; DONT REGISTER THIS DEFINITION - ITS NOT A REAL CONTACT, JUST A TEMPLATE!
  	host_notifications_enabled	1
  	service_notifications_enabled	1
- 	host_notification_period		24x7
- 	service_notification_period		24x7
  	email					shinken at localhost
  	}
  
diff --combined shinken/dispatcher.py
index fc4bbf6,38e9e96..fb415b4
--- a/shinken/dispatcher.py
+++ b/shinken/dispatcher.py
@@@ -361,13 -361,12 +361,13 @@@ class Dispatcher
                          #print "Want to give a satellites pack for the scheduler", satellites_for_sched
                          conf_package = (conf, override_conf, sched.modules, satellites_for_sched)
                          #print "Try to put the conf", conf_package
 +                        
                          is_sent = sched.put_conf(conf_package)
                          if not is_sent:
                              logger.log('[%s] WARNING : configuration dispatching error for scheduler %s' %(r.get_name(), sched.get_name()))
                              continue
                          
-                         logger.log('[%s] Dispatch OK of for conf in scheduler %s' % (r.get_name(), sched.get_name()))
+                         logger.log('[%s] Dispatch OK of conf in scheduler %s' % (r.get_name(), sched.get_name()))
  
                          sched.conf = conf
                          sched.need_conf = False
@@@ -473,25 -472,25 +473,25 @@@
  
                                      if is_sent:
                                          satellite.active = True
-                                         logger.log('[%s] Dispatch OK of for configuration %s to %s %s' %(r.get_name(), cfg_id, kind, satellite.get_name()))
+                                         logger.log('[%s] Dispatch OK of configuration %s to %s %s' %(r.get_name(), cfg_id, kind, satellite.get_name()))
                                          # We change the satellite configuration, update our data
                                          satellite.known_conf_managed_push(cfg_id)
  
                                          nb_cfg_sent += 1
                                          r.to_satellites_managed_by[kind][cfg_id].append(satellite)
                                      
-                                         # If we got a broker, the conf_id must be send to only ONE
+                                         # If we got a broker, the conf_id must be sent to only ONE
                                          # broker, so here it's done, we are happy.
                                          if kind == "broker":
                                              break
                              # else:
-                             #    #I've got enouth satellite, the next one are spare for me
+                             #    #I've got enough satellite, the next one are spare for me
                              if nb_cfg_sent == r.get_nb_of_must_have_satellites(kind):
                                  logger.log("[%s] OK, no more %s sent need" % (r.get_name(), kind))
                                  r.to_satellites_need_dispatch[kind][cfg_id]  = False
  
  
-             # And now we dispatch receivers. It's mroe easy, they need ONE conf
+             # And now we dispatch receivers. It's easier, they need ONE conf
              # in all their life :)
              for r in self.realms:
                  for rec in r.receivers:
@@@ -501,7 -500,7 +501,7 @@@
                          if is_sent:
                              rec.active = True
                              rec.need_conf = False
-                             logger.log('[%s] Dispatch OK of for configuration to receiver %s' %(r.get_name(), rec.get_name()))
+                             logger.log('[%s] Dispatch OK of configuration to receiver %s' %(r.get_name(), rec.get_name()))
                          else:
                              logger.log('[%s] WARNING : dispatching failed for receiver %s' %(r.get_name(), rec.get_name()))
                              

-- 
UNNAMED PROJECT