Get rid of single-cpu hostgroup. we no longer run irq-balance everywhere

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index c19b7eb..34ab86e 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -197,12 +197,12 @@ servers:
   peri:
     address: 192.25.206.15
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, sw-raid, hasbootfs, single-cpu, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ulogd-hosts
     contacts: dannf
   penalosa:
     address: 192.25.206.68
     parents: gw-HP-ftc
-    hostgroups: computers, buildd, hasbootfs, single-cpu, ulogd-hosts
+    hostgroups: computers, buildd, hasbootfs, ulogd-hosts
     contacts: dannf
   mundy:
     address: 192.25.206.62
@@ -211,7 +211,7 @@ servers:
   paer:
     address: 192.25.206.11
     parents: gw-HP-ftc
-    hostgroups: computers, porterbox, hasbootfs, hashomefs, single-cpu
+    hostgroups: computers, porterbox, hasbootfs, hashomefs
   merulo:
     address: 192.25.206.58
     parents: gw-HP-ftc
@@ -234,12 +234,12 @@ servers:
   agricola:
     address: 82.195.75.86
     parents: gw-man-da
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hassrvfs
+    hostgroups: computers, porterbox, sw-raid, hassrvfs
     contacts: bzed
   arcadelt:
     address: 82.195.75.87
     parents: gw-man-da
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
     contacts: bzed
   liszt:
     address: 82.195.75.100
@@ -270,7 +270,7 @@ servers:
   kaufmann:
     address: 82.195.75.107
     parents: unger
-    hostgroups: computers, service, hasbootfs, apache2-hosts, single-cpu, rsyncd-hosts, kvmdomains, xinetd-hosts
+    hostgroups: computers, service, hasbootfs, apache2-hosts, rsyncd-hosts, kvmdomains, xinetd-hosts
   ball:
     address: 82.195.75.70
     parents: gw-man-da
@@ -278,7 +278,7 @@ servers:
   purcell:
     address: 82.195.75.69
     parents: gw-man-da
-    hostgroups: computers, buildd, single-cpu, ulogd-hosts
+    hostgroups: computers, buildd, ulogd-hosts
 
   master:
     address: 70.103.162.29
@@ -340,7 +340,7 @@ servers:
   #mahler:
   #  address: 128.31.0.46
   #  parents: gw-mit-csail
-  #  hostgroups: computers, single-cpu, porterbox, hasorgfs
+  #  hostgroups: computers, porterbox, hasorgfs
   rore:
     address: 128.31.0.49
     parents: gw-mit-csail
@@ -367,7 +367,7 @@ servers:
   argento:
     address: 93.94.130.160
     parents: gw-dg-i.net
-    hostgroups: computers, buildd, sw-raid, single-cpu, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hassrvfs, ulogd-hosts
     contacts: bzed
 
   widor:
@@ -385,13 +385,13 @@ servers:
     address: 193.62.202.27
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, porterbox, sw-raid, single-cpu, hasbootfs, ntpsuckers
+    hostgroups: computers, porterbox, sw-raid, hasbootfs, ntpsuckers
     contacts: tjrc1
   goetz:
     address: 193.62.202.26
     parents: gw-sanger
     # SMP kernel doesn't run stable
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs, ntpsuckers, hassrvfs, ulogd-hosts
+    hostgroups: computers, buildd, sw-raid, hasbootfs, ntpsuckers, hassrvfs, ulogd-hosts
     contacts: tjrc1
   sibelius:
     address: 193.62.202.28
@@ -436,7 +436,7 @@ servers:
   geo3:
     address: 195.20.242.125
     parents: schumann
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
   soler:
     address: 195.20.242.126
     parents: schumann
@@ -450,7 +450,7 @@ servers:
   pescetti:
     address: 217.114.76.85
     parents: gw-nmmn
-    hostgroups: computers, porterbox, single-cpu, smart, hasorgfs
+    hostgroups: computers, porterbox, smart, hasorgfs
 
   kassia:
     address: 130.89.149.224
@@ -472,7 +472,7 @@ servers:
   ancina:
     address: 157.193.39.13
     parents: gw-ghent
-    hostgroups: computers, buildd, single-cpu, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
+    hostgroups: computers, buildd, hassrvfs, hasbootfs, incomingmailrelayed2025, xinetd-hosts, ulogd-hosts
     contacts: luk
 
   agnesi:
@@ -499,7 +499,7 @@ servers:
     hostgroups: computers, bl460, acpid-hosts, ulogd-hosts
   tchaikovsky:
     address: 206.12.19.118
-    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, single-cpu, ulogd-hosts
+    hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains, ulogd-hosts
   wolkenstein:
     address: 206.12.19.116
     parents: dijkstra
@@ -511,7 +511,7 @@ servers:
   geo2:
     address: 206.12.19.113
     parents: dijkstra
-    hostgroups: computers, service, hasbootfs, single-cpu, bind9-hosts, kvmdomains, ulogd-hosts
+    hostgroups: computers, service, hasbootfs, bind9-hosts, kvmdomains, ulogd-hosts
   duarte:
     address: 206.12.19.114
     parents: dijkstra
@@ -519,7 +519,7 @@ servers:
   valente:
     address: 206.12.19.112
     parents: dijkstra
-    hostgroups: computers, hasbootfs, single-cpu, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, postgres83-hosts, ftpd-hosts, rsyncd-hosts, kvmdomains, heavy-exim, xinetd-hosts
   bellini:
     address: 206.12.19.7
     parents: gw-ubc
@@ -567,15 +567,15 @@ servers:
   gabrielli:
     address: 206.12.19.17
     parents: tchaikovsky
-    hostgroups: computers, single-cpu 
+    hostgroups: computers
   corelli:
     address: 206.12.19.16
     parents: tchaikovsky
-    hostgroups: computers, single-cpu, buildd, ulogd-hosts
+    hostgroups: computers, buildd, ulogd-hosts
   lucatelli:
     address: 206.12.19.15
     parents: tchaikovsky
-    hostgroups: computers, single-cpu, buildd, ulogd-hosts
+    hostgroups: computers, buildd, ulogd-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -614,7 +614,7 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs, ntpsuckers, ulogd-hosts
+    hostgroups: computers, hasbootfs, ntpsuckers, ulogd-hosts
 
   schein:
     address: 149.20.20.6
@@ -774,9 +774,6 @@ hostgroups:
   mptraid:
     alias: Hosts with LSI Logic Fusion-MPT
     private: 1
-  single-cpu:
-    alias: Hosts with only one CPU
-    private: 1
 
   etch:
     alias: Hosts running etch
@@ -1512,15 +1509,10 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C uptimed -a '/usr/sbin/uptimed'"
     hostgroups: computers
  ###
-  -
-    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
-    excludehostgroups: single-cpu, freebsd
   -
     name: unwanted process - irqbalance
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C irqbalance"
-    hostgroups: single-cpu, freebsd
+    hostgroups: computers
 
  ####
  ###