X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=75025526843a0da8322ca77c697b9883ad5ff2b0;hb=aa6f214d821e7c3aac9b36c9826531b676b3bbfc;hp=4b9e3e7112b067817010cd4fabb88c55aab540e4;hpb=aaa7efc113ecb9242d983e9e1ed3bfed7875fa09;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 4b9e3e7..7502552 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -176,6 +176,10 @@ servers:
     address: 87.106.64.223
     parents: gw-1und1
     hostgroups: computers, service, acpid-hosts, wheezy
+  pkgmirror-1and1:
+    address: 213.165.95.4
+    parents: powell
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
   # }}}
   # {{{ gw-1und1-sec
   schumann:
@@ -254,10 +258,6 @@ servers:
     hostgroups: computers, hasbootfs, hassrvfs, armhf, wheezy, buildd, deadslow
   # }}}
   # {{{ gw-brainfood
-  old-master:
-    address: 97.107.116.29
-    parents: gw-brainfood
-    hostgroups: computers, general, spamd, heavy-exim, highload, xinetd-hosts, mptraid, squeeze, bacula-client
   murphy:
     address: 97.107.116.31
     parents: gw-brainfood
@@ -306,7 +306,7 @@ servers:
   picconi:
     address: 5.153.231.3
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim
+    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts, nfs-client, autofs, heavy-exim, spamd
   senfter:
     address: 5.153.231.4
     parents: gw-bytemark
@@ -314,7 +314,7 @@ servers:
   adayevskaya:
     address: 5.153.231.5
     parents: gw-bytemark
-    hostgroups: computers, service, kvmdomains, wheezy, apache2-hosts
+    hostgroups: computers, service, kvmdomains, wheezy
   # }}}
   # {{{ gw-c3sl
   santoro:
@@ -629,20 +629,10 @@ servers:
     address: 86.59.118.151
     parents: gw-sil
     hostgroups: computers, porterbox, squeeze, hassrvfs
-  englund:
-    address: 86.59.118.148
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, apache2-hosts, squeeze, hassrvfs, megactl
-    # which raid?
   eysler:
     address: 86.59.118.152
     parents: gw-sil
     hostgroups: computers, buildd, squeeze
-  lindberg:
-    address: 86.59.118.149
-    parents: gw-sil
-    hostgroups: computers, acpid-hosts, service, squeeze, megactl
-    # which raid?
   merikanto:
     address: 86.59.118.147
     parents: gw-sil
@@ -1052,9 +1042,9 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
-  megactl:
-    alias: Hosts with LSI Logic MegaRAID, but not usable with megaraid check
-    private: 1
+#  megactl:
+#    alias: Hosts with LSI Logic MegaRAID, but not usable with megaraid check
+#    private: 1
   megaraid:
     alias: Hosts with LSI Logic MegaRAID
     private: 1
@@ -1765,12 +1755,12 @@ services:
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
     hostgroups: spamd
-    excludehosts: wagner
+    excludehosts: wagner, picconi
     excludehostgroups: deadslow
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 20 --min-spare=5 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
-    hosts: wagner
+    hosts: wagner, picconi
   -
     name: process - spamd - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C spamd -a '/usr/sbin/spamd --create-prefs --max-children 10 --helper-home-dir -d --pidfile=/var/run/spamd.pid'"
@@ -2277,11 +2267,11 @@ services:
  ###
   -
     name: process - apache2 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C apache2 -a /usr/sbin/apache2"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
   -
     name: process - apache2 - worker
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -C apache2 -a /usr/sbin/apache2"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:50 -c 1:100 -u www-data -a /usr/sbin/apache2"
     hostgroups: apache2-hosts
     depends: process - apache2 - master
   -