From 645f7100e9f737de7e9dbface07711797c6349d6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:23 +0000 Subject: [PATCH 01/11] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ee5e152..26bd3e6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: mon -# $Id$ +# $Id: Makefile,v 1.1 2008/07/23 15:58:31 kevin Exp $ NAME := mon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c1647940f4b64cabddaa483c93db7565efa4081b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:00:13 +0000 Subject: [PATCH 02/11] Initialize branch EL-6 for mon --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 695d59e91e71958c942a2a4712255c54eceaf143 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 8 Jul 2010 20:48:02 +0000 Subject: [PATCH 03/11] Pull from devel --- import.log | 1 + mon.spec | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 import.log diff --git a/import.log b/import.log new file mode 100644 index 0000000..379f9f2 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +mon-1_2_0-6_fc14:EL-6:mon-1.2.0-6.fc14.src.rpm:1278622059 diff --git a/mon.spec b/mon.spec index 3ebe910..e83f4d1 100644 --- a/mon.spec +++ b/mon.spec @@ -1,12 +1,13 @@ # TODO: Split monitors and alerts into subpackages # they drag in way too much dependencies -%define moncgi_version 1.52 +%global moncgi_version 1.52 +%global fixlib sed 's,/usr/lib,%{_libdir},g' Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -22,6 +23,11 @@ Source5: userfile Patch0: mon-1.2.0-perl.patch Patch1: mon-1.2.0-uucp.patch +Requires: perl(Authen::PAM) +Requires: iputils +Requires: fping +Requires: traceroute + BuildRequires: dos2unix BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -91,8 +97,9 @@ install -p -m0755 mon.d/*.wrap mon.d/*.monitor $RPM_BUILD_ROOT%{_libdir}/mon/mon install -p -m0755 alert.d/* $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/ install -p -m0755 alerts/*/*.alert $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/ -install -Dp -m0644 etc/auth.cf $RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf -install -Dp -m0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf +install -d $RPM_BUILD_ROOT%{_sysconfdir}/mon +%{fixlib} etc/auth.cf >$RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf +%{fixlib} %{SOURCE3} >$RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf install -Dp -m0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/mon install -Dp -m0600 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/mon/userfile @@ -107,6 +114,9 @@ chmod -x mon.cgi-1.52/mon.cgi \ clients/batch-example \ utils/syslog.monitor +# Fix library path in examples +%{fixlib} -i etc/*.cf + %clean @@ -162,6 +172,10 @@ fi %changelog +* Wed Apr 21 2010 Lubomir Rintel (GoodData) - 1.2.0-6 +- Add missing dependencies (#584281) +- Fix path to libdir for 64-bits + * Sat Jul 25 2009 Fedora Release Engineering - 1.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 84584ad003b67723fb881119d9079b60f928d09d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:36:41 +0000 Subject: [PATCH 04/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 26bd3e6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mon -# $Id: Makefile,v 1.1 2008/07/23 15:58:31 kevin Exp $ -NAME := mon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 379f9f2..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -mon-1_2_0-6_fc14:EL-6:mon-1.2.0-6.fc14.src.rpm:1278622059 From e685e94d09726c732f5181f9dd26e2aa66bafeb4 Mon Sep 17 00:00:00 2001 From: Jan-Frode Myklebust Date: Wed, 20 Apr 2011 15:23:39 +0200 Subject: [PATCH 05/11] Bump release number to allow koji build. --- mon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index e83f4d1..73ed006 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ From fe388a9ef2642819013f907d91aed213a0aa424b Mon Sep 17 00:00:00 2001 From: Jan-Frode Myklebust Date: Sun, 24 Apr 2011 12:40:22 +0200 Subject: [PATCH 06/11] Remove perl-Authen-Radius dependency since it's not available, in EPEL6 either. Same as for EPEL5. --- mon.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mon.spec b/mon.spec index 73ed006..02eee07 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -157,7 +157,7 @@ fi %attr(2755, root, uucp) %{_libdir}/mon/mon.d/dialin.monitor.wrap # These packages are not in EPEL -%if 0%{?rhel} <= 5 +%if 0%{?rhel} <= 6 # perl(Expect) %exclude %{_libdir}/mon/mon.d/dialin.monitor # perl(Authen::Radius) @@ -172,6 +172,9 @@ fi %changelog +* Sun Apr 24 2011 Jan-Frode Myklebust - 1.2.0-8 +- Remove perl-Authen-Radius dependency since it's not available in EPEL6 either. + * Wed Apr 21 2010 Lubomir Rintel (GoodData) - 1.2.0-6 - Add missing dependencies (#584281) - Fix path to libdir for 64-bits From 7d54f2bec22fc7b6b672101c6646021463270695 Mon Sep 17 00:00:00 2001 From: Jan-Frode Myklebust Date: Sun, 20 Oct 2013 13:41:43 +0200 Subject: [PATCH 07/11] Fix logging to syslog. Same was fixed in debian's mon in 2011. Ref: http://sourceforge.net/p/mon/bugs/107/ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=611751 http://anonscm.debian.org/gitweb/?p=collab-maint/mon.git;a=commit;h=9d4e7dbfc523c49ad0ff4b40d3481bebfff32430 --- mon.spec | 9 ++++++++- syslog.patch | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 syslog.patch diff --git a/mon.spec b/mon.spec index 02eee07..5cac7c5 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -22,6 +22,9 @@ Source5: userfile Patch0: mon-1.2.0-perl.patch Patch1: mon-1.2.0-uucp.patch +# #107 mon is not logging anything to syslog +# http://sourceforge.net/p/mon/bugs/107/ +Patch2: syslog.patch Requires: perl(Authen::PAM) Requires: iputils @@ -50,6 +53,7 @@ required, the mon server will not need to be changed. %setup -q -a 1 -a 2 %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Filter out unwanted requires cat << \EOF > %{name}-req @@ -172,6 +176,9 @@ fi %changelog +* Fri Oct 11 2013 Jan-Frode Myklebust - 1.2.0-9 +- Add patch for upstream bug #107, mon not logging anything to syslog. + * Sun Apr 24 2011 Jan-Frode Myklebust - 1.2.0-8 - Remove perl-Authen-Radius dependency since it's not available in EPEL6 either. diff --git a/syslog.patch b/syslog.patch new file mode 100644 index 0000000..a86bd55 --- /dev/null +++ b/syslog.patch @@ -0,0 +1,14 @@ +--- a/mon 2011-02-01 14:13:05.425802661 -0500 ++++ b/mon 2011-02-01 14:17:43.814709129 -0500 +@@ -5392,9 +5392,10 @@ + + no warnings; # Redefining syslog + sub syslog { ++ my @args = @_; + eval { + local $SIG{"__DIE__"}= sub { }; +- my @log = map { s/\%//mg; } @_; ++ my @log = map { s/\%//mg; $_ } @args; + Sys::Syslog::syslog(@log); + } + } From cc48e981784e27ee2844c9e54b82bfea12eff6ec Mon Sep 17 00:00:00 2001 From: Jan-Frode Myklebust Date: Sun, 20 Oct 2013 18:30:06 +0200 Subject: [PATCH 08/11] Add patch for upstream bug #100, mangled output on descritption and detail: http://sourceforge.net/p/mon/bugs/100/ --- broken-percent-20.patch | 39 +++++++++++++++++++++++++++++++++++++++ mon.spec | 7 ++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 broken-percent-20.patch diff --git a/broken-percent-20.patch b/broken-percent-20.patch new file mode 100644 index 0000000..51d8e1f --- /dev/null +++ b/broken-percent-20.patch @@ -0,0 +1,39 @@ +--- mon.original 2013-10-20 18:08:16.249267591 +0200 ++++ mon 2013-10-20 18:16:43.958008453 +0200 +@@ -2511,9 +2511,9 @@ + foreach $group (keys %watch) { + foreach $service (keys %{$watch{$group}}) { + if (view_match($clients{$cl}->{"view"}, $group, $service)) { +- sock_write ($fh, "$group $service " . ++ sock_write ($fh, "$group $service '" . + esc_str ($watch{$group}->{$service}->{"description"}, 1) . +- "\n"); ++ "'\n"); + } + } + } +@@ -3035,7 +3035,23 @@ + if (defined $sref->{"periods"}->{$period}->{"_last_alert"} && $sref->{"periods"}->{$period}->{"_last_alert"} > $l); + } + +- my $buf = sprintf("group=$group service=$service opstatus=$sref->{_op_status} last_opstatus=%s exitval=%s timer=%s last_success=%s last_trap=%s last_traphost=%s last_check=%s ack=%s ackcomment=$comment alerts_sent=$alerts_sent depstatus=%s depend=$depend hostdepend=$hostdepend monitordepend=$monitordepend alertdepend=$alertdepend monitor=$monitor last_summary=%s last_detail=%s", (defined $sref->{_last_op_status} ? $sref->{_last_op_status} : ""), (defined $sref->{_exitval} ? $sref->{_exitval} : ""), (defined $sref->{_timer} ? $sref->{_timer} : ""), (defined $sref->{_last_success} ? $sref->{_last_success} : ""), (defined $sref->{_last_trap} ? $sref->{_last_trap} : ""), (defined $sref->{_last_traphost} ? $sref->{_last_traphost} : ""), (defined $sref->{_last_check} ? $sref->{_last_check} : ""), (defined $sref->{_ack} ? $sref->{_ack} : ""), (defined $sref->{"_depend_status"} ? int ($sref->{"_depend_status"}) : ""), $summary, $detail); ++ my $buf = "group=$group" . ++ " service=$service" . ++ " opstatus=$sref->{_op_status}" . ++ " last_opstatus=$sref->{_last_op_status}" . ++ " exitval=$sref->{_exitval}" . ++ " timer=$sref->{_timer}" . ++ " last_success=$sref->{_last_success}" . ++ " last_trap=$sref->{_last_trap}" . ++ " last_check=$sref->{_last_check}" . ++ " ack=$sref->{_ack}" . ++ " ackcomment='$comment'" . ++ " alerts_sent=$alerts_sent" . ++ " depstatus=" . int ($sref->{"_depend_status"}) . ++ " depend='$depend'" . ++ " monitor='$monitor'" . ++ " last_summary='$summary'" . ++ " last_detail='$detail'"; + + $buf .= " last_failure=$sref->{_last_failure}" + if ($sref->{"_last_failure"}); diff --git a/mon.spec b/mon.spec index 5cac7c5..7431fe4 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -25,6 +25,7 @@ Patch1: mon-1.2.0-uucp.patch # #107 mon is not logging anything to syslog # http://sourceforge.net/p/mon/bugs/107/ Patch2: syslog.patch +Patch3: broken-percent-20.patch Requires: perl(Authen::PAM) Requires: iputils @@ -54,6 +55,7 @@ required, the mon server will not need to be changed. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p0 # Filter out unwanted requires cat << \EOF > %{name}-req @@ -176,6 +178,9 @@ fi %changelog +* Sun Oct 20 2013 Jan-Frode Myklebust - 1.2.0-10 +- Add patch for upstream bug #100, Mangled output on descritption and detail. + * Fri Oct 11 2013 Jan-Frode Myklebust - 1.2.0-9 - Add patch for upstream bug #107, mon not logging anything to syslog. From 4a1b7b107bc510077d2e3306b55a55ac8daab94f Mon Sep 17 00:00:00 2001 From: Jan-Frode Myklebust Date: Sat, 14 Jun 2014 14:48:33 +0200 Subject: [PATCH 09/11] Fix bogus date in changelog. --- mon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 7431fe4..5813859 100644 --- a/mon.spec +++ b/mon.spec @@ -212,7 +212,7 @@ fi * Wed Jun 27 2007 Dag Wieers - 1.2.0-1 - 4303+/dries - Updated to release 1.2.0. -* Tue Mar 06 2004 Dag Wieers - 0.99.2-1 +* Thu Mar 06 2004 Dag Wieers - 0.99.2-1 - Fixed problems with perl-modules. * Fri Jan 09 2004 Dag Wieers - 0.99.2-0 From b943b1be6409f9bfd8ed1a71046ee24cb112419f Mon Sep 17 00:00:00 2001 From: Jan-Frode Myklebust Date: Sat, 14 Jun 2014 14:49:59 +0200 Subject: [PATCH 10/11] Fix bogus date. --- mon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 5813859..15809a0 100644 --- a/mon.spec +++ b/mon.spec @@ -212,7 +212,7 @@ fi * Wed Jun 27 2007 Dag Wieers - 1.2.0-1 - 4303+/dries - Updated to release 1.2.0. -* Thu Mar 06 2004 Dag Wieers - 0.99.2-1 +* Tue Mar 02 2004 Dag Wieers - 0.99.2-1 - Fixed problems with perl-modules. * Fri Jan 09 2004 Dag Wieers - 0.99.2-0 From d12eb3e3e515e878aa8cdc29c2f2015f9f48539b Mon Sep 17 00:00:00 2001 From: Jan-Frode Myklebust Date: Sat, 14 Jun 2014 15:01:33 +0200 Subject: [PATCH 11/11] bump --- mon.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 15809a0..aa2568f 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/