pull new changes to pandora_snmp_bandwidth.pl
This commit is contained in:
parent
0c520aed96
commit
1c032e0b67
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
################################################################################
|
||||
#
|
||||
# Bandwith usage plugin
|
||||
# Bandwidth usage plugin
|
||||
#
|
||||
# Requirements:
|
||||
# snmpget
|
||||
|
@ -55,7 +55,7 @@ Where OPTIONS could be:
|
|||
|
||||
[EXTRA]
|
||||
-ifIndex Target interface to retrieve, if not specified, total
|
||||
bandwith will be reported.
|
||||
bandwidth will be reported.
|
||||
-uniqid Use custom temporary file name.
|
||||
-inUsage Show only input usage (in percentage) - 1, or not 0.
|
||||
-outUsage Show only output usage (in percentage) - 1, or not 0.
|
||||
|
@ -66,7 +66,7 @@ e.g. -v is equal to -version, -c to -community, etc.
|
|||
EO_HELP
|
||||
|
||||
use constant {
|
||||
UNKNOWN_DUPLEX => 0,
|
||||
UNKNOWN_DUPLEX => 1,
|
||||
HALF_DUPLEX => 2,
|
||||
FULL_DUPLEX => 3,
|
||||
};
|
||||
|
@ -188,7 +188,7 @@ sub prepare_tree {
|
|||
|
||||
my $inOctets = snmp_get(\%inOctets_call);
|
||||
if (ref($inOctets) eq "HASH") {
|
||||
if ($inOctets->{'data'} eq '') {
|
||||
if (! exists($inOctets->{'data'}) || $inOctets->{'data'} eq '') {
|
||||
$inOctets = 0;
|
||||
} else {
|
||||
$inOctets = int $inOctets->{'data'};
|
||||
|
@ -209,7 +209,7 @@ sub prepare_tree {
|
|||
|
||||
my $outOctets = snmp_get(\%outOctets_call);
|
||||
if (ref($outOctets) eq "HASH") {
|
||||
if ($outOctets->{'data'} eq '') {
|
||||
if (! exists($outOctets->{'data'}) || $outOctets->{'data'} eq '') {
|
||||
$outOctets = 0;
|
||||
} else {
|
||||
$outOctets = int $outOctets->{'data'};
|
||||
|
@ -230,12 +230,11 @@ sub prepare_tree {
|
|||
|
||||
my $duplex = snmp_get(\%duplex_call);
|
||||
if (ref($duplex) eq "HASH") {
|
||||
if ($duplex->{'data'} eq '') {
|
||||
if (! exists($duplex->{'data'}) || $duplex->{'data'} eq '') {
|
||||
$duplex = 0;
|
||||
} else {
|
||||
$duplex = int $duplex->{'data'};
|
||||
}
|
||||
|
||||
} else {
|
||||
# Ignore, cannot retrieve inOctets.
|
||||
next;
|
||||
|
@ -492,9 +491,9 @@ $config->{'tmp_separator'} = ';' if empty($config->{'tmp_separator'});
|
|||
$config->{'tmp'} = (($^O =~ /win/)?$ENV{'TMP'}:'/tmp') if empty($config->{'tmp'});
|
||||
|
||||
# Create unique name for tmp and log file for host
|
||||
my $filename = $config->{'tmp'}.'/pandora_bandwith_'.$config->{'host'};
|
||||
my $filename = $config->{'tmp'}.'/pandora_bandwidth_'.$config->{'host'};
|
||||
if (!empty($config->{'uniqid'})) {
|
||||
$filename = $config->{'tmp'}.'/pandora_bandwith_'.$config->{'uniqid'};
|
||||
$filename = $config->{'tmp'}.'/pandora_bandwidth_'.$config->{'uniqid'};
|
||||
}
|
||||
# Replace every dot for underscore
|
||||
$filename =~ tr/./_/;
|
||||
|
@ -511,7 +510,7 @@ if ( defined($sysobjectid->{'error'}) || $sysobjectid->{'data'} eq '' ) {
|
|||
|
||||
# Check SNMP x64 interfaces
|
||||
my $walk64 = snmp_walk({%{$config}, 'oid' => '.1.3.6.1.2.1.31.1.1.1.6'});
|
||||
if ( $walk64 =~ 'No Such Instance currently exists at this OID' || $walk64 =~ 'No more variables left in this MIB View') {
|
||||
if ( $walk64 !~ /.*\.[0-9]+ = Counter64: [0-9]+/ ) {
|
||||
$config->{'use_x64'} = 0;
|
||||
} else {
|
||||
$config->{'use_x64'} = 1;
|
||||
|
@ -556,16 +555,16 @@ my $j = 0;
|
|||
my $k = 0;
|
||||
foreach my $iface (keys %{$analysis_tree}) {
|
||||
# Calculate summary;
|
||||
if (is_enabled($analysis_tree->{$iface}{'bandwidth'})) {
|
||||
$bandwidth = $analysis_tree->{$iface}{'bandwidth'};
|
||||
if (is_enabled($analysis_tree->{$iface}{'bandwidth'}) || $analysis_tree->{$iface}{'bandwidth'} == 0) {
|
||||
$bandwidth += $analysis_tree->{$iface}{'bandwidth'};
|
||||
$i++;
|
||||
}
|
||||
if (is_enabled($analysis_tree->{$iface}{'inUsage'})) {
|
||||
$inUsage = $analysis_tree->{$iface}{'inUsage'};
|
||||
if (is_enabled($analysis_tree->{$iface}{'inUsage'}) || $analysis_tree->{$iface}{'inUsage'} == 0) {
|
||||
$inUsage += $analysis_tree->{$iface}{'inUsage'};
|
||||
$j++;
|
||||
}
|
||||
if (is_enabled($analysis_tree->{$iface}{'outUsage'})) {
|
||||
$outUsage = $analysis_tree->{$iface}{'outUsage'};
|
||||
if (is_enabled($analysis_tree->{$iface}{'outUsage'}) || $analysis_tree->{$iface}{'outUsage'} == 0) {
|
||||
$outUsage += $analysis_tree->{$iface}{'outUsage'};
|
||||
$k++;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue