diff options
| author | krebs <krebs@UTART> | 2011-05-22 01:36:58 +0200 | 
|---|---|---|
| committer | krebs <krebs@UTART> | 2011-05-22 01:36:58 +0200 | 
| commit | a780c084808b707cd220729eea851b896c3310dc (patch) | |
| tree | c29496cc6e36d6ec289f3168cc1352bff7ebe32c /modules | |
| parent | f760a83541fd49249753c1995e04ede0a0013f4f (diff) | |
updated Nagios config scripts
krebs_hosts: changed paths for utart/ytart
shack_infrastructure: added script to check if local dns is working
tinc_hosts: added IRC check for supernode
tincnet: added IRC check command
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/Monitoring/conf/krebs_hosts.cfg | 8 | ||||
| -rw-r--r-- | modules/Monitoring/conf/shack_infrastructure.cfg | 8 | ||||
| -rw-r--r-- | modules/Monitoring/conf/tinc_hosts.cfg | 9 | ||||
| -rw-r--r-- | modules/Monitoring/conf/tincnet.cfg | 4 | 
4 files changed, 22 insertions, 7 deletions
diff --git a/modules/Monitoring/conf/krebs_hosts.cfg b/modules/Monitoring/conf/krebs_hosts.cfg index c52c6924..6857cd45 100644 --- a/modules/Monitoring/conf/krebs_hosts.cfg +++ b/modules/Monitoring/conf/krebs_hosts.cfg @@ -16,10 +16,10 @@ define host{  #  define host{          use                     generic-host -        host_name               utart.shack +        host_name               utart          alias                   UTART          _tinc_address           10.7.7.66 -        address                 10.42.2.238 +        address                 10.42.23.23          parents                 shack-router          hostgroups              krebs-machines,tinc-nodes,ssh-servers          } @@ -28,11 +28,11 @@ define host{  #  define host{          use                     generic-host -        host_name               ytart.shack +        host_name               ytart          alias                   ytart          _tinc_address           10.7.7.201          parents                 shack-router -        address                 10.42.2.254 #TODO check me +        address                 10.42.1.227          hostgroups              krebs-machines,tinc-nodes,ssh-servers          }  # diff --git a/modules/Monitoring/conf/shack_infrastructure.cfg b/modules/Monitoring/conf/shack_infrastructure.cfg index 53bc688b..2b75a241 100644 --- a/modules/Monitoring/conf/shack_infrastructure.cfg +++ b/modules/Monitoring/conf/shack_infrastructure.cfg @@ -58,7 +58,11 @@ define service {          host_name               shack-dns          service_description     DNS Service          use                     generic-service -        check_command           check_dns +        check_command           check_dns_shack +        } +define command { +	command_name	check_dns_shack +	command_line	/usr/lib/nagios/plugins/check_dns -H shack.shack -s '$HOSTADDRESS$'          }  define host{ @@ -111,7 +115,7 @@ define service {          host_name               shack-ldap          service_description     LDAP Service          use                     generic-service -        check_command           check_ldap!shack +        check_command           check_ldap!shammunity          }  # diff --git a/modules/Monitoring/conf/tinc_hosts.cfg b/modules/Monitoring/conf/tinc_hosts.cfg index ef2cb95d..4b1ad9ab 100644 --- a/modules/Monitoring/conf/tinc_hosts.cfg +++ b/modules/Monitoring/conf/tinc_hosts.cfg @@ -10,7 +10,14 @@ define host{          _TINC_ADDRESS           10.7.7.1          address                 miefda.org          parents                 shack-gw -        hostgroups              tinc-nodes,ssh-servers +        hostgroups              tinc-nodes,ssh-servers,http-servers +        } + +define service { +        host_name                 supernode +        service_description       IRC +        use                       generic-service +        check_command             check_ircd          }  #  # Sharepoint (dhbw-stuttgart) diff --git a/modules/Monitoring/conf/tincnet.cfg b/modules/Monitoring/conf/tincnet.cfg index d63119b3..f0b35b4e 100644 --- a/modules/Monitoring/conf/tincnet.cfg +++ b/modules/Monitoring/conf/tincnet.cfg @@ -16,6 +16,10 @@ define command {          command_name check_internal_tinc_up          command_line $USER1$/check_ping -H $_HOSTTINC_ADDRESS$ -w $ARG1$ -c $ARG2$          } +define command { +        command_name check_ircd +        command_line $USER1$/check_ircd $_HOSTTINC_ADDRESS$ +        }  define service {          hostgroup_name                  tinc-nodes  | 
