malhuda/AS-Stats
1
0
Fork 0
mirror of https://github.com/manuelkasper/AS-Stats.git synced 2025-02-20 11:44:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for NaN detection in rrd-extractstats.pl for 64-bit Perl versions (contributed by Benjamin Schlageter)

Browse Source 
Skip missing data sources in rrd-extractstats.pl to avoid abort if new data sources are added but the RRDs are not updated.
This commit is contained in:
Manuel Kasper 2011-03-28 08:37:30 +00:00
parent e0c8778f7e
commit 77890a8bab
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README
View File

@ -5,6 +5,15 @@ by Manuel Kasper, Monzoon Networks AG <mkasper@monzoon.net>
Changes
-------
xxx Fix for NaN detection in rrd-extractstats.pl for
64-bit Perl versions
(contributed by Benjamin Schlageter)
Skip missing data sources in rrd-extractstats.pl to avoid
abort if new data sources are added but the RRDs are not
updated.
v1.33 Fix for multiple entries with the same tag in the
knownlinks file (e.g. for LACP)
(contributed by Michal Buchtik)

16
bin/rrd-extractstats.pl
View File

@ -102,7 +102,18 @@ sub gettraffic {
my $dirname = "$rrdpath/" . sprintf("%02x", $as % 256);
my $rrdfile = "$dirname/$as.rrd";
# get list of available DS
my $availableds = {};
my $rrdinfo = RRDs::info($rrdfile);
foreach my $ri (keys %$rrdinfo) {
if ($ri =~ /^ds\[(.+)\]\.type$/) {
$availableds->{$1} = 1;
}
}
foreach my $link (@links) {
next if (!$availableds->{"${link}_in"} || !$availableds->{"${link}_out"});
push(@cmd, "DEF:${link}_in=$rrdfile:${link}_in:AVERAGE");
push(@cmd, "DEF:${link}_out=$rrdfile:${link}_out:AVERAGE");
push(@cmd, "VDEF:${link}_in_v=${link}_in,TOTAL");
@ -122,13 +133,13 @@ sub gettraffic {
for (my $i = 0; $i < scalar(@links); $i++) {
my $in = $lines->[$i*2];
chomp($in);
if ($in eq "nan") {
if (isnan($in)) {
$in = 0;
}
my $out = $lines->[$i*2+1];
chomp($out);
if ($out eq "nan") {
if (isnan($out)) {
$out = 0;
}
@ -157,3 +168,4 @@ sub read_knownlinks {
close(KLFILE);
}
sub isnan { ! defined( $_[0] <=> 9**9**9 ) }