X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=2c6f3077f3a3a239cb0512e29dd92165d2b03b1d;hb=bec747260a5a995578ccbf9729757beb2b53c5c3;hp=1478f610a54365cc1b0fba306007a463b38bccbf;hpb=2593551ae86047c4120a66753bbaad4bd930f002;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index 1478f61..2c6f307 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
@@ -149,11 +152,11 @@ servers:
   peri:
     address: 192.25.206.15
     parents: samosa
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, single-cpu
   penalosa:
     address: 192.25.206.68
     parents: samosa
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, single-cpu
   mundy:
     address: 192.25.206.62
     parents: samosa
@@ -174,11 +177,11 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid
+    hostgroups: computers, porterbox, sw-raid, single-cpu
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, single-cpu
   liszt:
     address: 82.195.75.100
     parents: gw-man-da
@@ -250,7 +253,7 @@ servers:
   argento:
     address: 195.49.152.174
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, single-cpu
 
   pergolesi:
     address: 62.104.23.252
@@ -259,7 +262,7 @@ servers:
   bruckner:
     address: 62.104.23.253
     parents: gw-freenet
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, single-cpu
 
   raptor:
     address: 195.243.109.162
@@ -278,7 +281,7 @@ servers:
   escher:
     address: 213.188.99.215
     parents: gw-cst
-    hostgroups: computers, porterbox
+    hostgroups: computers, porterbox, single-cpu
 
   verdi:
     address: 192.54.42.193
@@ -326,7 +329,12 @@ servers:
   allegri:
     address: 157.193.39.233
     parents: gw-ughent
-    hostgroups: computers, buildd, postfix-hosts, sw-raid
+    hostgroups: computers, buildd, postfix-hosts, sw-raid, single-cpu
+
+  agnesi:
+    address: 65.173.90.83
+    parents: gw-agnesi
+    hostgroups: deadslow
 
 #############################
 # host groups
@@ -378,6 +386,9 @@ hostgroups:
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
+  single-cpu:
+    alias: Hosts with only one CPU
+    private: 1
 
   syslog-ng-hosts:
     alias: hosts running syslog-ng instead of sysklogd
@@ -478,12 +489,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /srv"
     hosts: agricola, arcadelt, argento, allegri
   -
-    name: disk usage on /org/scratch2
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch2"
+    name: disk usage on /org/scratch
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch"
     hosts: merkel
   -
-    name: disk usage on /oldorg
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /oldorg"
+    name: disk usage on /org/scratch3
+    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /org/scratch3"
     hosts: merkel
   -
     name: disk usage on /tmp
@@ -585,6 +596,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
  ####
   -
@@ -919,8 +936,11 @@ services:
     name: process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C irqbalance -a '/usr/sbin/irqbalance'"
     hostgroups: computers
-    excludehosts: arcadelt, agricola, argento, penalosa, peri, escher, bruckner, allegri
-
+    excludehostgroups: single-cpu
+  -
+    name: unwanted process - named
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
+    hostgroups: single-cpu
 
  ####
  ###