JAM: changed icinga retry interval for eventbuilder epics status

diff --git a/icinga/icinga.cfg b/icinga/icinga.cfg
index 398dc8fd7116c253268fca2fff8d6c164b956abc..1d38264a6e0ece409ec0e9182b9491dabb55e4b3 100644 (file)
--- a/icinga/icinga.cfg
+++ b/icinga/icinga.cfg
@@ -37,6 +37,14 @@ cfg_file=//etc/icinga/objects/localhost.cfg
 
 cfg_file=//etc/icinga/objects/hosts_eb_servers.cfg
 
+cfg_file=//etc/icinga/objects/hosts_etrax.cfg
+
+cfg_file=//etc/icinga/objects/hosts_power.cfg
+
+cfg_file=//etc/icinga/objects/hosts_hades.cfg
+
+
+
 # Definitions for monitoring a Windows machine
 #cfg_file=//etc/icinga/objects/windows.cfg
 

diff --git a/icinga/modules/idoutils.cfg b/icinga/modules/idoutils.cfg
index 47f984a9a5dc9840231a3b42876803df0524164f..18bd90051387f4680c59a40d3c37f552ec0582bc 100644 (file)
--- a/icinga/modules/idoutils.cfg
+++ b/icinga/modules/idoutils.cfg
@@ -6,9 +6,9 @@
 
 
 # uncomment this until we really configured db for it JAM
-define module{
-        module_name     idomod
-        module_type     neb
-        path            /usr/sbin/idomod.o
-        args            config_file=//etc/icinga/idomod.cfg
-       }
+# define module{
+#         module_name     idomod
+#         module_type     neb
+#         path            /usr/sbin/idomod.o
+#         args            config_file=//etc/icinga/idomod.cfg
+#      }

diff --git a/icinga/objects/hosts_eb_servers.cfg b/icinga/objects/hosts_eb_servers.cfg
index 1a5e6447b82a40c58e93122f3fff4d72e599e10e..71ce124784781f501515bdb3f185689936769170 100644 (file)
--- a/icinga/objects/hosts_eb_servers.cfg
+++ b/icinga/objects/hosts_eb_servers.cfg
@@ -289,184 +289,120 @@ define service{
 
 ####### EB Server 1:
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb05
        service_description             EB01-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb01:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb05
        service_description             EB05-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb05:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb05
        service_description             EB09-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb09:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb05
        service_description             EB13-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb13:status!1
        }
 
 
 ####### EB Server 2:
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb02
        service_description             EB02-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb02:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb02
        service_description             EB06-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb06:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb02
        service_description             EB10-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb10:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb02
        service_description             EB14-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb14:status!1
        }
 
 
 ####### EB Server 3:
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb03
        service_description             EB03-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb03:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb03
        service_description             EB07-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb07:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb03
        service_description             EB11-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb11:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb03
        service_description             EB15-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb15:status!1
        }
 
 
 ####### EB Server 4:
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb04
        service_description             EB04-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb04:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb04
        service_description             EB08-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb08:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb04
        service_description             EB12-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb12:status!1
        }
 
 define service{
-       use                             remote-service
+       use                             eventbuilder-status
        host_name                       lxhadeb04
        service_description             EB16-status
-       normal_check_interval           10
-       retry_check_interval            2
-       notification_interval           30
-       notification_options            c,u,r
        check_command                   check_epics_pv!hadaq!HAD:eb16:status!1
        }
 

diff --git a/icinga/objects/templates.cfg b/icinga/objects/templates.cfg
index ad255306024af1f1024b40b82008f192bc28e795..2870a90665dd3b99c050883fa6b21eb7eeca0d28 100644 (file)
--- a/icinga/objects/templates.cfg
+++ b/icinga/objects/templates.cfg
@@ -226,3 +226,16 @@ define service{
        notification_options            c,u,r                   
         register                        0                     
         }
+
+
+define service{
+        name                            eventbuilder-status        
+        use                             remote-service       
+        max_check_attempts              4                     
+        normal_check_interval           10                     
+        retry_check_interval            5  
+       notification_options            c,u,r                   
+        register                        0                     
+        }
+
+