JAM: added some power supplies. rearranged groups to HV and LV

diff --git a/icinga/objects/commands.cfg b/icinga/objects/commands.cfg
index 72d9ae16a759ee65b0c4648bbe63f8a0f08f0f7a..8a08026ed5d60bdc3d53d369e065c264a8adffcb 100644 (file)
--- a/icinga/objects/commands.cfg
+++ b/icinga/objects/commands.cfg
@@ -303,7 +303,8 @@ define command {
 #check_by_ssh check_raid
 define command {
    command_name check_raid
-   command_line $USER1$/check_by_ssh -o  ForwardX11=no -l $ARG1$ -H $HOSTADDRESS$ -C "sudo /usr/lib/nagios/plugins/check_raid"
+  # command_line $USER1$/check_by_ssh -o  ForwardX11=no -l $ARG1$ -H $HOSTADDRESS$ -C "sudo /usr/lib/nagios/plugins/check_raid"
+  command_line $USER1$/check_by_ssh -o  ForwardX11=no -l $ARG1$ -H $HOSTADDRESS$ -C "sudo /usr/lib/nagios/plugins-gsi-local/check_megaraid_sas *"
 }
 
 
@@ -312,7 +313,7 @@ define command {
 # JAM note: need to specify ca access list as defined in ioc st.cmd to prevent caget error due to double network interface on EB servers - 2018: changed netmask from 103 to 11
 define command {
    command_name check_epics_pv
-   command_line $USER1$/check_by_ssh  -o  ForwardX11=no -t 20 -l $ARG1$ -H $HOSTADDRESS$ -C "/home/hadaq/nagios/plugins/my_epics.sh -pv $ARG2$  -H 192.168.111.255:$ARG4$"
+   command_line $USER1$/check_by_ssh  -o  ForwardX11=no -t 20 -l $ARG1$ -H $HOSTADDRESS$ -C "bash /home/hadaq/nagios/plugins/my_epics.sh -pv $ARG2$  -H 192.168.111.255:$ARG4$"
 }
 
 

diff --git a/icinga/objects/hosts_eb_servers.cfg b/icinga/objects/hosts_eb_servers.cfg
index 2262fb928b37b4ce9c89152c6cade8438ab6edf1..16796a504d96d16984813f384a9a18440c4d7254 100644 (file)
--- a/icinga/objects/hosts_eb_servers.cfg
+++ b/icinga/objects/hosts_eb_servers.cfg
@@ -306,7 +306,7 @@ define service{
 
 define service{
        use                             remote-service
-       host_name                       lxhadeb07
+       host_name                       lxhadeb07,lxhadeb08,lxhadeb09,lxhadeb10
        service_description             raidcheck
        normal_check_interval           10
        retry_check_interval            1
@@ -323,7 +323,7 @@ define service{
 define service{
        use                             remote-service
 #       hostgroup_name                  eb-servers-active
-       host_name                       lxhadeb05, lxhadeb02, lxhadeb03
+       host_name                       lxhadeb08, lxhadeb09, lxhadeb10
        service_description             EB-EPICS 4 procs
        normal_check_interval           10
        retry_check_interval            1
@@ -339,7 +339,7 @@ define service{
 define service{
        use                             remote-service
 #       hostgroup_name                  eb-servers-active
-       host_name                       lxhadeb04
+       host_name                       lxhadeb05
        service_description             EB-EPICS 3 procs
        normal_check_interval           10
        retry_check_interval            1
@@ -362,28 +362,28 @@ define service{
 ####### EB Server 1:
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb05
+       host_name                       lxhadeb08
        service_description             EB01-status
        check_command                   check_epics_pv!hadaq!HAD:eb01:status!1!10001
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb05
+       host_name                       lxhadeb08
        service_description             EB05-status
        check_command                   check_epics_pv!hadaq!HAD:eb05:status!1!10005
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb05
+       host_name                       lxhadeb08
        service_description             EB09-status
        check_command                   check_epics_pv!hadaq!HAD:eb09:status!1!10009
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb05
+       host_name                       lxhadeb08
        service_description             EB13-status
        check_command                   check_epics_pv!hadaq!HAD:eb13:status!1!10013
        }
@@ -392,28 +392,28 @@ define service{
 ####### EB Server 2:
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb02
+       host_name                       lxhadeb09
        service_description             EB02-status
        check_command                   check_epics_pv!hadaq!HAD:eb02:status!1!10002
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb02
+       host_name                       lxhadeb09
        service_description             EB06-status
        check_command                   check_epics_pv!hadaq!HAD:eb06:status!1!10006
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb02
+       host_name                       lxhadeb09
        service_description             EB10-status
        check_command                   check_epics_pv!hadaq!HAD:eb10:status!1!10010
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb02
+       host_name                       lxhadeb09
        service_description             EB14-status
        check_command                   check_epics_pv!hadaq!HAD:eb14:status!1!10014
        }
@@ -422,28 +422,28 @@ define service{
 ####### EB Server 3:
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb03
+       host_name                       lxhadeb10
        service_description             EB03-status
        check_command                   check_epics_pv!hadaq!HAD:eb03:status!1!10003
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb03
+       host_name                       lxhadeb10
        service_description             EB07-status
        check_command                   check_epics_pv!hadaq!HAD:eb07:status!1!10007
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb03
+       host_name                       lxhadeb10
        service_description             EB11-status
        check_command                   check_epics_pv!hadaq!HAD:eb11:status!1!10011
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb03
+       host_name                       lxhadeb10
        service_description             EB15-status
        check_command                   check_epics_pv!hadaq!HAD:eb15:status!1!10015
        }
@@ -452,28 +452,28 @@ define service{
 ####### EB Server 4:
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb04
+       host_name                       lxhadeb05
        service_description             EB04-status
        check_command                   check_epics_pv!hadaq!HAD:eb04:status!1!10004
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb04
+       host_name                       lxhadeb05
        service_description             EB08-status
        check_command                   check_epics_pv!hadaq!HAD:eb08:status!1!10008
        }
 
 define service{
        use                             eventbuilder-status
-       host_name                       lxhadeb04
+       host_name                       lxhadeb05
        service_description             EB12-status
        check_command                   check_epics_pv!hadaq!HAD:eb12:status!1!10012
        }
 
 #define service{
 #       use                             eventbuilder-status
-#       host_name                       lxhadeb04
+#       host_name                       lxhadeb05
 #       service_description             EB16-status
 #       check_command                   check_epics_pv!hadaq!HAD:eb16:status!1!10016
 #       }

diff --git a/icinga/objects/hosts_hades.cfg b/icinga/objects/hosts_hades.cfg
index 2fd973755fd1b4c803409828b848afbf99bc95c7..a87405dd65da8c9845fcafff9eaca6357cf47966 100644 (file)
--- a/icinga/objects/hosts_hades.cfg
+++ b/icinga/objects/hosts_hades.cfg
@@ -172,14 +172,14 @@ define host{
 
 
 
-define host{
-        name                    e7had2
-        use                     hades-dcs     ; Name of host template to use
-        host_name               e7had2
-        alias                   MDC slow control (e7had2)
-        address                 140.181.98.161
-        register                1
-        }
+#define host{
+#        name                    e7had2
+#        use                     hades-dcs     ; Name of host template to use
+#        host_name               e7had2
+#        alias                   MDC slow control (e7had2)
+#        address                 140.181.98.161
+#        register                1
+#        }
 
 define host{
         name                    hadsc1
@@ -327,7 +327,7 @@ define hostgroup{
 define service{
       use                        remote-service
       hostgroup_name             hades-pcs, EPICS-archivers
-      host_name                  e7had2, lxir043
+      host_name                  lxir043
       service_description        PING
       check_command              check-host-alive
 }
@@ -367,14 +367,26 @@ define service{
 define service{
       use                        remote-service
       hostgroup_name             scs
-      host_name                  lxhadeb06
+#      host_name                  lxhadeb06
 #, lxhadeb07
       service_description        Check EPICS IOC
       notifications_enabled      1 ; Suppress direct notification by setting to 0
       contact_groups             dcs
+      check_command              check_epics_pv_local!$HOSTDISPLAYNAME$:stats:led!
+
+}
+
+define service{
+      use                        remote-service
+      host_name                  lxhadeb06
+      service_description        Check EPICS IOC lxhadeb06
+      notifications_enabled      1 ; Suppress direct notification by setting to 0
+      contact_groups             dcs
       check_command              check_epics_pv_local!HAD:IOC:$HOSTDISPLAYNAME$:stats:led!
 }
 
+
+
 define service{
       use                        remote-service
       host_name                  lxhadeb07
@@ -444,7 +456,7 @@ define servicegroup{
 define servicegroup{
         servicegroup_name       EPICS IOCs
         alias                   Check EPICS IOC availability
-        members                 *,Check EPICS IOC,*,Check EPICS IOC for MDC
+        members                 *,Check EPICS IOC,*,Check EPICS IOC for MDC,*,Check EPICS IOC lxhadeb06
         }
 
 

diff --git a/icinga/objects/hosts_power.cfg b/icinga/objects/hosts_power.cfg
index 136f9b5a4186ab40200c87f5b11f8d12ab4fd67e..10a5e40a1d816196f9ab82ca3722ea64c2bf61b9 100644 (file)
--- a/icinga/objects/hosts_power.cfg
+++ b/icinga/objects/hosts_power.cfg
@@ -73,6 +73,72 @@ define host{
        host_name               hadps016
        alias                   hadps016
 }
+#####
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps017
+       alias                   hadps017
+}
+
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps018
+       alias                   hadps018
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps019
+       alias                   hadps019
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps020
+       alias                   hadps020
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps021
+       alias                   hadps021
+}
+#####
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps022
+       alias                   hadps022
+}
+
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps023
+       alias                   hadps023
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps024
+       alias                   hadps024
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps025
+       alias                   hadps025
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadps026
+       alias                   hadps026
+}
+
+
+
 
 
 ###############################################################################
@@ -128,6 +194,56 @@ define host{
        alias                   hadhvp08
 }
 
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp09
+       alias                   hadhvp09
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp10
+       alias                   hadhvp10
+}
+
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp11
+       alias                   hadhvp11
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp12
+       alias                   hadhvp12
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp13
+       alias                   hadhvp13
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp14
+       alias                   hadhvp14
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp15
+       alias                   hadhvp15
+}
+
+define host{
+       use                     power   ; Name of host template to use 
+       host_name               hadhvp16
+       alias                   hadhvp16
+}
+
+
 
 ########################## RICH single special  ISEG 
 
@@ -170,16 +286,16 @@ define host{
 
 ## all power supplies
 define hostgroup{
-        hostgroup_name  power  
-        alias           power supplies 
-        members         hadps003, hadps005, hadps012, hadps009, hadps010, hadps011, hadps013, hadps014, hadps015, hadps016, richhvcrate
+        hostgroup_name  LV  
+        alias           low voltage power supplies 
+        members         hadps003, hadps005, hadps012, hadps009, hadps010, hadps011, hadps013, hadps014, hadps015, hadps016, hadps017, hadps018, hadps019, hadps020, hadps021, hadps022, hadps023, hadps024, hadps025, hadps026
 }
 
 #  caen crates
 define hostgroup{
-        hostgroup_name  caen  
-        alias           caen crates 
-        members         hadhvp01,hadhvp02, hadhvp03, hadhvp04, hadhvp05, hadhvp06, hadhvp07, hadhvp08
+        hostgroup_name  HV  
+        alias           high voltage crates 
+        members         richhvcrate, hadhvp01,hadhvp02, hadhvp03, hadhvp04, hadhvp05, hadhvp06, hadhvp07, hadhvp08, hadhvp09,hadhvp10, hadhvp11, hadhvp12, hadhvp13, hadhvp14, hadhvp15, hadhvp16
 }
 
 ##define hostgroup{
@@ -201,7 +317,7 @@ define hostgroup{
 
 define service{
       use                        remote-service
-      hostgroup_name             power,caen
+      hostgroup_name             LV ,HV
       service_description        PING
       check_command              check-host-alive
 }