mirror-accumu is a xinetd-host

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

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index cf96b40..f943cf4 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -28,6 +28,10 @@ servers:
     address: 130.239.18.97
     parents: gw-ubcece
     hostgroups: layer3-infrastructure
+  gw-accumu2:
+    address: 130.242.6.198
+    parents: gw-ubcece
+    hostgroups: layer3-infrastructure
   gw-aql:
     address: 141.170.2.17
     parents: gw-ubcece
@@ -178,9 +182,9 @@ servers:
     parents: gw-accumu
     hostgroups: computers, buildd, hassrvfs, jessie
   mirror-accumu:
-    address: 130.239.18.124
-    parents: gw-accumu
-    hostgroups: computers, service, jessie, apache2-hosts, hassrvfs
+    address: 130.242.6.199
+    parents: gw-accumu2
+    hostgroups: computers, service, jessie, apache2-hosts, hassrvfs, xinetd-hosts
   # }}}
   # {{{ gw-aql
   eller:
@@ -461,7 +465,7 @@ servers:
   lindsay:
     address: 5.153.231.36
     parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, jessie, autofs, nfs-client, systemd-timesyncd
+    hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, systemd-timesyncd
   mirror-bytemark:
     address: 5.153.231.37
     parents: ganeti-bytemark
@@ -537,7 +541,7 @@ servers:
   acker:
     address: 217.196.149.228
     parents: gw-conova
-    hostgroups: computers, jessie, service, sw-raid
+    hostgroups: computers, stretch, service, sw-raid
   mirror-conova:
     address: 217.196.149.229
     parents: gw-conova
@@ -780,7 +784,7 @@ servers:
   handel:
     address: 82.195.75.104
     parents: ganeti3
-    hostgroups: computers, service, kvmdomains, apache2-hosts, jessie
+    hostgroups: computers, service, kvmdomains, apache2-hosts, stretch, postgres96-hosts
   kaufmann:
     address: 82.195.75.107
     parents: ganeti3
@@ -963,10 +967,6 @@ servers:
     address: 206.12.19.218
     parents: sw-ubcece-kais
     hostgroups: computers, bl460, acpid-hosts, service, jessie, drbd-hosts, multipath-hosts
-  ganeti2:
-    address: 206.12.19.23
-    parents: sw-ubcece-kais
-    hostgroups: notacomputer
   # MSA 2000 (2012i)
   giustini:
     address: 192.168.2.6
@@ -979,10 +979,6 @@ servers:
 #    address: 206.12.19.120
 #    parents: sw-ubcece-kais
 #    hostgroups: computers, service, hasbootfs, kvmdomains, squeeze, hasvicepa
-  glinka:
-    address: 206.12.19.126
-    parents: ganeti2
-    hostgroups: computers, service, kvmdomains, jessie, apache2-hosts, apache-https, nfs-client, autofs, xinetd-hosts
   # }}}
   # {{{ ubc-gateway
   ubc-enc2bl01:
@@ -1635,6 +1631,14 @@ services:
     name: swap usage - mb
     nrpe: "/usr/lib/nagios/plugins/check_swap -w 20000 -c 5000"
     hostgroups: computers
+  -
+    name: free memory - mb
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m mb"
+    hostgroups: computers
+  -
+    name: free memory - percent
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-memory -m pct"
+    hostgroups: computers
   -
     name: process - getty
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:8 -c 1: -u root -C getty -a /sbin/getty"
@@ -1721,6 +1725,12 @@ services:
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:3 -c 1: -u root -C bacula-fd -a '/usr/sbin/bacula-fd -c /etc/bacula/bacula-fd.conf'"
     hostgroups: freebsd
 
+  -
+    name: network backup status - draghi
+    servicegroups: backup
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile -a 2h /home/debbackup/nagios-status"
+    hosts: draghi
+
   ####
   -
     name: process - acc.umu.se backup
@@ -1750,8 +1760,7 @@ services:
   -
     name: upgraded libraries
     servicegroups: security
-    nrpe: "sudo /usr/local/sbin/dsa-check-libs"
-    #nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
+    nrpe: "sudo /usr/lib/nagios/plugins/dsa-check-libs"
     hostgroups: computers
     excludehostgroups: freebsd
     check_interval:  60
@@ -3099,6 +3108,13 @@ services:
     check_interval: 60
     max_check_attempts: 2
     retry_interval: 5
+  -
+    name: puppet - agent check
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/puppet-agent"
+    hostgroups: computers
+    excludehosts: moszumanska
+    check_interval:  60
+    retry_interval: 15
   # }}}
 # }}}