X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=nagios-master.cfg;h=8ca652df6067d4ee3f54291a5fe11e54fc096f9a;hb=f9e1371d1e210f1263484aedb607b014ad55c611;hp=a8b0cf1d40b75caa80b8c3e1e53036fe53cd1d4e;hpb=f97e9c3da88b304f964ee824a50c6b2998dbd56b;p=mirror%2Fdsa-nagios.git

diff --git a/nagios-master.cfg b/nagios-master.cfg
index a8b0cf1..8ca652d 100644
--- a/nagios-master.cfg
+++ b/nagios-master.cfg
@@ -182,7 +182,7 @@ servers:
   peri:
     address: 192.25.206.15
     parents: samosa
-    hostgroups: computers, buildd, sw-raid, single-cpu, hasbootfs
+    hostgroups: computers, buildd, sw-raid, hasbootfs, lenny
     contacts: dannf
   penalosa:
     address: 192.25.206.68
@@ -205,7 +205,7 @@ servers:
   bartok:
     address: 82.195.75.91
     parents: gw-man-da
-    hostgroups: computers, service, syslog-ng-hosts, postfix-hosts, dl385, bind9-hosts
+    hostgroups: computers, service, dl385, bind9-hosts, lenny
     contacts: joerg, bzed
   morales:
     address: 82.195.75.97
@@ -284,7 +284,7 @@ servers:
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380
+    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, lenny
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
@@ -487,7 +487,7 @@ servers:
   goedel:
     address: 213.188.99.214
     parents: gw-cst
-    hostgroups: computers, single-cpu, hasbootfs
+    hostgroups: computers, single-cpu, hasbootfs, lenny
 
 #############################
 # host groups
@@ -556,9 +556,9 @@ hostgroups:
     alias: hosts not running samhain properly
     private: 1
 
-  syslog-ng-hosts:
-    alias: hosts running syslog-ng instead of sysklogd
-    private: 1
+  #syslog-ng-hosts:
+  #  alias: hosts running syslog-ng instead of sysklogd
+  #  private: 1
   rsyslog-hosts:
     alias: hosts running rsyslogd instead of sysklogd
     private: 1
@@ -684,7 +684,7 @@ services:
   -
     name: disk usage - all
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95"
+    nrpe: "/usr/lib/nagios/plugins/check_disk -X devpts -X proc 90 95"
     hostgroups: computers
   -
     name: disk usage on /
@@ -983,10 +983,10 @@ services:
     hostgroups: computers
 
  ###
-  -
-    name: process - syslog-ng
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
-    hostgroups: syslog-ng-hosts
+ # -
+ #   name: process - syslog-ng
+ #   nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslog-ng  -a '/sbin/syslog-ng -p /var/run/syslog-ng.pid'"
+ #   hostgroups: syslog-ng-hosts
  ###
   -
     name: process - rsyslogd
@@ -997,12 +997,12 @@ services:
     name: process - syslogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C syslogd  -a '/sbin/syslogd'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
+    excludehostgroups: rsyslog-hosts
   -
     name: process - klogd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u root -C klogd  -a '/sbin/klogd -x'"
     hostgroups: computers
-    excludehostgroups: syslog-ng-hosts, rsyslog-hosts
+    excludehostgroups: rsyslog-hosts
 
  ### MAIL STUFF
  ###
@@ -1327,7 +1327,7 @@ services:
     name: unwanted process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C snmpd"
     hostgroups: computers
-    excludehosts: lobos, villa
+    excludehosts: lobos
 
 
  ############ Processes/Services that only run on some computers ############
@@ -1662,7 +1662,7 @@ services:
   -
     name: process - snmpd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u snmp -C snmpd -a '/usr/sbin/snmpd -Lsd -Lf /dev/null -u snmp -I -smux -p /var/run/snmpd.pid 127.0.0.1'"
-    hosts: lobos, villa
+    hosts: lobos
 
  ####
   -
@@ -1698,7 +1698,7 @@ 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
+    hosts: lobos, steffani, kassia, master
  ###
   -
     name: process - smartd