X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=nagios-master.cfg;h=9ffaf966e30455a8895a3a1254c57441882d680a;hb=6276595ff8a1510e4b86be8ad00d0d5346ecd81c;hp=a870805e899ab1243d3f6e6622ee4365008a3659;hpb=942009cfe80f2b565a53aed2444e7773370ba4ac;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index a870805..9ffaf96 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -16,7 +16,6 @@
 #  - mundy: salinfo_decode
 #  - puccini: mailgraph
 #  -
-#  - agnesi
 #  - piatti
 #  - tartini
 #sarge:
@@ -126,6 +125,10 @@ servers:
     address: 157.193.39.254
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-agnesi:
+    address: 65.173.90.18
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -328,6 +331,11 @@ servers:
     parents: gw-ughent
     hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu
 
+  agnesi:
+    address: 65.173.90.83
+    parents: gw-agnesi
+    hostgroups: deadslow
+
 #############################
 # host groups
 #
@@ -527,6 +535,15 @@ services:
   #  notification_interval: 480
   #  max_check_attempts: 4
   #  retry_check_interval: 12
+ ####
+  -
+    name: backup
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-dabackup"
+    hostgroups: computers
+    normal_check_interval: 180
+    max_check_attempts: 2
+    retry_check_interval: 5
+
  ####
   -
     name: users
@@ -588,6 +605,12 @@ services:
     name: "network service - sshd"
     check: dsa_check_ssh
     hostgroups: deadslow
+    excludehosts: agnesi
+    normal_check_interval:  180
+  -
+    name: "network service - sshd - 2260"
+    check: dsa_check_ssh_port!2260
+    hosts: agnesi
     normal_check_interval:  180
  ####
   -
@@ -623,12 +646,12 @@ services:
     check: check_ntp
     hostgroups: computers
     depends: process - ntpd
-    excludehosts: raptor
+    excludehosts: raptor, allegri
   #
   -
     name: network service - time
-    check: check_time
-    hosts: raptor
+    check: dsa_check_time
+    hosts: raptor, allegri
     depends: process - xinetd
 
  ###
@@ -891,12 +914,7 @@ services:
   -
     name: network service - smtp - port 2025
     check: dsa_check_smtp_port!2025
-    hosts: verdi, kassia, murphy
-    depends: process - postfix - master
-  -
-    name: network service - smtp - port 8080
-    check: dsa_check_smtp_port!8080
-    hosts: allegri
+    hosts: verdi, kassia, murphy, allegri
     depends: process - postfix - master
 
   -
@@ -1014,13 +1032,13 @@ services:
   -
     name: process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C xinetd -a '/usr/sbin/xinetd -pidfile /var/run/xinetd.pid -stayalive'"
-    hosts: samosa, raptor
+    hosts: samosa, raptor, allegri
     hostgroups: rsyncd-hosts
   -
     name: unwanted process - xinetd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C xinetd"
     hostgroups: computers
-    excludehosts: samosa, raptor
+    excludehosts: samosa, raptor, allegri
     excludehostgroups: rsyncd-hosts
  ###
   -