X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fnagios-master.cfg;h=12b945e0d4bee15bd7b6d64a29a74eeb1b506a38;hb=3704c766924ef12163e012f66af870816489198f;hp=cd94a8c99c12b40d90d842e69b3d7b00f3b6df8e;hpb=05978793705b2767d3523a0e994829c71e42247a;p=mirror%2Fdsa-nagios.git

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index cd94a8c..12b945e 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -170,11 +170,11 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula, pe1950
   # }}}
   # {{{ gw-accumu
   pettersson:
@@ -458,18 +458,6 @@ servers:
     address: 5.153.231.36
     parents: ganeti-bytemark
     hostgroups: computers, service, kvmdomains, stretch, autofs, nfs-client, systemd-timesyncd
-  mirror-bytemark:
-    address: 5.153.231.37
-    parents: ganeti-bytemark
-    hostgroups: computers, service, kvmdomains, stretch, systemd-timesyncd, apache2-hosts, hassrvfs
-  mirror-bytemark-debian:
-    address: 5.153.231.45
-    hostgroups: secondary-IPs
-    parents: mirror-bytemark
-  mirror-bytemark-security:
-    address: 5.153.231.46
-    hostgroups: secondary-IPs
-    parents: mirror-bytemark
   sor:
     address: 5.153.231.38
     parents: ganeti-bytemark
@@ -583,7 +571,7 @@ servers:
     hostgroups: computers, service, dl360, stretch, drbd-hosts
   ganeti-csail:
     address: 128.31.0.49
-    parents: gw-bytemark
+    parents: gw-csail
     hostgroups: notacomputer
 
   mirror-csail:
@@ -1156,6 +1144,9 @@ hostgroups:
   aacraid:
     alias: Hosts with Adaptec AACraid
     private: 1
+  pe1950:
+    alias: Dell PowerEdge 1950 hosts
+    private: 1
 
   wheezy:
     alias: Hosts running wheezy
@@ -2053,6 +2044,10 @@ services:
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/dsa-check-drbd -d All"
     hostgroups: drbd-hosts
+  -
+    name: HW - OpenManage status
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage"
+    hostgroups: pe1950
   # }}}
   # }}}
   # {{{ ### mail stuff
@@ -2710,10 +2705,6 @@ services:
     name: DNS SOA sync - 144-28.118.59.86.in-addr.arpa
     check: "dsa_check_soas_add!denis.debian.org!144-28.118.59.86.in-addr.arpa"
     hosts: global
-  -
-    name: DNS SOA sync - alioth.debian.org
-    check: "dsa_check_soas_add!denis.debian.org!alioth.debian.org"
-    hosts: global
   -
     name: DNS SOA sync - debconf.net
     check: "dsa_check_soas_add!denis.debian.org!debconf.net"
@@ -2871,6 +2862,11 @@ services:
     check: dsa_check_cert!5061
     check_interval: 60
     hosts: vogler
+  -
+    name: freeradius process
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u freerad -C freeradius -a '/usr/sbin/freeradius -xx'"
+    check_interval: 60
+    hosts: vogler
   ####
   -
     name: puppetmaster cert