tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix fortigate vpn

This commit is contained in:
garnier-quentin 2019-10-24 15:52:50 +02:00
parent 972417503b
commit 3c49dfce1a
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
centreon-plugins/centreon/common/fortinet/fortigate/mode/vpn.pm
View File

@ -187,13 +187,21 @@ sub manage_selection {
my $snmp_result = $options{snmp}->get_multiple_table( my $snmp_result = $options{snmp}->get_multiple_table(
oids => [ oids => [
{ oid => $oid_fgVdEntName }, { oid => $oid_fgVdEntName },
{ oid => $oid_fgVpnTunTable },
{ oid => $oid_fgVpnSslStatsTable }, { oid => $oid_fgVpnSslStatsTable },
], ],
nothing_quit => 1 nothing_quit => 1
); );
my $snmp_result2 = $options{snmp}->get_multiple_table(
oids => [
{ oid => $mapping->{fgVpnTunEntPhase2Name}->{oid} },
{ oid => $oid_fgVpnTunTable, start => $mapping->{fgVpnTunEntInOctets}->{oid} },
],
return_type => 1,
nothing_quit => 1
);
$self->{vd} = {}; $self->{vd} = {};
my $duplicated = {};
foreach my $oid (keys %{$snmp_result->{ $oid_fgVdEntName }}) { foreach my $oid (keys %{$snmp_result->{ $oid_fgVdEntName }}) {
$oid =~ /^$oid_fgVdEntName\.(.*)$/; $oid =~ /^$oid_fgVdEntName\.(.*)$/;
my $vdom_instance = $1; my $vdom_instance = $1;
@ -216,11 +224,12 @@ sub manage_selection {
vpn => {}, vpn => {},
}; };
foreach (keys %{$snmp_result->{$oid_fgVpnTunTable}}) { foreach (keys %$snmp_result2) {
next if (/^$mapping->{fgVpnTunEntVdom}->{oid}\.(.*)$/ && next if (! /^$mapping->{fgVpnTunEntVdom}->{oid}\.(.*)$/ ||
$snmp_result->{$oid_fgVpnTunTable}->{$_} != $vdom_instance $snmp_result2->{$_} != $vdom_instance
); );
$result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result->{$oid_fgVpnTunTable}, instance => $1); my $instance = $1;
$result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result2, instance => $instance);
if (defined($self->{option_results}->{filter_vpn}) && $self->{option_results}->{filter_vpn} ne '' && if (defined($self->{option_results}->{filter_vpn}) && $self->{option_results}->{filter_vpn} ne '' &&
$result->{fgVpnTunEntPhase2Name} !~ /$self->{option_results}->{filter_vpn}/) { $result->{fgVpnTunEntPhase2Name} !~ /$self->{option_results}->{filter_vpn}/) {
@ -228,14 +237,25 @@ sub manage_selection {
next; next;
} }
$self->{vd}->{$vdomain_name}->{vpn}->{$result->{fgVpnTunEntPhase2Name}} = { my $name = $result->{fgVpnTunEntPhase2Name};
display => $result->{fgVpnTunEntPhase2Name}, $name .= '.' . $instance if (defined($duplicated->{$name}));
if (defined($self->{vd}->{$vdomain_name}->{vpn}->{$name})) {
$duplicated->{$name} = 1;
$self->{vd}->{$vdomain_name}->{vpn}->{$name . '.' . $self->{vd}->{$vdomain_name}->{vpn}->{$name}->{instance}} = $self->{vd}->{$vdomain_name}->{vpn}->{$name};
$self->{vd}->{$vdomain_name}->{vpn}->{$name . '.' . $self->{vd}->{$vdomain_name}->{vpn}->{$name}->{instance}}->{display} = $name . '.' . $self->{vd}->{$vdomain_name}->{vpn}->{$name}->{instance};
delete $self->{vd}->{$vdomain_name}->{vpn}->{$name};
$name = $result->{fgVpnTunEntPhase2Name} . '.' . $instance;
}
$self->{vd}->{$vdomain_name}->{vpn}->{$name} = {
display => $name,
instance => $instance,
state => $result->{fgVpnTunEntStatus}, state => $result->{fgVpnTunEntStatus},
traffic_in => $result->{fgVpnTunEntInOctets}, traffic_in => $result->{fgVpnTunEntInOctets},
traffic_out => $result->{fgVpnTunEntOutOctets}, traffic_out => $result->{fgVpnTunEntOutOctets},
}; };
} }
} }
} }
1; 1;