Browse Source

smokeping: upgrade to 2.7.3+140+gf11bd10

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
master
Steven Noonan 4 months ago
parent
commit
ef6533a7a5
Signed by: steven GPG Key ID: 408EEB508ED0CD4D
  1. 10
      smokeping/0001-try-to-restart-probes-that-abnormally-exit.patch
  2. 16
      smokeping/0002-include-target-IP-hostname-in-rendered-graphs.patch
  3. 14
      smokeping/0003-repurpose-hide-directive-to-mean-hide-hostname.patch
  4. 4
      smokeping/0004-fping-don-t-noisily-log-error-codes-256-and-512.patch
  5. 12
      smokeping/0005-use-a-much-darker-theme-for-graphs-and-webpages.patch
  6. 4
      smokeping/0006-FPing-add-support-for-random-ICMP-payload.patch
  7. 4
      smokeping/0007-FPing-always-assume-4-6-is-supported.patch
  8. 10
      smokeping/0008-smokeping.pm-ignore-chart-entry-for-loss-category-if.patch
  9. 18
      smokeping/PKGBUILD

10
smokeping/0001-try-to-restart-probes-that-abnormally-exit.patch

@ -1,4 +1,4 @@
From 8e7357a1252c64ad6d36881c179daa151cc44339 Mon Sep 17 00:00:00 2001
From 162a166cb36f494a7f96bf2e8cfbf115c753bed5 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Sat, 29 Sep 2018 15:29:01 -0700
Subject: [PATCH 1/8] try to restart probes that abnormally exit
@ -9,10 +9,10 @@ Signed-off-by: Steven Noonan <steven@uplinklabs.net>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index c26770d..ae7ef95 100644
index b661797..646e3e2 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -4601,6 +4601,7 @@ RESTART:
@@ -4678,6 +4678,7 @@ RESTART:
exit 0;
}
};
@ -20,7 +20,7 @@ index c26770d..ae7ef95 100644
$SIG{CHLD} = sub {
while ((my $dead = waitpid(-1, WNOHANG)) > 0) {
my $p = $probepids{$dead};
@@ -4608,9 +4609,9 @@ RESTART:
@@ -4685,9 +4686,9 @@ RESTART:
do_log("Child process $dead (probe $p) exited unexpectedly with status $?.")
unless $exiting or $reloading;
delete $probepids{$dead};
@ -32,5 +32,5 @@ index c26770d..ae7ef95 100644
do_debuglog("Got HUP signal.");
$gothup = 1;
--
2.29.0
2.31.1

16
smokeping/0002-include-target-IP-hostname-in-rendered-graphs.patch

@ -1,4 +1,4 @@
From 26921f1b517e2c535158798de19a58d43232ee31 Mon Sep 17 00:00:00 2001
From fa726dd3430732d8f4686eedec00c275b37f6077 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Sat, 29 Sep 2018 15:59:51 -0700
Subject: [PATCH 2/8] include target IP/hostname in rendered graphs
@ -9,28 +9,28 @@ Signed-off-by: Steven Noonan <steven@uplinklabs.net>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index ae7ef95..1892cb7 100644
index 646e3e2..e8c6ab1 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -1383,6 +1383,8 @@ sub get_detail ($$$$;$){
@@ -1429,6 +1429,8 @@ sub get_detail ($$$$;$){
@lazy = ('--lazy') if $mode eq 's' and $lastheight{$s} and $lastheight{$s}{$start} and $lastheight{$s}{$start} == $max->{$s}{$start};
my $timer_start = time();
my $title = "";
+ my $escapedhost = $phys_tree->{host};
+ $escapedhost =~ s/:/\\:/g;
if ($cfg->{Presentation}{htmltitle} ne 'yes') {
$title = "$desc from " . ($s ? $cfg->{Slaves}{$slave}{display_name}: $cfg->{General}{display_name} || hostname);
$title = "$desc from " . ($s ? $cfg->{Slaves}{$slave}{display_name}: $cfg->{General}{display_name} || hostname) . " to $phys_tree->{title}";
}
@@ -1418,7 +1420,8 @@ sub get_detail ($$$$;$){
@@ -1464,7 +1466,8 @@ sub get_detail ($$$$;$){
()),
'HRULE:0#000000',
"COMMENT:probe${BS}: $pings $ProbeDesc every ${step}s",
- 'COMMENT:end\: '.$date.'\j' );
+ 'COMMENT:end\: '.$date.'\j',
- "COMMENT:$date\\j");
+ "COMMENT:$date\\j",
+ 'COMMENT:target\: '.$escapedhost.'\l');
# do_log ("***** begin task ***** <br />");
# do_log (@task);
# do_log ("***** end task ***** <br />");
--
2.29.0
2.31.1

14
smokeping/0003-repurpose-hide-directive-to-mean-hide-hostname.patch

@ -1,4 +1,4 @@
From 241610f08dd4014130523dcb5e2f97ce4eb7aafd Mon Sep 17 00:00:00 2001
From 47cfe41758aa3c27e8d29f5ede8d5aaf648fae52 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 15 May 2019 04:44:44 -0700
Subject: [PATCH 3/8] repurpose "hide" directive to mean "hide hostname"
@ -9,10 +9,10 @@ Signed-off-by: Steven Noonan <steven@uplinklabs.net>
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 1892cb7..f2b8873 100644
index e8c6ab1..9d880b0 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -698,13 +698,13 @@ sub target_menu($$$$;$){
@@ -721,13 +721,13 @@ sub target_menu($$$$;$){
$title = $tree->{$key}{__tree_link}{title};
$host = $tree->{$key}{__tree_link}{host};
$menuextra = $tree->{$key}{__tree_link}{menuextra};
@ -28,7 +28,7 @@ index 1892cb7..f2b8873 100644
}
# no menuextra for multihost
@@ -845,7 +845,7 @@ sub get_overview ($$$$){
@@ -869,7 +869,7 @@ sub get_overview ($$$$){
}
next unless $phys_tree->{host};
@ -37,7 +37,7 @@ index 1892cb7..f2b8873 100644
if (not $phys_tree->{nomasterpoll} or $phys_tree->{nomasterpoll} eq 'no'){
@slaves = ("");
@@ -1384,6 +1384,9 @@ sub get_detail ($$$$;$){
@@ -1430,6 +1430,9 @@ sub get_detail ($$$$;$){
my $timer_start = time();
my $title = "";
my $escapedhost = $phys_tree->{host};
@ -46,7 +46,7 @@ index 1892cb7..f2b8873 100644
+ }
$escapedhost =~ s/:/\\:/g;
if ($cfg->{Presentation}{htmltitle} ne 'yes') {
$title = "$desc from " . ($s ? $cfg->{Slaves}{$slave}{display_name}: $cfg->{General}{display_name} || hostname);
$title = "$desc from " . ($s ? $cfg->{Slaves}{$slave}{display_name}: $cfg->{General}{display_name} || hostname) . " to $phys_tree->{title}";
--
2.29.0
2.31.1

4
smokeping/0004-fping-don-t-noisily-log-error-codes-256-and-512.patch

@ -1,4 +1,4 @@
From 2d095154e20225054a4e07f3d8fff38bcc22e385 Mon Sep 17 00:00:00 2001
From bd0aaa8e85a58ab49dee7e11563dd916edad77ad Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Sat, 20 Jul 2019 18:10:02 -0700
Subject: [PATCH 4/8] fping: don't noisily log error codes 256 and 512
@ -24,5 +24,5 @@ index a42bac2..44e5635 100644
close $outh;
close $errh;
--
2.29.0
2.31.1

12
smokeping/0005-use-a-much-darker-theme-for-graphs-and-webpages.patch

@ -1,4 +1,4 @@
From ed4f2470724505f9548da88159b7c4bd092ef106 Mon Sep 17 00:00:00 2001
From 1a97614f94c4f653b0904a8a36f9b5b21a200af5 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Sat, 20 Jul 2019 18:10:25 -0700
Subject: [PATCH 5/8] use a much darker theme for graphs and webpages
@ -138,10 +138,10 @@ index f9a72ca..d67e1b2 100644
.footer p {
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index f2b8873..67732f5 100644
index 9d880b0..d9099d6 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -1028,7 +1028,7 @@ sub smokecol ($) {
@@ -1066,7 +1066,7 @@ sub smokecol ($) {
my $itop=$count;
my $ibot=1;
for (; $itop > $ibot; $itop--,$ibot++){
@ -150,7 +150,7 @@ index f2b8873..67732f5 100644
push @items, "CDEF:smoke${ibot}=cp${ibot},UN,UNKN,cp${itop},cp${ibot},-,IF";
push @items, "AREA:cp${ibot}";
push @items, "STACK:smoke${ibot}#".(sprintf("%02x",$color) x 3);
@@ -3920,7 +3920,7 @@ sub get_config ($$){
@@ -3987,7 +3987,7 @@ sub get_config ($$){
my $cfg = $parser->parse( $cfgfile ) or die "ERROR: $parser->{err}\n";
# lets have defaults for multihost colors
if (not $cfg->{Presentation}{multihost} or not $cfg->{Presentation}{multihost}{colors}){
@ -160,7 +160,7 @@ index f2b8873..67732f5 100644
return $cfg;
diff --git a/lib/Smokeping/Graphs.pm b/lib/Smokeping/Graphs.pm
index 807bbec..4939ce3 100644
index 1adc78b..1056072 100644
--- a/lib/Smokeping/Graphs.pm
+++ b/lib/Smokeping/Graphs.pm
@@ -25,6 +25,11 @@ the graphs shown in the overview page, except for the size.
@ -176,5 +176,5 @@ index 807bbec..4939ce3 100644
return '--border', '0',
'--color', 'BACK#ffffff00',
--
2.29.0
2.31.1

4
smokeping/0006-FPing-add-support-for-random-ICMP-payload.patch

@ -1,4 +1,4 @@
From 9c56e1df59c201b41e55db271c938daa87398889 Mon Sep 17 00:00:00 2001
From f43aa5981635c713f9e1aab95af09d9caff3bfab Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Thu, 27 Feb 2020 15:08:04 -0800
Subject: [PATCH 6/8] FPing: add support for random ICMP payload
@ -34,5 +34,5 @@ index 44e5635..254abf7 100644
protocol => {
_re => '(4|6)',
--
2.29.0
2.31.1

4
smokeping/0007-FPing-always-assume-4-6-is-supported.patch

@ -1,4 +1,4 @@
From 8729776913c9354178620da6fb819961e95d348a Mon Sep 17 00:00:00 2001
From 87957f4627e438e26b59c2845b2fc1caa2345e82 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Tue, 2 Jun 2020 02:14:40 -0700
Subject: [PATCH 7/8] FPing: always assume -4/-6 is supported
@ -33,5 +33,5 @@ index 254abf7..43943aa 100644
push @params, "-R" if $self->{properties}{randomdata};
push @params, "-t" . int(1000 * $self->{properties}{timeout}) if $self->{properties}{timeout};
--
2.29.0
2.31.1

10
smokeping/0008-smokeping.pm-ignore-chart-entry-for-loss-category-if.patch

@ -1,4 +1,4 @@
From 1cd30b8bafaad3b95b209e9d30b499a7a4a861b1 Mon Sep 17 00:00:00 2001
From 634254592905784b6159fd9e831c45c72f42f28f Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Mon, 14 Dec 2020 23:37:35 -0800
Subject: [PATCH 8/8] smokeping.pm: ignore chart entry for "loss" category if
@ -10,10 +10,10 @@ Signed-off-by: Steven Noonan <steven@uplinklabs.net>
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index 67732f5..8296cee 100644
index d9099d6..4f28bd6 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -1545,8 +1545,9 @@ sub get_charts ($$$){
@@ -1591,8 +1591,9 @@ sub get_charts ($$$){
if (not defined $charts{$chart}[0]){
$page .= "<p>No targets returned by the sorter.</p>"
} else {
@ -24,7 +24,7 @@ index 67732f5..8296cee 100644
my $tree = $cfg->{Targets};
for (@{$chartentry->{open}}) {
my ($host,$slave) = split(/~/, $_);
@@ -1554,7 +1555,7 @@ sub get_charts ($$$){
@@ -1600,7 +1601,7 @@ sub get_charts ($$$){
unless exists $tree->{$host};
last unless ref $tree->{$host} eq 'HASH';
$tree = $tree->{$host};
@ -34,5 +34,5 @@ index 67732f5..8296cee 100644
$page .= "<div class=\"panel-heading\"><h2>$rank.";
$page .= " ".sprintf($cfg->{Presentation}{charts}{$chart}{format},$chartentry->{value})
--
2.29.0
2.31.1

18
smokeping/PKGBUILD

@ -2,7 +2,7 @@
# Contributor: Christos Nouskas nous <nous at archlinux.us>
pkgname=smokeping
pkgver=2.7.3+127+gb2f960c
pkgver=2.7.3+140+gf11bd10
pkgrel=1
pkgdesc="A tool to keep track of your network latency"
arch=('any')
@ -29,14 +29,14 @@ sha256sums=('SKIP'
'ab3b399f58118fc31fac5f627814bbb3b1d7752dd3b4fed2d6b7ee58f24fbd2e'
'de0042cd54c4bd3329604939a6c3f4fd2034be466aed4421a7467493c024e1a1'
'4691650aed6c7341bf3a898f63c8ad03f2453d4ce9874e83f24ced5ee21317d9'
'0b945fa3219f287df180590301ff34aa624c03bba6f76a2d69f3e8b8d032d1de'
'95bb7a07af209dd69463a9e3eacf08b1cc1d835aedeb6bdcb6748449ad9f782f'
'2721472beacb5056cc46d045bcba0bf77eac22b33a1c7ca8d2768eab280f3d9a'
'8b1221551c0e47bee08147bcdf8155d3e2e6f4be9111e1653f2278658fe17e60'
'fbad97554e570092ae0443aade7decb6192f8f367f6d0fdc569bed19c40332b5'
'3be94c4e631cf740dc2829ecd732f58b6c61bb4b91e2ad8c3d9987a7b1a45226'
'69f37876d35f30fe3ee8939fc278c321021275b818dd5221a276167c17dcd516'
'ce310870a101de2eca7a4a80fe92fcad0eeb1d56a8b4b21ba9121e5c3688c4e1')
'16532c461a3d92dc860e5838e8e8c2f77a713f6b5bf3ce9e1730d3cf606b03c1'
'5b4bb26f7d29af11e12a83d603ec1026e1bf520fb715ff95f51967dd5a515e70'
'a84e715754b93df61c1e0a24fb8fb4b727f1e86a84c2158f2692eda1a0061734'
'41f43a85160f6c7d764cc89438473b82a1e0fd58732b928c4d36e1624483450e'
'0ee2e99ff14a39bbde8170281dc5d0f7878f3a1730b1ce21838c40b1c14783c7'
'6af23b7c4b0fbbbfd4c6fca69f59fc5b17821b9c18d34b00ed9a2cd9888feec2'
'8d8e56543870a0c6cd45d22743b690c0863ef41bf10ab4b0433ceda14eeb782d'
'657c6dccdc8170d17c93d2d7648fe7edee04702e8c756c9e6f3bd175301b14b4')
pkgver() {
cd "$srcdir"/${pkgname}

Loading…
Cancel
Save