gru/smokeping_2.9.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
root
2025-11-07 11:31:06 +00:00
commit 2859f93882
407 changed files with 99769 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
debian/patches/asset_path_changes vendored Normal file
View File

@@ -0,0 +1,39 @@
Description: fix the paths to javascript files
We're using javascript libraries from debian packages instead of the ones
vendored by upstream. Because of this some paths to libraries might differ a
bit.
Some folks are still using URLs of the form /cgi-bin/smokeping.cgi (which was
used up until buster). In order for css and js to be able to load with this
URL, we need to use our top-level alias to retrieve them.
Author: Antoine Beaupré <anarcat@debian.org>
Forwarded: not-needed
Last-Update: 2019-08-25
--- a/etc/basepage.html.dist
+++ b/etc/basepage.html.dist
@@ -4,8 +4,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<META http-equiv="Refresh" content="<##step##>">
<title>SmokePing Latency Page for <##title##></title>
- <link rel="stylesheet" type="text/css" href="css/smokeping-print.css" media="print">
- <link rel="stylesheet" type="text/css" href="css/smokeping-screen.css" media="screen">
+ <link rel="stylesheet" type="text/css" href="/smokeping/css/smokeping-print.css" media="print">
+ <link rel="stylesheet" type="text/css" href="/smokeping/css/smokeping-screen.css" media="screen">
</head>
<body id="body">
@@ -47,10 +47,10 @@
<p><small>Maintained by <a href="mailto:<##contact##>"><##owner##></a></small></p>
</div>
-<script src="js/prototype.js" type="text/javascript"></script>
-<script src="js/scriptaculous/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
-<script src="js/cropper/cropper.js" type="text/javascript"></script>
-<script src="js/smokeping.js" type="text/javascript"></script>
+<script src="/smokeping/js/prototype/prototype.js" type="text/javascript"></script>
+<script src="/smokeping/js/scriptaculous/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
+<script src="/smokeping/js/cropper/cropper.js" type="text/javascript"></script>
+<script src="/smokeping/js/smokeping.js" type="text/javascript"></script>
</body>
</html>

32
debian/patches/dont_build_third_party_js.patch vendored Normal file
View File

@@ -0,0 +1,32 @@
Description: Don't build js libraries from third parties
These 3rd party libraries are getting excluded from the source through
repacking since we instead include those from the debian packages that already
exists for them. The build shouldn't try and process the non-existent files.
Author: Gabriel Filion <gabster@lelutin.ca>
Forwarded: not-needed
Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
--- smokeping-2.8.2+ds.orig/htdocs/Makefile.am
+++ smokeping-2.8.2+ds/htdocs/Makefile.am
@@ -16,21 +16,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
JS = js/smokeping.js \
- js/prototype.js \
- js/cropper/cropper.js \
- js/cropper/licence.txt \
- js/cropper/marqueeVert.gif \
- js/cropper/cropper.uncompressed.js \
- js/cropper/cropper.css \
- js/cropper/marqueeHoriz.gif \
- js/scriptaculous/controls.js \
- js/scriptaculous/slider.js \
- js/scriptaculous/sound.js \
- js/scriptaculous/effects.js \
- js/scriptaculous/unittest.js \
- js/scriptaculous/builder.js \
- js/scriptaculous/scriptaculous.js \
- js/scriptaculous/dragdrop.js \
css/smokeping-print.css \
css/smokeping-screen.css

54
debian/patches/fix-conf-paths vendored Normal file
View File

@@ -0,0 +1,54 @@
Description: use Debian paths instead of silly ones
Forwarded: not-needed
Index: b/etc/config.dist.in
===================================================================
--- a/etc/config.dist.in 2018-05-12 17:07:16.029079629 -0400
+++ b/etc/config.dist.in 2018-05-12 17:08:53.349752138 -0400
@@ -3,17 +3,17 @@
owner = Peter Random
contact = some@address.nowhere
mailhost = my.mail.host
-sendmail = @SENDMAIL@
+sendmail = /usr/sbin/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 = @prefix@/cache
-imgurl = cache
-datadir = @prefix@/data
-piddir = @prefix@/var
+imgcache = /var/cache/smokeping/images
+imgurl = ../smokeping/images
+datadir = /var/lib/smokeping
+piddir = /run/smokeping
cgiurl = http://some.url/smokeping.cgi
-smokemail = @prefix@/etc/smokemail.dist
-tmail = @prefix@/etc/tmail.dist
+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
@@ -47,7 +47,7 @@ AVERAGE 0.5 144 720
*** Presentation ***
-template = @prefix@/etc/basepage.html.dist
+template = /etc/smokeping/basepage.html
htmltitle = yes
graphborders = no
@@ -107,10 +107,10 @@ unison_tolerance = 2
+ FPing
-binary = /usr/sbin/fping
+binary = /usr/bin/fping
*** Slaves ***
-secrets=@prefix@/etc/smokeping_secrets.dist
+secrets=/etc/smokeping/smokeping_secrets
+boomer
display_name=boomer
color=0000ff

173
debian/patches/fix-paths-inside-executables vendored Normal file
View File

@@ -0,0 +1,173 @@
Description: hardcode the path to the config file in CGI
Author: Antoine Beaupré <anarcat@debian.org>
Forwarded: not-needed
Last-Update: 2019-02-16
Index: b/bin/smokeping_cgi
===================================================================
--- a/bin/smokeping_cgi 2018-05-12 17:02:02.090910241 -0400
+++ b/bin/smokeping_cgi 2018-05-12 17:05:36.224389954 -0400
@@ -4,9 +4,7 @@
use strict;
use warnings;
-use FindBin;
use lib (split /:/, q{}); # PERL5LIB
-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
# don't bother with zombies
$SIG{CHLD} = 'IGNORE';
@@ -17,7 +15,7 @@ use Smokeping;
use CGI::Fast;
-my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config";
+my $cfg = (shift @ARGV) || "/etc/smokeping/config";
while (my $q = new CGI::Fast) {
Index: b/bin/smokeping
===================================================================
--- a/bin/smokeping 2018-05-12 17:04:04.175753876 -0400
+++ b/bin/smokeping 2018-05-12 17:05:08.868200917 -0400
@@ -4,13 +4,11 @@
use strict;
use warnings;
-use FindBin;
use lib (split /:/, q{}); # PERL5LIB
-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
use Smokeping;
-
-Smokeping::main("$FindBin::RealBin/../etc/config");
+
+Smokeping::main("/etc/smokeping/config");
=head1 NAME
@@ -128,25 +126,6 @@ L<documentation on the SmokePing configuration file|smokeping_config>.
Please refer to L<the installation document|smokeping_install> for detailed setup instructions.
-=head1 SETUP
-
-When installing SmokePing, this file has to be adjusted to fit your
-local system. Three paths have to be entered.
-
-One pointing to your B<rrdtool> installation
-
- use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
-
-One pointing to the place where you have installed the SmokePing libraries
-
- use lib qw(/home/oetiker/public_html/smokeping/lib);
-
-The third path is the argument to the Smokeping::main command. It points to
-the SmokePing configuration file.
-
- use Smokeping;
- Smokeping::main("/home/oetiker/.smokeping/config");
-
=head1 SEE ALSO
L<smokeping_config(5)>, L<smokeping_examples(5)>, L<smokeping_cgi(1)>,
Index: b/bin/tSmoke
===================================================================
--- a/bin/tSmoke 2018-05-12 17:04:04.175753876 -0400
+++ b/bin/tSmoke 2018-05-12 17:06:18.924685024 -0400
@@ -53,7 +53,6 @@ use warnings;
# Point the lib variables to your implementation
use lib (split /:/, q{}); # PERL5LIB
-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
use Smokeping;
@@ -63,7 +62,7 @@ use Pod::Usage;
use RRDs;
# Point to your Smokeping config file
-my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config";
+my $cfgfile = (shift @ARGV) || "/etc/smokeping/config";
# global variables
my $cfg;
@@ -498,39 +497,9 @@ past week and past month including an overview.
Typical crontab used to invoke this are
# Quick morning alert to see what's down
- 0 6 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mobilephone@att.net.invalid --morning
+ 0 6 * * * /usr/sbin/tSmoke --q --to=mobilephone@att.net.invalid --morning
# Weekly report on the percent availability of network systems with no detail
- 0 8 * * * /usr/local/smokeping/bin/tSmoke.pl --q --to=mailbox@company.com.invalid --weekly --detail=0
-
-=head1 SETUP
-
-When installing tSmoke, some variables must be adjusted to fit your local system.
-
-We need to use the following B<libraries>:
-
-=over
-
-=item Smokeping
-
-=item RRDTool Perl bindings
-
-=item Getopt::Long
-
-=back
-
-Set up your libraries:
-
- use lib "/usr/local/smokeping/lib";
- use lib "/usr/local/rrdtool-1.0.39/lib/perl";
-
-Point to your Smokeping B<config> file
-
- my $cfgfile = "/usr/local/smokeping/etc/config";
-
-Modify the Smokeping config file to include a path for tmail in the
-General section:
-
- tmail = /usr/local/smokeping/etc/tmail
+ 0 8 * * * /usr/sbin/tSmoke --q --to=mailbox@company.com.invalid --weekly --detail=0
=head1 SEE ALSO
diff --git a/bin/smokeinfo b/bin/smokeinfo
index 7c56c0f..83a346e 100755
--- a/bin/smokeinfo
+++ b/bin/smokeinfo
@@ -3,7 +3,6 @@ use strict;
use warnings;
use lib (split /:/, q{}); # PERL5LIB
-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
use Smokeping::Info;
use Getopt::Long 2.25 qw(:config no_ignore_case);
@@ -82,19 +81,19 @@ they work on the same syntax.
Get all data all nodes
- smokeinfo etc/config
+ smokeinfo /etc/smokeping/config
Only show nodes directly under /Customers
- smokeinfo --filter=/Customers/ etc/config
+ smokeinfo --filter=/Customers/ /etc/smokeping/config
Show all nodes under /Customers
- smokeinfo --mode=recursive --filter=/Customers/ etc/config
+ smokeinfo --mode=recursive --filter=/Customers/ /etc/smokeping/config
Show all nodes with '_wlan_' in the name
- smokeinfo --mode=regexp --filter=_wlan_ etc/config
+ smokeinfo --mode=regexp --filter=_wlan_ /etc/smokeping/config
=head1 SEE ALSO

14
debian/patches/fix-perl-lib vendored Normal file
View File

@@ -0,0 +1,14 @@
Description: fix path for perl libs
Debian packages drop libraries in a different place than upstream
Forwarded: not-needed
Last-Update: 2019-02-10
--- smokeping-2.6.5.orig/lib/Makefile.am
+++ smokeping-2.6.5/lib/Makefile.am
@@ -31,5 +31,5 @@ MATCH := $(wildcard Smokeping/matchers/*
EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
-perllibdir = $(prefix)/lib
+perllibdir = $(prefix)/share/perl5
nobase_perllib_DATA = $(EXTRA_DIST)

22
debian/patches/fix_curl_probe.patch vendored Normal file
View File

@@ -0,0 +1,22 @@
Description: Curl's help text changed format
Fix issue caused by curl 7.74 and later shortening default help
Author: Mat Ellis <excloudymat@gmail.com>
Origin: upstream
Bug-Debian: https://bugs.debian.org/986068
Forwarded: https://github.com/oetiker/SmokePing/issues/266
Applied-Upstream: https://github.com/oetiker/SmokePing/commit/3a290ee5e603782c5ba3bc4ec7294c8971cc88c4
---
Note: this was merged upstream after release of 2.8.2
--- smokeping-2.8.2.orig/lib/Smokeping/probes/Curl.pm
+++ smokeping-2.8.2/lib/Smokeping/probes/Curl.pm
@@ -220,7 +220,7 @@ sub test_usage {
my $arghashref = $self->features;
my %arghash = %$arghashref;
- my $curl_man = `$bin --help`;
+ my $curl_man = `$bin --help all`;
for my $feature (keys %arghash) {
next if $curl_man =~ /\Q$arghash{$feature}/;

72
debian/patches/proper-sample-conf vendored Normal file
View File

@@ -0,0 +1,72 @@
Description: setup a proper sample configuration
This disables slaves and setups targets that are sure to work (no
slaves, localhost). It also sets up utf8
Author: Antoine Beaupré <anarcat@debian.org>
Forwarded: not-needed
Last-Update: 2019-02-10
Index: b/etc/config.dist.in
===================================================================
--- a/etc/config.dist.in 2018-05-12 17:09:30.386008068 -0400
+++ b/etc/config.dist.in 2018-05-12 17:13:09.471522001 -0400
@@ -48,6 +48,7 @@ AVERAGE 0.5 144 720
*** Presentation ***
template = /etc/smokeping/basepage.html
+charset = utf-8
htmltitle = yes
graphborders = no
@@ -111,13 +112,13 @@ binary = /usr/bin/fping
*** Slaves ***
secrets=/etc/smokeping/smokeping_secrets
-+boomer
-display_name=boomer
-color=0000ff
-
-+slave2
-display_name=another
-color=00ff00
+#+boomer
+#display_name=boomer
+#color=0000ff
+
+#+slave2
+#display_name=another
+#color=00ff00
*** Targets ***
@@ -128,21 +129,16 @@ title = Network Latency Grapher
remark = Welcome to the SmokePing website of xxx Company. \
Here you will learn all about the latency of our network.
-+ Test
-menu= Targets
-#parents = owner:/Test/James location:/
++ Local
-++ James
+menu = Local
+title = Local Network
+#parents = owner:/Test/James location:/
-menu = James
-title =James
-alerts = someloss
-slaves = boomer slave2
-host = james.address
-
-++ MultiHost
-
-menu = Multihost
-title = James and James as seen from Boomer
-host = /Test/James /Test/James~boomer
+++ LocalMachine
+menu = Local Machine
+title = This host
+host = localhost
+#alerts = someloss
+#slaves = boomer slave2

7
debian/patches/series vendored Normal file
View File

@@ -0,0 +1,7 @@
asset_path_changes
fix-perl-lib
fix-paths-inside-executables
fix-conf-paths
proper-sample-conf
fix_curl_probe.patch
dont_build_third_party_js.patch