patches: add nagios-debian-paths.patch

Also fix path to nagios socket in default collectd.conf

Thanks to Bas Couwenberg!

diff --git a/debian/changelog b/debian/changelog
index 955300f3f152baa0cb9205fab68fb7f39b32ff20..69293d8a74e3bd729cb8fd4f274eb494717101a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,9 @@ collectd (5.7.0-1) UNRELEASED; urgency=medium
     - Build-depend on libmicrohttpd-dev: Needed by the new write_prometheus
       plugin.
   * debian/patches:
-    Removed configure_find_lc_all.patch; included upstream.
+    - Removed configure_find_lc_all.patch; included upstream.
+    - Added nagios-debian-paths.patch, to use nagios-nrpe-server &
+      monitoring-plugin paths for Debian. Thanks to Bas Couwenberg.
 
  -- Marc Fournier <marc@bl.uem.li>  Tue, 13 Dec 2016 21:27:06 +0100
 

diff --git a/debian/collectd.conf b/debian/collectd.conf
index f1759b6d3944ab645a7933431ffe062a1cc63136..d9031199e192d47be4965473cfa4ee143d1f24de 100644 (file)
--- a/debian/collectd.conf
+++ b/debian/collectd.conf
@@ -813,7 +813,7 @@ LoadPlugin users
 #</Plugin>
 
 #<Plugin notify_nagios>
-#      CommandFile "/usr/local/nagios/var/rw/nagios.cmd"
+#      CommandFile "/var/lib/icinga/rw/icinga.cmd"
 #</Plugin>
 
 #<Plugin ntpd>

diff --git a/debian/patches/nagios-debian-paths.patch b/debian/patches/nagios-debian-paths.patch
new file mode 100644 (file)
index 0000000..41e7bf7
--- /dev/null
+++ b/debian/patches/nagios-debian-paths.patch
@@ -0,0 +1,24 @@
+Description: Use paths for nagios-nrpe-server & monitoring-plugins Debian packages.
+Author: Bas Couwenberg <sebastic@debian.org>
+
+--- a/contrib/exec-nagios.conf
++++ b/contrib/exec-nagios.conf
+@@ -1,15 +1,15 @@
+ # Run `perldoc exec-nagios.px' for details on this config file.
+ 
+-NRPEConfig /etc/nrpe.cfg
++NRPEConfig /etc/nagios/nrpe.cfg
+ 
+ Interval 300
+ 
+-<Script /usr/lib/nagios/check_tcp>
++<Script /usr/lib/nagios/plugins/check_tcp>
+       Arguments -H alice -p 22
+       Type delay
+ </Script>
+ 
+-<Script /usr/lib/nagios/check_dns>
++<Script /usr/lib/nagios/plugins/check_dns>
+       Arguments -H alice
+       Type delay
+ </Script>

diff --git a/debian/patches/series b/debian/patches/series
index 5e9e15a6b55248a10a406eaf960766283ff29e20..8c3f46b2e3722b791529ef4ad0b272c6927927ab 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 rrd_filter_path.patch
 collection_conf_path.patch
 myplugin_includes.patch
+nagios-debian-paths.patch