X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=2f3dc37b2557b321b2a4902bf0b6d8fb6f0408ac;hb=07ce807297ebb6c5a131955c1107b19e8417dfe7;hp=790335693a06a330528b30117b4306f9e11f9d26;hpb=5a2ba5b3e57061e6a6db59ce30a9e4ea337773ee;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 7903356..2f3dc37 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -110,7 +110,7 @@ servers:
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-xandros:
-    address: 142.46.212.33
+    address: 67.210.160.81
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
   gw-nmmn:
@@ -203,12 +203,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu
+    hostgroups: computers, porterbox, sw-raid, single-cpu, lenny
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -223,7 +223,7 @@ servers:
   murphy:
     address: 70.103.162.31
     parents: gw-brainfood
-    hostgroups: computers, general, apache2-hosts, bind9-hosts, postfix-hosts
+    hostgroups: computers, general, apache2-hosts, bind9-hosts, postfix-hosts, dl380
 
   ries:
     address: 128.148.34.103
@@ -282,7 +282,7 @@ servers:
   argento:
     address: 195.49.152.174
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu
+    hostgroups: computers, buildd, sw-raid, single-cpu, lenny
     contacts: bzed
 
   pergolesi:
@@ -335,14 +335,14 @@ servers:
   caballero:
     address: 193.201.200.200
     parents: gw-blackcat
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, bind9-hosts
 
   elara:
-    address: 142.46.212.46
+    address: 67.210.160.90
     parents: gw-xandros
     hostgroups: deadslow
   europa:
-    address: 142.46.212.46
+    address: 67.210.160.89
     parents: gw-xandros
     hostgroups: deadslow
 
@@ -365,7 +365,7 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny
     contacts: luk
 
   agnesi:
@@ -387,7 +387,7 @@ servers:
   tartini:
     address: 82.94.249.158
     parents: gw-telegraaf
-    hostgroups: computers
+    hostgroups: computers, sw-raid
 
   piatti:
     address: 193.167.161.225
@@ -449,6 +449,10 @@ hostgroups:
     alias: Hosts with only one CPU
     private: 1
 
+  lenny:
+    alias: Hosts running lenny, not etch
+    private: 1
+
   syslog-ng-hosts:
     alias: hosts running syslog-ng instead of sysklogd
     private: 1
@@ -505,6 +509,8 @@ servicegroups:
     alias: buildd checks
   raid:
     alias: raid checks
+  kernel:
+    alias: kernel checks
 
 #############################
 # services
@@ -631,6 +637,15 @@ services:
     max_check_attempts: 2
     retry_check_interval: 5
 
+ ####
+  -
+    name: running kernel
+    servicegroups: kernel
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-running-kernel"
+    hostgroups: computers
+    normal_check_interval: 180
+    retry_check_interval: 5
+
  ####
   -
     name: users
@@ -687,6 +702,7 @@ services:
     hostgroups: computers
     depends: process - sshd
     normal_check_interval:  60
+    notification_interval: 1440
 
   -
     name: "network service - sshd"
@@ -699,16 +715,44 @@ services:
     check: dsa_check_ssh_port!2260
     hosts: agnesi
     normal_check_interval:  180
+  -
+    name: "network service - sshd - 443"
+    check: dsa_check_ssh_port!443
+    hosts: gluck
+    normal_check_interval:  180
+
+  -
+    name: "network service - sshd - version"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2"
+    depends: network service - sshd
+    hostgroups: computers, deadslow
+    excludehosts: agnesi
+    excludehostgroups: lenny
+    normal_check_interval:  360
+  -
+    name: "network service - sshd - version"
+    check: "dsa_check_ssh_port_version!22!OpenSSH_4.7p1 Debian-9"
+    depends: network service - sshd
+    hostgroups: lenny
+    normal_check_interval:  360
+  -
+    name: "network service - sshd - version - 2260"
+    check: "dsa_check_ssh_port_version!2260!OpenSSH_4.3p2 Debian-9etch2"
+    depends: network service - sshd - 2260
+    hosts: agnesi
+    normal_check_interval:  360
  ####
   -
     name: network service - nrpe
     check: check_tcp!5666
     hostgroups: computers
-    max_check_attempts: -1
+    max_check_attempts: -2
+    notification_interval: 1440
   -
     name: process - nrpe
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:25 -c 1: -u nagios -C nrpe -a '/usr/sbin/nrpe -c /etc/nagios/nrpe.cfg -d'"
     hostgroups: computers
+    max_check_attempts: -1
     depends: network service - nrpe
  ###
   -
@@ -1117,6 +1161,11 @@ services:
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
+    hostgroups: dl385, dl380, dl360
  ###
   -
     name: RAID - DAC960
@@ -1129,6 +1178,12 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-3ware"
     hosts: puccini
+ ###
+  -
+    name: RAID - MPT
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-mpt"
+    hosts: master
 
  ###
   -