X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=b46e373b2514cf21be04716ecc7201dc3eb122c1;hb=3fb46cb3b3d5cd35201b383606a2a199b17d6213;hp=4ac169a43597b4f49ff4b8a9707d758ff6634cf9;hpb=5ffb733f43d21b3f1a6730fdfcc23eef455caf04;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4ac169a..b46e373 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -156,6 +156,14 @@ servers:
     address: 130.239.18.97
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-esiee:
+    address: 147.215.2.249
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
+  gw-ghent:
+    address: 193.191.17.50
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   global:
     hostgroups: notacomputer
@@ -256,11 +264,6 @@ servers:
     address: 82.195.75.105
     parents: unger
     hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, puppet
-  
-  geo2:
-    address: 137.82.84.71
-    parents: dijkstra
-    hostgroups: computers, service, acpid-hosts, lenny, hasbootfs, puppet
 
   master:
     address: 70.103.162.29
@@ -314,6 +317,14 @@ servers:
     address: 128.31.0.46
     parents: gw-mit-csail
     hostgroups: computers, single-cpu, lenny, porterbox, rsyslog-hosts, puppet
+  rore:
+    address: 128.31.0.49
+    parents: gw-mit-csail
+    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl360, acpid-hosts
+  carver:
+    address: 128.31.0.50
+    parents: gw-mit-csail
+    hostgroups: computers, service, rsyslog-hosts, lenny, puppet, dl380, acpid-hosts, hassrvfs, ulogd-hosts
 
   klecker:
     address: 194.109.137.218
@@ -394,6 +405,10 @@ servers:
     address: 195.20.242.124
     parents: schumann
     hostgroups: computers, ulogd-hosts, lenny, puppet, rsyslog-hosts, hassrvfs
+  geo3:
+    address: 195.20.242.125
+    parents: schumann
+    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
 
   caballero:
     address: 193.201.200.200
@@ -409,16 +424,6 @@ servers:
     parents: gw-xandros
     hostgroups: deadslow
 
-  kullervo:
-    address: 217.114.76.82
-    parents: gw-nmmn
-    hostgroups: deadslow
-    contacts: luk
-  crest:
-    address: 217.114.76.83
-    parents: gw-nmmn
-    hostgroups: deadslow
-    contacts: luk
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
@@ -443,9 +448,14 @@ servers:
 
   allegri:
     address: 157.193.39.233
-    parents: gw-HP-ftc
+    parents: gw-ghent
     hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu, lenny, puppet, hassrvfs
     contacts: luk
+  ancina:
+    address: 157.193.39.13
+    parents: gw-ghent
+    hostgroups: computers, buildd, single-cpu, lenny, puppet, hassrvfs, hasbootfs, incomingmailrelayed2025
+    contacts: luk
 
   agnesi:
     address: 65.173.90.83
@@ -469,6 +479,10 @@ servers:
     address: 137.82.84.74
     parents: dijkstra
     hostgroups: computers, lenny, puppet, buildd, hasbootfs, hassrvfs
+  geo2:
+    address: 137.82.84.71
+    parents: dijkstra
+    hostgroups: computers, service, lenny, hasbootfs, puppet, rsyslog-hosts, single-cpu
 
   lebrun:
     address: 193.198.184.10
@@ -517,13 +531,18 @@ servers:
   schein:
     address: 149.20.20.6
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, acpid-hosts, lenny, rsyslog-hosts, puppet, dl360, bind9-hosts
 
   praetorius:
     address: 130.239.18.121
     parents: gw-aca
     hostgroups: computers, buildd, rsyslog-hosts, lenny, puppet
 
+  lafayette:
+    address: 147.215.7.160
+    parents: gw-esiee
+    hostgroups: computers, buildd, lenny, puppet, sw-raid, hassrvfs, hasbootfs, incomingmailrelayed
+
 #############################
 # host groups
 #
@@ -679,6 +698,14 @@ hostgroups:
     alias: hosts with a /srv
     private: 1
 
+  incomingmailrelayed:
+    alias: incoming mail needs to go through a mail relay
+    # i.e. no port 25
+    private: 1
+  incomingmailrelayed2025:
+    alias: incoming mail needs to go through a mail relay
+    # i.e. no port 25
+    private: 1
 
 #############################
 # servicegroups
@@ -951,15 +978,8 @@ services:
     check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch3"
     depends: network service - sshd
     hostgroups: computers, deadslow
-    excludehosts: crest, kullervo
     excludehostgroups: lenny
     normal_check_interval:  60
-  -
-    name: "network service - sshd - version"
-    check: "dsa_check_ssh_port_version!22!OpenSSH_4.3p2 Debian-9etch2+m68k1"
-    depends: network service - sshd
-    hosts: crest, kullervo
-    normal_check_interval:  60
   -
     name: "network service - sshd - version"
     check: "dsa_check_ssh_port_version!22!OpenSSH_5.1p1 Debian-5"
@@ -1289,7 +1309,7 @@ services:
     name: network service - smtp
     check: dsa_check_smtp
     hostgroups: computers
-    excludehostgroups: postfix-hosts
+    excludehostgroups: postfix-hosts, incomingmailrelayed, incomingmailrelayed2025
     depends: process - exim
 
   -
@@ -1298,6 +1318,16 @@ services:
     hostgroups: postfix-hosts
     excludehosts: verdi, kassia, allegri, piatti
     depends: process - postfix - master
+  -
+    name: network service - submission
+    check: dsa_check_smtp_port!587
+    hostgroups: incomingmailrelayed
+    depends: process - exim
+  -
+    name: network service - smtp 2025
+    check: dsa_check_smtp_port!2025
+    hostgroups: incomingmailrelayed2025
+    depends: process - exim
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
@@ -1394,6 +1424,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-raid-sw"
     hostgroups: sw-raid
 
+ ###
+  -
+    name: process - monit
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C monit -a '/usr/sbin/monit -d 300 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
+    hostgroups: lenny
+    excludehosts: agnesi
  ###
   -
     name: process - cpqarrayd