X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=d4265f1b3efe34162afc10089a8472e385cd5fe5;hb=118f33723fc6898be533075acbc541e0dce32fc1;hp=fb9fc03f2c773574433f05e988870690ed40d5dc;hpb=34b708b5a407e0e99869d7ee4599dfa7fe78c9f2;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index fb9fc03..d4265f1 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -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, hasorgfs, 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,10 +1029,14 @@ 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, hasvarfs, hasusrfs, hasorgfs, xinetd-hosts, wheezy, security_mirror, no-bacula
   # }}}
   # {{{ gw-unicamp
   prokofiev:
@@ -1425,11 +1429,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 +1667,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
@@ -2628,7 +2632,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
   # }}}