cleanup dump of mac instance mappings to STDERR

[gnt-info] / gnt-i

diff --git a/gnt-i b/gnt-i
index 29cf191..4d85f48 100755 (executable)
--- a/gnt-i
+++ b/gnt-i
@@ -14,6 +14,7 @@ sub XXX { $DEBUG ? warn "XXX ",Dumper( @_ ) : {} };
 my $stat;
 my $mac_to_name;
 my $instance_tap;
+my $tap_instance;
 my $lines;
 
 my @nodes = @ARGV;
@@ -42,7 +43,7 @@ my @ps_cols = qw( user pid
        _args);
 
 sub ps_cols_all { map { my $t = $_; $t =~ s/^_//; $t } @ps_cols };
-sub ps_cols_visible { 'node', grep { ! /^_/ } @ps_cols };
+sub ps_cols_visible { 'node', grep { ! /^_/ } @ps_cols, 'rx', 'tx' };
 
 sub DD_hh_mm_ss {
        my $t = shift;
@@ -93,7 +94,10 @@ while(<$ps>) {
 
        } else {
 #              warn "## SKIP [$_]\n";
-               $stat->{ '__' . $hostname }->{$_} += $h{$_} foreach qw( pcpu pmem vsz rss cputime etimes maj_flt min_flt );
+               $stat->{ '__' . $hostname }->{$_} += $h{$_} foreach qw( pcpu pmem vsz rss
+                       nlwp cputime etimes
+                       maj_flt min_flt
+               );
                
        }
 
@@ -103,42 +107,74 @@ while(<$ps>) {
 my $tap = sh('grep . /var/run/ganeti/kvm-hypervisor/nic/*/*');
 while(<$tap>) {
        chomp;
-       warn "## $tap\n";
+#      warn "## tap $_\n";
        my @p = split(/\//,$_);
        push @{ $instance_tap->{$hostname}->{ $p[-2] } }, $p[-1];
+
+       my $if = $p[-1];
+       $if =~ s/\d://;
+       $tap_instance->{$hostname}->{$if} = $p[-2];
 }
 
+=for later
+
 my $ip = sh('ip -s -o link');
 while(<$ip>) {
        chomp;
        if ( m/master\s+(\S+).+ether\s+([0-9a-fA-F:]+).+RX:\s+.+\\\s+(\d+).+TX:\s+.+\\\s+(\d+)/ ) {
-               my ( $br, $mac, $rx, $tx ) = ( $1, $2, $3, $4 );
-               if ( my $name = $mac_to_name->{$mac} ) {
-                       $stat->{$name}->{link}->{ $br } = [ $rx, $tx ];
+               my ( $if, $mac, $rx, $tx ) = ( $1, $2, $3, $4 );
+               if ( my $name = $tap_instance->{$hostname}->{$if} ) {
+                       $stat->{$name}->{link}->{ $if } = [ $rx, $tx ];
+                       warn "## ip $name $ip $mac $rx $tx\n";
                } else {
-                       warn "## SKIP MAC $mac [$_]\n" if $DEBUG;
+                       warn "## ip SKIP $if $mac $rx $tx\n"; # XXX if $DEBUG;
                }
        } else {
                warn "## SKIP $_\n" if $DEBUG;
        }
 }
 
+=cut
+
+my $dev = sh 'grep : /proc/net/dev';
+while(<$dev>) {
+       chomp;
+       s/^\s+//;
+       my @l = split(/[:\s]+/, $_);
+#warn "XXX $_ -> ",Dumper( \@l );
+       if ( my $instance = $tap_instance->{$hostname}->{ $l[0] } ) {
+                       $stat->{$instance}->{rx} += $l[1];
+                       $stat->{$instance}->{tx} += $l[9];
+       } elsif ( $l[0] =~ m/eth/ ) { # connect hardware eth devices under node
+                       $stat->{ '__' . $hostname }->{rx} += $l[1];
+                       $stat->{ '__' . $hostname }->{tx} += $l[9];
+       }
+}
+
+
+goto next_node if @nodes;
+
+
+
 # dump some useful data structures
 
 sub tab_dump {
        my ( $name, $hash ) = @_;
        warn "# $name\n";
        foreach my $key ( sort keys %$hash ) {
-               warn $key, "\t$hostname\t", $hash->{$key}, "\n";
+               warn $key, "\t", $hash->{$key}, "\n";
        }
 }
 
-tab_dump 'mac_to_name',  $mac_to_name;
-warn Dumper( $mac_to_name );
-tab_dump 'instance_tap', $instance_tap;
-warn Dumper( $instance_tap );
 
-goto next_node if @nodes;
+
+foreach my $node ( sort keys %$mac_to_name ) {
+       tab_dump "$node mac instance",  $mac_to_name->{$node};
+}
+#warn Dumper( $mac_to_name );
+#tab_dump 'instance_tap', $instance_tap;
+#warn Dumper( $instance_tap );
+#warn Dumper( $tap_instance );
 
 
 warn "# stat ", Dumper( $stat ) if $DEBUG;
@@ -146,7 +182,7 @@ warn "# stat ", Dumper( $stat ) if $DEBUG;
 
 # dump tablable ascii output
 
-XXX( @ps_cols );
+#XXX( @ps_cols );
 
 sub push_line {
        my @l = @_;
@@ -166,7 +202,7 @@ foreach my $name ( sort keys %$stat ) {
        push_line( $name, map { $stat->{$name}->{$_} } ps_cols_visible );
 }
 
-XXX $lines;
+#XXX $lines;
 
 my $fmt = join(' ', map { '%' . $_ . 's' } @{ $lines->{len} } ) . "\n";
 warn "# fmt = [$fmt]" if $DEBUG;