# We probably don't care about loopback transfer
my @ignored_interfaces = ( "lo" );
-sub interface_read($$) {
- my $veid = shift;
- my $name = shift;
- my ($key, $current_interface, $val, @lines, @parts, @counters, $i);
- my @if_instances = ('if_octets', 'if_packets', 'if_errors');
+sub interface_read {
+ my ($veid, $name) = @_;
+ my @rx_fields = qw(if_octets if_packets if_errors drop fifo frame compressed multicast);
+ my @tx_fields = qw(if_octets if_packets if_errors drop fifo frame compressed);
my %v = _build_report_hash($name);
- $v{'plugin'} = 'interface';
- delete $v{'plugin_instance'};
+ my @lines = `$vzctl exec $veid cat /proc/net/dev`;
- @lines = split(/\n/, `$vzctl exec $veid cat /proc/net/dev`);
- #$ vzctl exec 1106221 cat /proc/net/dev
- #Inter-| Receive | Transmit
- # face |bytes packets errs drop fifo frame compressed multicast|bytes packets errs drop fifo colls carrier compressed
- # lo: 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- # venet0: 2420 27 0 0 0 0 0 0 2200 29 0 0 0 0 0 0
- foreach (@lines) {
- next if (!/:/);
+ for my $line (@lines) {
+ # skip explanatory text
+ next if $line !~ /:/;
- @parts = split(/:/);
- ($current_interface = $parts[0]) =~ s/^\s*(.*?)\s*$/$1/;
- next if grep { $current_interface eq $_ } @ignored_interfaces;
+ $line =~ s/^\s+|\s+$//g;
- ($val = $parts[1]) =~ s/^\s*(.*?)\s*$/$1/;
- @counters = split(/ +/, $val);
+ my ($iface, %rx, %tx);
- $v{'plugin_instance'} = $key;
- for ($i= 0; $i <= $#if_instances; ++$i) {
- $v{'type'} = $if_instances[$i];
- $v{'values'} = [ $counters[$i], $counters[$i + 8] ];
- plugin_dispatch_values(\%v);
+ # read /proc/net/dev fields
+ ($iface, @rx{@rx_fields}, @tx{@tx_fields}) = split /[: ]+/, $line;
+
+ # Skip this interface if it is in the ignored list
+ next if grep { $iface eq $_ } @ignored_interfaces;
+
+ for my $instance (qw(if_octets if_packets if_errors)) {
+ plugin_dispatch_values({
+ 'plugin' => 'interface',
+ 'plugin_instance' => $iface,
+ 'type' => $instance,
+ 'values' => [ $rx{$instance}, $tx{$instance} ],
+ %v,
+ });
+ }
}
}
-}
-sub cpu_read($$) {
+sub cpu_read {
my $veid = shift;
my $name = shift;
my ($key, $val, $i, @lines, @counters);
}
}
-sub df_read($$) {
+sub df_read {
my $veid = shift;
my $name = shift;
my ($key, $val, @lines, @parts);
}
}
-sub load_read($$) {
+sub load_read {
my $veid = shift;
my $name = shift;
my ($key, $val, @lines, @parts);
plugin_dispatch_values(\%v);
}
-sub processes_read($$) {
+sub processes_read {
my $veid = shift;
my $name = shift;
my ($key, $val, @lines);
}
}
-sub users_read($$) {
+sub users_read {
my $veid = shift;
my $name = shift;
my ($key, $val, @lines);
plugin_dispatch_values(\%v);
}
-sub _build_report_hash($) {
+sub _build_report_hash {
my $name = shift;
return (time => time(), interval => plugin_get_interval(), host => $name);
}