X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=nagios-master.cfg;h=540fa25f77304b7fdfe11a961ead089fa0cf1446;hb=a81d7bf84c7771d4a283f460100c4888cc25145e;hp=6d8ccf9ca71ccd757f68003d13d3b6b9985d465e;hpb=5ce131271fc5d74c8249f00f2375f36aa9664565;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 6d8ccf9..540fa25 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -143,6 +143,10 @@ servers:
     address: 195.71.99.193
     parents: gw-HP-ftc
     hostgroups: routing-infrastructure
+  gw-ball:
+    address: 78.32.9.209
+    parents: gw-HP-ftc
+    hostgroups: routing-infrastructure
 
   samosa:
     address: 192.25.206.57
@@ -154,7 +158,7 @@ servers:
   gluck:
     address: 192.25.206.10
     parents: samosa
-    hostgroups: computers, no-udev, general, dl380, apache1-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts
+    hostgroups: computers, no-udev, general, dl380, apache2-hosts, bind9-hosts, heavy-exim, highload, nfs-client, ulogd-hosts
   merkel:
     address: 192.25.206.16
     parents: samosa
@@ -369,6 +373,10 @@ servers:
     parents: gw-nmmn
     hostgroups: deadslow
     contacts: luk
+  pescetti:
+    address: 217.114.76.85
+    parents: gw-nmmn
+    hostgroups: computers, porterbox, single-cpu, smart
 
   kassia:
     address: 130.89.175.54
@@ -418,9 +426,14 @@ servers:
 
   rem:
     address: 195.71.99.217
-    parents: gw-helsinki
+    parents: gw-telefonica
     hostgroups: computers, buildd
 
+  ball:
+    address: 78.32.9.213
+    parents: gw-ball
+    hostgroups: computers, buildd, no-udev
+
 #############################
 # host groups
 #
@@ -550,6 +563,10 @@ hostgroups:
     alias: secondary IP addresses
     private: 1
 
+  smart:
+    alias: hosts with smartd
+    private: 1
+
 
 #############################
 # servicegroups
@@ -618,17 +635,17 @@ services:
     name: disk usage on /boot
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
-    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem
+    hosts: sperger, rietz, steffani, penalosa, peri, albeniz, goetz, mayer, mayr, paer, spontini, tartini, morales, ravel, schroeder, piatti, rem, ball
   -
     name: disk usage on /var
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, puccini, lebrun, tartini, morales, powell
+    hosts: bartok, samosa, raff, lobos, villa, gluck, saens, voltaire, lebrun, tartini, morales, powell
   -
     name: disk usage on /org
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org"
-    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, puccini, spontini, ravel, mahler, schroeder, piatti
+    hosts: sperger, samosa, raff, lobos, villa, steffani, saens, pergolesi, verdi, spontini, ravel, mahler, schroeder, piatti, pescetti
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -638,7 +655,7 @@ services:
     name: disk usage on /srv
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
-    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell
+    hosts: agricola, arcadelt, argento, allegri, tartini, morales, powell, puccini
   -
     name: disk usage on /org/scratch
     servicegroups: diskspace
@@ -653,12 +670,12 @@ services:
     name: disk usage on /usr
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /usr"
-    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, puccini, merulo, tartini, morales, powell
+    hosts: samosa, raff, lobos, villa, gluck, saens, pergolesi, merulo, tartini, morales, powell
   -
     name: disk usage on /home
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /home"
-    hosts: raptor, voltaire, lebrun, rem
+    hosts: raptor, voltaire, lebrun, rem, ball
   -
     name: disk usage on /home
     servicegroups: diskspace
@@ -1473,7 +1490,7 @@ services:
   -
     name: process - debianqueued
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u dak -C debianqueued"
-    hosts: ries, ravel
+    hosts: ries, ravel, klecker
 
  ###
   -
@@ -1555,6 +1572,11 @@ services:
     name: process - monit
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C monit -a '/usr/sbin/monit -d 30 -c /etc/monit/monitrc -s /var/lib/monit/monit.state'"
     hosts: villa, lobos, steffani, kassia, master
+ ###
+  -
+    name: process - smartd
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C smartd -a '/usr/sbin/smartd --pidfile /var/run/smartd.pid --interval=1800'"
+    hostgroups: smart
 
  ############ NFS Stuff ############
  ####