Changes - j0ke.net Open Build Service

Changes of Revision 15

[-] [+]	Changed	smokeping.spec
@@ -9,7 +9,7 @@ %define apache_conf %{_sysconfdir}/apache2/conf.d/ # Name: smokeping -Version: 2.3.1 +Version: 2.3.3 Release: 1 # Group: System/Monitoring @@ -141,6 +141,20 @@ %dir %attr(0750,%{name},root) %{run_dir}/ %changelog +* Tue Mar 18 2008 Carsten Schoene <cs@linux-administrator.com> +- update to version 2.3.3 + - use separate slave cache and longer slave timeout. this + helps with slave congestion + - add an optional --pid-dir option to specify the pid directory + when running as a slave. + - slaves were not polling targets where nomasterpoll was set + +- changes in version 2.3.2 + - make ajax mode work on IE again + - make rawlog mode work again + - make ajax mode work for nomasterpol targets + - fixe ordering of menu versus overview page + * Sun Feb 17 2008 Carsten Schoene <cs@linux-administrator.com> - update to 2.3.1 * Master should not generate alerts for nomasterpoll targets
[-] [+]	Added	smokeping-2.3.3_distro_paths.patch ^
@@ -0,0 +1,63 @@ +--- etc/config.dist.orig 2008-01-21 15:02:04.000000000 +0100 ++++ etc/config.dist 2008-02-13 13:08:58.000000000 +0100 +@@ -1,19 +1,17 @@ + * General * + +-owner = Peter Random +-contact = some@address.nowhere +-mailhost = my.mail.host +-sendmail = /usr/lib/sendmail +-# NOTE: do not put the Image Cache below cgi-bin +-# since all files under cgi-bin will be executed ... this is not +-# good for images. +-imgcache = /home/oetiker/public_html/smokeping-ms/cache +-imgurl = cache +-datadir = /tmp/smokeping-ms/data +-piddir = /tmp/smokeping-ms/var +-cgiurl = http://some.url/smokeping.cgi +-smokemail = /home/oetiker/checkouts/smokeping/trunk/software/etc/smokemail.dist +-tmail = /home/oetiker/checkouts/smokeping/trunk/software/etc/tmail.dist ++owner = Root at badly configured smokeping box ++contact = root@localhost ++mailhost = localhost ++sendmail = /usr/sbin/sendmail ++imgcache = /var/cache/smokeping/ ++imgurl = /smokeping ++datadir = /var/lib/smokeping/data ++piddir = /var/run/smokeping/ ++cgiurl = http://localhost/cgi-bin/smokeping.cgi ++smokemail = /etc/smokeping/smokemail ++tmail = /etc/smokeping/tmail ++ + # specify this to get syslog logging + syslogfacility = local0 + # each probe is now run in its own process +@@ -21,8 +19,8 @@ + # concurrentprobes = no + + * Alerts * +-to = alertee@address.somewhere +-from = smokealert@company.xy ++to = root@localhost ++from = root@localhost + + +someloss + type = loss +@@ -47,7 +45,7 @@ + + * Presentation * + +-template = /home/oetiker/checkouts/smokeping/trunk/software/etc/basepage.html.dist ++template = /etc/smokeping/basepage.html + + + charts + +@@ -108,7 +106,7 @@ + binary = /usr/sbin/fping + + * Slaves * +-secrets=/home/oetiker/checkouts/smokeping/trunk/software/etc/smokeping_secrets.dist ++secrets=/etc/smokeping/smokeping_secrets + +boomer + display_name=boomer + color=0000ff
[-] [+]	Added	smokeping-2.3.3_no_speedy.patch ^
@@ -0,0 +1,20 @@ +Index: htdocs/smokeping.cgi.dist +=================================================================== +--- htdocs/smokeping.cgi.dist.orig 2007-08-31 22:36:55.275799739 +0200 ++++ htdocs/smokeping.cgi.dist 2007-08-31 22:36:58.559997862 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/sepp/bin/speedy -w ++#!/usr/bin/perl -w + # --perl-- + + use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); +Index: bin/smokeping.dist +=================================================================== +--- bin/smokeping.dist.orig 2007-08-31 22:36:55.275799739 +0200 ++++ bin/smokeping.dist 2007-08-31 22:36:58.567998344 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/sepp/bin/perl-5.8.4 -w ++#!/usr/bin/perl -w + # --perl-- + + use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl);
[-] [+]	Added	smokeping-2.3.3_remove_use_lib.patch ^
@@ -0,0 +1,53 @@ +--- htdocs/smokeping.cgi.dist.orig 2008-02-17 15:12:29.000000000 +0100 ++++ htdocs/smokeping.cgi.dist 2008-02-17 15:13:09.000000000 +0100 +@@ -1,13 +1,11 @@ + #!/usr/sepp/bin/speedy -w + # --perl-- + +-use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl); +-use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib); + use CGI::Carp qw(fatalsToBrowser); + + use Smokeping 2.003003; + +-Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config"); ++Smokeping::cgi("/etc/smokeping/config"); + + =head1 NAME + +--- bin/smokeping.dist.orig 2008-02-17 15:12:40.000000000 +0100 ++++ bin/smokeping.dist 2008-02-17 15:13:25.000000000 +0100 +@@ -1,12 +1,11 @@ + #!/usr/sepp/bin/perl-5.8.4 -w + # --perl-- + +-use lib qw(/usr/pack/rrdtool-1.2.23-mo/lib/perl); + use lib qw(lib); + + use Smokeping 2.003003; + +-Smokeping::main("etc/config.dist"); ++Smokeping::cgi("/etc/smokeping/config"); + + =head1 NAME + +--- bin/tSmoke.dist.orig 2008-02-17 15:12:49.000000000 +0100 ++++ bin/tSmoke.dist 2008-02-17 15:14:29.000000000 +0100 +@@ -50,8 +50,6 @@ + # -- Getopt::Long + # + # Point the lib variables to your implementation +-use lib qw(lib); +-use lib "/usr/local/rrdtool-1.0.39/lib/perl"; + + use Smokeping 2.003003; + use Net::SMTP; +@@ -60,7 +58,7 @@ + use RRDs; + + # Point to your Smokeping config file +-my $cfgfile = "etc/config.dist"; ++my $cfgfile = "/etc/smokeping/config"; + + # global variables + my $cfg;
	Added	smokeping-2.3.3.tar.gz ^