From: hadaq Date: Wed, 6 Nov 2013 13:26:02 +0000 (+0000) Subject: JAM: check in status of icinga config in November 2013. X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=1a24f491f4119917cd7ee9e7c2613ed18c3395e7;p=hadesicinga.git JAM: check in status of icinga config in November 2013. Removed dreamplug nodes from hosts_power_config, since they are part of autogenerated epics scs setup now --- diff --git a/icinga/objects/commands.cfg b/icinga/objects/commands.cfg index 3c1b59a..8c89195 100644 --- a/icinga/objects/commands.cfg +++ b/icinga/objects/commands.cfg @@ -232,14 +232,14 @@ define command{ # 'process-host-perfdata' command definition define command{ command_name process-host-perfdata - command_line /usr/bin/printf "%b" "$LASTHOSTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$HOSTSTATETYPE$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$\n" >> /var/lib/icinga/host-perfdata.out + command_line /usr/bin/printf "%b" "$LASTHOSTCHECK$\t$HOSTNAME$\t$HOSTSTATE$\t$HOSTATTEMPT$\t$HOSTSTATETYPE$\t$HOSTEXECUTIONTIME$\t$HOSTOUTPUT$\t$HOSTPERFDATA$\n" >> /var/spool/icinga/host-perfdata.out } # 'process-service-perfdata' command definition define command{ command_name process-service-perfdata - command_line /usr/bin/printf "%b" "$LASTSERVICECHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$SERVICESTATETYPE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n" >> /var/lib/icinga/service-perfdata.out + command_line /usr/bin/printf "%b" "$LASTSERVICECHECK$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEATTEMPT$\t$SERVICESTATETYPE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$\n" >> /var/spool/icinga/service-perfdata.out } diff --git a/icinga/objects/hosts_etrax.cfg b/icinga/objects/hosts_etrax.cfg index e8d4f8f..ec8fdc7 100644 --- a/icinga/objects/hosts_etrax.cfg +++ b/icinga/objects/hosts_etrax.cfg @@ -1,7 +1,7 @@ ############################################################################### # Config File for Monitoring etrax nodes # This file was automatically generated from trb.db files by daq2icinga.pl -# Creation time: 03.04.2012 at 15:48:50 +# Creation time: 06.11.2013 at 13:47:08 # # HOST DEFINITIONS ############################################################################### @@ -43,10 +43,6 @@ define hostgroup{ members etraxp107,etraxp119,hadesp31,etraxp023 } -############################################################################### -# Hosts from subcomponent mdc -############################################################################### - ############################################################################### # Hosts from subcomponent start ############################################################################### @@ -216,13 +212,6 @@ define host{ alias etraxp067_rpc } -# HOST DEFINITION etraxp068 -define host{ - use etrax - host_name etraxp068 ; assigned to rpc - alias etraxp068_rpc -} - # HOST DEFINITION etraxp074 define host{ use etrax @@ -293,6 +282,13 @@ define host{ alias etraxp094_rpc } +# HOST DEFINITION etraxp110 +define host{ + use etrax + host_name etraxp110 ; assigned to rpc + alias etraxp110_rpc +} + # HOST DEFINITION etraxp122 define host{ use etrax @@ -302,7 +298,7 @@ define host{ define hostgroup{ hostgroup_name rpc alias etrax_rpc - members etraxp031,etraxp040,etraxp051,etraxp052,etraxp053,etraxp054,etraxp056,etraxp059,etraxp061,etraxp063,etraxp065,etraxp067,etraxp068,etraxp074,etraxp075,etraxp078,etraxp080,etraxp083,etraxp085,etraxp089,etraxp091,etraxp092,etraxp094,etraxp122,etraxp054,etraxp059,etraxp089,etraxp091,etraxp092,etraxp094 + members etraxp031,etraxp040,etraxp051,etraxp052,etraxp053,etraxp054,etraxp056,etraxp059,etraxp061,etraxp063,etraxp065,etraxp067,etraxp074,etraxp075,etraxp078,etraxp080,etraxp083,etraxp085,etraxp089,etraxp091,etraxp092,etraxp094,etraxp110,etraxp122,etraxp054,etraxp059,etraxp089,etraxp091,etraxp092,etraxp094 } ############################################################################### @@ -483,11 +479,11 @@ define host{ alias etraxp202_scs } -# HOST DEFINITION etraxp208 +# HOST DEFINITION etraxp238 define host{ use etrax - host_name etraxp208 ; assigned to slow control system - alias etraxp208_scs + host_name etraxp238 ; assigned to slow control system + alias etraxp238_scs } # HOST DEFINITION etraxp236 @@ -518,6 +514,13 @@ define host{ alias etraxp221_scs } +# HOST DEFINITION etraxp204 +define host{ + use etrax + host_name etraxp204 ; assigned to slow control system + alias etraxp204_scs +} + # HOST DEFINITION etraxp237 define host{ use etrax @@ -525,6 +528,27 @@ define host{ alias etraxp237_scs } +# HOST DEFINITION dreamp05 +define host{ + use etrax + host_name dreamp05 ; assigned to slow control system + alias dreamp05_scs +} + +# HOST DEFINITION dreamp06 +define host{ + use etrax + host_name dreamp06 ; assigned to slow control system + alias dreamp06_scs +} + +# HOST DEFINITION dreamp09 +define host{ + use etrax + host_name dreamp09 ; assigned to slow control system + alias dreamp09_scs +} + ############################################################################### # Hostgroup definition for scs nodes @@ -532,7 +556,7 @@ define host{ define hostgroup{ hostgroup_name scs alias etrax_scs - members etraxp231,etraxp239,etraxp207,etraxp230,etraxp232,etraxp233,etraxp222,etraxp202,etraxp208,etraxp236,etraxp201,etraxp225,etraxp221,etraxp237 + members etraxp231,etraxp239,etraxp207,etraxp230,etraxp232,etraxp233,etraxp222,etraxp202,etraxp238,etraxp236,etraxp201,etraxp225,etraxp221,etraxp204,etraxp237,dreamp05,dreamp06,dreamp09 } diff --git a/icinga/objects/hosts_power.cfg b/icinga/objects/hosts_power.cfg index 5d0dc66..e33146b 100644 --- a/icinga/objects/hosts_power.cfg +++ b/icinga/objects/hosts_power.cfg @@ -130,26 +130,26 @@ define host{ ############################################################################### -# dream +# dream JAM:now part of hosts_etrax.cfg as generated from epics setup ############################################################################### -define host{ - use etrax ; Name of host template to use - host_name dreamp05 - alias dreamp05 -} +##define host{ +# use etrax ; Name of host template to use +# host_name dreamp05 +# alias dreamp05 +#} -define host{ - use etrax ; Name of host template to use - host_name dreamp06 - alias dreamp06 -} +##define host{ +# use etrax ; Name of host template to use +# host_name dreamp06 +# alias dreamp06 +#} -define host{ - use etrax ; Name of host template to use - host_name dreamp09 - alias dreamp09 -} +##define host{ +# use etrax ; Name of host template to use +# host_name dreamp09 +# alias dreamp09 +#} ############################################################################### @@ -171,11 +171,11 @@ define hostgroup{ members hadhvp01,hadhvp02, hadhvp03, hadhvp04, hadhvp05, hadhvp06, hadhvp07, hadhvp08 } -define hostgroup{ - hostgroup_name dreamp - alias dreamp scs - members dreamp05, dreamp06, dreamp09 -} +##define hostgroup{ +# hostgroup_name dreamp +# alias dreamp scs +# members dreamp05, dreamp06, dreamp09 +#} @@ -190,7 +190,7 @@ define hostgroup{ define service{ use remote-service - hostgroup_name power,caen, dreamp + hostgroup_name power,caen service_description PING check_command check-host-alive }