packages: nagios-plugin-check_multi/check_multi.cfg, nagios-plugin-check_mu...

[glen]

Author: glen                         Date: Mon Jun 25 20:58:09 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package nagiostats.cmd, let NSTATS default value be set by configure time

---- Files affected:
packages/nagios-plugin-check_multi:
   check_multi.cfg (1.1 -> 1.2) , nagios-plugin-check_multi.spec (1.5 -> 1.6) , nstats.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_multi/check_multi.cfg
diff -u packages/nagios-plugin-check_multi/check_multi.cfg:1.1 packages/nagios-plugin-check_multi/check_multi.cfg:1.2
--- packages/nagios-plugin-check_multi/check_multi.cfg:1.1	Mon Jun 25 21:18:35 2012
+++ packages/nagios-plugin-check_multi/check_multi.cfg	Mon Jun 25 22:58:04 2012
@@ -13,3 +13,13 @@
 
 	check_command           check_multi
 }
+
+# check nagiostats.cmd
+define service {
+	use                     multi-service
+	name                    nagiostats
+	service_description     nagiostats
+	register                0
+
+	check_command           check_multi!-f /etc/nagios/plugins/check_multi/nagiostats.cmd -r 2
+}

================================================================
Index: packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec
diff -u packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.5 packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.6
--- packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec:1.5	Mon Jun 25 21:46:34 2012
+++ packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec	Mon Jun 25 22:58:04 2012
@@ -8,7 +8,7 @@
 Summary:	Multi purpose wrapper plugin for Nagios/Icinga
 Name:		nagios-plugin-%{plugin}
 Version:	0.26
-Release:	0.16
+Release:	0.19
 License:	GPL v2
 Group:		Networking
 URL:		http://my-plugin.de/wiki/projects/check_multi/start
@@ -16,6 +16,7 @@
 # Source0-md5:	38f822c3911c0cd5e625e859237ff902
 Source1:	%{plugin}.cfg
 Patch0:		issue-6.patch
+Patch1:		nstats.patch
 BuildRequires:	perl-base
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	sed >= 4.0
@@ -46,6 +47,7 @@
 %prep
 %setup -q -n %{plugin}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e '
 	s, at sysconfdir@/send_nsca.cfg,/etc/nagios/send_nsca.cfg,
@@ -76,6 +78,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}/{cluster,feed_passive}
+
+# package contrib and sample config as examples
 %{__make} install-config \
 	CFGDIR=%{_examplesdir}/%{name}-%{version}/config \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -88,6 +92,10 @@
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
 
+cd $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/config
+# this one seems useful, package as config
+cp -p nagiostats.cmd $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -95,6 +103,7 @@
 %defattr(644,root,root,755)
 %doc Changelog CM_VERSION LICENSE THANKS README
 %attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}.cfg
+%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{plugin}/*.cmd
 %dir %{_sysconfdir}/%{plugin}
 %attr(755,root,root) %{plugindir}/check_multi
 
@@ -122,6 +131,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2012/06/25 20:58:04  glen
+- package nagiostats.cmd, let NSTATS default value be set by configure time
+
 Revision 1.5  2012/06/25 19:46:34  glen
 - fix buggy, directory mode check
 - package contrib to examples

================================================================
Index: packages/nagios-plugin-check_multi/nstats.patch
diff -u /dev/null packages/nagios-plugin-check_multi/nstats.patch:1.1
--- /dev/null	Mon Jun 25 22:58:09 2012
+++ packages/nagios-plugin-check_multi/nstats.patch	Mon Jun 25 22:58:04 2012
@@ -0,0 +1,11 @@
+--- check_multi-0.26/sample_config/nagiostats/nagiostats.cmd.in~	2011-11-18 21:28:13.000000000 +0200
++++ check_multi-0.26/sample_config/nagiostats/nagiostats.cmd.in	2012-06-25 23:54:25.468638432 +0300
+@@ -8,6 +8,8 @@
+ # Call: check_multi -f nagiostats.cmd -s NSTATS=/path/to/nagiostats
+ #
+ 
++eval [ NSTATS ] = ("$NSTATS$" eq "") ? "@sbindir@/nagiostats" : "$NSTATS$"
++
+ # 1. check correct parameter passing for NSTAT binary
+ eval    [ NSTATS_defined                ] =
+ 	if (! "$NSTATS$") {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios-plugin-check_multi/check_multi.cfg?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/nagios-plugin-check_multi/nagios-plugin-check_multi.spec?r1=1.5&r2=1.6