ignore unparsable lines from ifstat, two totals

[influxdb-pipes] / ifstat.pl

diff --git a/ifstat.pl b/ifstat.pl
index a43b626..b146801 100755 (executable)
--- a/ifstat.pl
+++ b/ifstat.pl
@@ -46,6 +46,8 @@ my $lines;
 my $host_tags = $host;
 $host_tags =~ s/\./,domain=/;
 
+my $last_hour = $hour;
+
 while(<$ifstat>) {
        chomp;
        #warn "# [$_]\n";
@@ -61,10 +63,16 @@ while(<$ifstat>) {
                @direction = map { s/\W+/_/g; s/^K//; $_ } @v;
        } elsif ( $v[0] =~ m/^(\d\d):(\d\d):(\d\d)/ ) {
                next unless $first_skipped++;
+
+               if ( $last_hour != $hour ) {
+                       ($sec,$min,$hour,$dd,$mm,$yyyy) = localtime(time); $mm++;
+                       $last_hour = $hour;
+               }
+
                $hour = $1; $min = $2; $sec = $3; update_time;
 
                reopen_curl;
-               my $total;
+               my @total;
 
                foreach my $i ( 0 .. $#if ) {
 
@@ -81,20 +89,29 @@ while(<$ifstat>) {
                        }
 =cut
 
-                       my $v1 = int( $v[$i*2+1] * 1024 );
-                       my $v2 = int( $v[$i*2+2] * 1024 );
+                       my $v1 = $v[$i*2+1];
+                       my $v2 = $v[$i*2+2];
 
-                       print $curl "ifstat,", join(',', @tags),
+                       if ( $v1 =~ m/^\d+\.\d++$/ && $v2 =~ m/^\d+\.\d++$/ ) {
+                               
+                               $total[0] += $v1;
+                               $total[1] += $v2;
+
+                               $v1 = int( $v1 * 1024 );
+                               $v2 = int( $v2 * 1024 );
+       
+                               print $curl "ifstat,", join(',', @tags),
                                " ", $direction[$i*2],   "=${v1}i",
                                ",", $direction[$i*2+1], "=${v2}i",
                                " $time\n" if $v1 < 100_000_000_000_000 && $v2 < 100_000_000_000_000;
 
-                       $total += $v[$i*2+1];
-
-                       $lines++;
+                               $lines++;
+                       } else {
+                               warn "IGNORED $if $v1 $v2\n";
+                       }
                }
 
-               warn "# $host ", $curl->tell, " total=$total\n";
+               warn "# $host ", $curl->tell, " totals: $total[0] $total[1]\n";
                close($curl);
        } else {
                die "UNPARSED [$_]";