From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 26 Nov 2018 13:22:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'waja/update-apt-statusdir'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=70eb5f667b70342866e791e9ca8d4d3a3b70b569;hp=a054fb3a6807f58d951cbab9787853308837b7ec;p=mirror%2Fdsa-nagios.git

Merge remote-tracking branch 'waja/update-apt-statusdir'

* waja/update-apt-statusdir:
  Create directory if not existing
---

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index d3b85e3..e22a978 100644
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -728,11 +728,11 @@ servers:
   manda-node03:
     address: 82.195.75.69
     parents: gw-manda
-    hostgroups: computers, service, stretch, r540
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses
   manda-node04:
     address: 82.195.75.70
     parents: gw-manda
-    hostgroups: computers, service, stretch, r540
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses
   bendel:
     address: 82.195.75.100
     parents: ganeti3
@@ -752,7 +752,7 @@ servers:
   draghi:
     address: 82.195.75.106
     parents: ganeti3
-    hostgroups: computers, service, hasbootfs, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch
+    hostgroups: computers, service, hassrvfs, apache2-hosts, spamd, heavy-exim, kvmdomains, xinetd-hosts, apache-https, stretch
   geo1:
     address: 82.195.75.105
     parents: ganeti3
@@ -830,6 +830,10 @@ servers:
     parents: byrd
     hostgroups: computers, service, kvmdomains, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, apache-https
 
+  pijper:
+    address: 140.211.166.194
+    parents: gw-osuosl
+    hostgroups: computers, stretch, service, manyprocesses
   pieta:
     address: 140.211.166.195
     parents: gw-osuosl
@@ -2042,6 +2046,11 @@ services:
     name: HW - OpenManage status
     nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage"
     hostgroups: pe1950, r540
+    excludehosts: wieck, schumann
+  -
+    name: HW - OpenManage status
+    nrpe: "/usr/bin/sudo /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0"
+    hosts: wieck, schumann
   # }}}
   # }}}
   # {{{ ### mail stuff