Revert "add load to dependencies for nrpe checks"

[mirror/dsa-nagios.git] / config / build-nagios

diff --git a/config/build-nagios b/config/build-nagios
index 50a182a..1eb3977 100755 (executable)
--- a/config/build-nagios
+++ b/config/build-nagios
@@ -46,7 +46,6 @@ HOST_TEMPLATE_NAME='generic-host'          # host templates that all our host de
 SERVICE_TEMPLATE_NAME='generic-service'    # host templates that all our host definitions use
 HOST_ALIVE_CHECK='check-host-alive'        # host alive check if server is pingable
 NRPE_PROCESS_SERVICE='process - nrpe'      # nrpe checks will depend on this one
-NRPE_LOAD_CHECK='load'
 
 
 def warn (msg)
@@ -169,12 +168,7 @@ def addService(hosts, service, files, servers)
                service['check_command'] = "#{ NRPE_CHECKNAME }!#{ check }"
 
                service['depends'] = ensure_array( service['depends'] )
-               unless service['service_description'] == NRPE_PROCESS_SERVICE
-                       # Depend on the load check to reduce noise
-                       service['depends'] << NRPE_LOAD_CHECK unless service['service_description'] == NRPE_LOAD_CHECK
-                       # Depend on NRPE unless we are it
-                       service['depends'] << NRPE_PROCESS_SERVICE
-               end
+               service['depends'] << NRPE_PROCESS_SERVICE unless service['service_description'] == NRPE_PROCESS_SERVICE  # Depend on NRPE unless we are it
        end
 
        hosts.each{ |host|