remove piston

[mirror/dsa-nagios.git] / config / nagios-master.cfg

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 3a67b74..2a64c62 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -224,6 +224,10 @@ servers:
     address: 217.140.96.66
     parents: gw-arm
     hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, porterbox, deadslow
+  hartmann:
+    address: 217.140.96.67
+    parents: gw-arm
+    hostgroups: computers, hasbootfs, hassrvfs, wheezy, armhf, buildd, deadslow
   hasse:
     address: 217.140.96.68
     parents: gw-arm
@@ -585,10 +589,6 @@ servers:
     address: 140.211.15.152
     parents: gw-osuosl
     hostgroups: computers, wheezy, hassrvfs
-  piston:
-    address: 140.211.15.154
-    parents: gw-osuosl
-    hostgroups: computers, wheezy, hassrvfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -2019,11 +2019,6 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C gkrellmd"
     hostgroups: computers
     excludehostgroups: deadslow
-  -
-    name: unwanted process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C portmap"
-    hostgroups: computers
-    excludehostgroups: nfs-client, nfs-server, deadslow
   -
     name: unwanted process - rpc.statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 0:0 -C rpc.statd"
@@ -2095,7 +2090,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
-    excludehosts: schein
+    excludehosts: schein, rietz
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2107,7 +2102,7 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --no-battery"
     normal_check_interval: 120
-    hosts: schein
+    hosts: schein, rietz
   -
     name: HW - hpacucli enclosure status
     servicegroups: raid
@@ -2521,11 +2516,6 @@ services:
 
  ############ NFS Stuff ############
  ####
-  -
-    name: process - portmap
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u daemon -C portmap -a '/sbin/portmap'"
-    hostgroups: nfs-client, nfs-server
-    excludehostgroups: wheezy
   -
     name: process - statd
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u statd -C rpc.statd -a '/sbin/rpc.statd'"