From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 9 Dec 2016 09:02:39 +0000 (+0000)
Subject: move ntp munin checks to ntp module
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f7076c9c465c463a9aa82f33f6af3430b3bedcbe;hp=6ce2aaa8c4bc079dd726c4d1c8b2519a51fb2da3;p=mirror%2Fdsa-puppet.git

move ntp munin checks to ntp module
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 2f7b76d6b..2ead29406 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -71,8 +71,6 @@ class debian-org {
 			'irqstats',
 			'load',
 			'memory',
-			'ntp_offset',
-			'ntp_states',
 			'open_files',
 			'open_inodes',
 			'processes',
diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 751e9d96a..e180da195 100644
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -40,6 +40,12 @@ class ntp {
 		require => Package['ntp'],
 	}
 
+	munin::check { [
+			'ntp_offset',
+			'ntp_states',
+			]:
+	}
+
 	if getfromhash($site::nodeinfo, 'timeserver') {
 		include ntp::timeserver
 	} else {