run hpssacli instead of hpacucli on new hosts

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fb9fc03..4bdc670 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -151,7 +151,7 @@ servers:
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-unicamp:
-    address: 143.106.167.234
+    address: 177.220.10.65
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
   gw-utwente:
@@ -194,10 +194,6 @@ servers:
     address: 212.227.126.54
     parents: gw-1und1-sec
     hostgroups: computers, service, jessie
-  chopin:
-    address: 195.20.242.124
-    parents: schumann
-    hostgroups: computers, service, apache2-hosts, hassrvfs, hasbootfs, rsyncd-hosts, uploadqueue, kvmdomains, xinetd-hosts, apache-https, postgres94-hosts, jessie
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
@@ -523,6 +519,10 @@ servers:
     address: 150.203.164.38
     parents: gw-cecsit
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
+  mirror-anu:
+    address: 150.203.164.39
+    parents: gw-cecsit
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula, apache-https
   # }}}
   # {{{ gw-conova
   sompek:
@@ -641,6 +641,10 @@ servers:
     address: 149.20.20.6
     parents: gw-isc
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hasorgfs, xinetd-hosts, jessie, security_mirror, no-bacula
+  mirror-isc:
+    address: 149.20.20.7
+    parents: gw-isc
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror, no-bacula
   # }}}
   # {{{ gw-leaseweb
   lw01:
@@ -863,10 +867,6 @@ servers:
     hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-sil
-  eder:
-    address: 86.59.118.151
-    parents: gw-sil
-    hostgroups: computers, porterbox, jessie, hassrvfs
   eberlin:
     address: 86.59.118.155
     parents: gw-sil
@@ -1029,26 +1029,30 @@ servers:
   # {{{ gw-ugent
   # }}}
   # {{{ gw-umn
-  saens:
+  #saens:
+  #  address: 128.101.240.212
+  #  parents: gw-umn
+  #  hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+  mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, xinetd-hosts, jessie, security_mirror
   # }}}
   # {{{ gw-unicamp
   prokofiev:
-    address: 143.106.167.147
+    address: 177.220.10.78
     parents: gw-unicamp
     hostgroups: computers, jessie, service
   powerpc-unicamp-01:
-    address: 143.106.167.149
+    address: 177.220.10.79
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, jessie
   ppc64el-unicamp-01:
-    address: 143.106.167.135
+    address: 177.220.10.80
     parents: prokofiev
     hostgroups: computers, hassrvfs, buildd, jessie
   plummer:
-    address: 143.106.167.146
+    address: 177.220.10.81
     parents: prokofiev
     hostgroups: computers, porterbox, hassrvfs, jessie
   # }}}
@@ -1294,9 +1298,6 @@ hostgroups:
   hasorgfs:
     alias: hosts with a /org filesystem
     private: 1
-  hasvarfs:
-    alias: hosts with a /var filesystem
-    private: 1
   hasvarlogfs:
     alias: hosts with a /var/log filesystem
     private: 1
@@ -1410,11 +1411,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 75 85 /boot"
     hostgroups: hasbootfs
-  -
-    name: disk usage on /var
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 75 90 /var"
-    hostgroups: hasvarfs
   -
     name: disk usage on /org
     servicegroups: diskspace
@@ -1425,11 +1421,6 @@ services:
     servicegroups: diskspace
     nrpe: "/usr/lib/nagios/plugins/check_disk 95 98 /srv"
     hostgroups: hassrvfs
-  -
-    name: disk usage on /tmp
-    servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 60 80 /tmp"
-    hosts: saens
   -
     name: disk usage on /usr
     servicegroups: diskspace
@@ -1668,6 +1659,11 @@ services:
     hostgroups: computers
     normal_check_interval:  60
     retry_check_interval: 15
+  -
+    name: unexpected file - apt sources.list
+    servicegroups: apt
+    nrpe: "/usr/lib/nagios/plugins/negate /usr/lib/nagios/plugins/dsa-check-file -f /etc/apt/sources.list"
+    hostgroups: computers
   -
     name: upgraded libraries
     servicegroups: security
@@ -2008,7 +2004,7 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460, dl180
-    excludehosts: schein, rietz
+    excludehosts: schein, rietz, mirror-anu, mirror-isc, mirror-umn
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -2033,6 +2029,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
     normal_check_interval: 120
     hostgroups: dl585
+  -
+    name: HW - hpssacli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpssacli"
+    normal_check_interval: 120
+    hosts: mirror-anu, mirror-isc, mirror-umn
   ###
 #  -
 #    name: HW - edac status
@@ -2628,7 +2630,7 @@ services:
     hosts: giustini
   -
     name: event log
-    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=10867 $HOSTADDRESS$ public"
+    remotecheck: "/usr/lib/nagios/plugins/dsa-check-msa-eventlog --start=11298 $HOSTADDRESS$ public"
     runfrom: ubc-bl8
     hosts: giustini
   # }}}