From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 28 Jan 2015 13:16:40 +0000 (+0100)
Subject: Push nagios check-libs.conf via puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e6c69790c2680df17f8df0659f88d8a94233df4d;p=mirror%2Fdsa-puppet.git

Push nagios check-libs.conf via puppet
---

diff --git a/modules/nagios/files/common/check-libs.conf b/modules/nagios/files/common/check-libs.conf
new file mode 100644
index 000000000..0fe767834
--- /dev/null
+++ b/modules/nagios/files/common/check-libs.conf
@@ -0,0 +1,19 @@
+--- 
+  ignorelist:
+    - '$path =~ m#^/proc/#'
+    - '$path =~ m#^/var/tmp/#'
+    - '$path =~ m#^/tmp/#'
+    - '$path =~ m#^/var/run/#'
+    - '$path =~ m#^/run/#'
+    - '$path =~ m#^/dev/pts/#'
+    - '$path =~ m#^/SYS#'
+    - '$path =~ m#^/sys/#'
+    - '$path =~ m#^/drm$# # xserver stuff'
+    - '$path =~ m#^/dev/zero#'
+    - '$path =~ m#^/dev/shm/#'
+    - '$path =~ m#^/var/lib/postgresql/#'
+    - '$path =~ m#^/var/log/#'
+    - '$path =~ m#^/var/spool/#'
+    - '$path =~ m#^/var/lib/ganeti/#'
+    - '$path =~ m#^/usr/lib/locale/locale-archive#'
+# vim:syn=yaml
diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index a2c2230b6..bc6b2a6fc 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -64,6 +64,10 @@ class nagios::client inherits nagios {
 		source  => 'puppet:///modules/nagios/common/obsolete-packages-ignore',
 		require => Package['dsa-nagios-checks'],
 	}
+	file { '/etc/nagios/check-libs.conf':
+		source  => 'puppet:///modules/nagios/common/check-libs.conf',
+		require => Package['dsa-nagios-checks'],
+	}
 	file { '/etc/nagios/obsolete-packages-ignore.d/hostspecific':
 		content => template('nagios/obsolete-packages-ignore.d-hostspecific.erb'),
 		require => Package['dsa-nagios-checks'],