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

update changelog

This commit is contained in:
garnier-quentin 2019-05-28 22:00:20 +02:00
parent 17f1339571
commit daf3654e58
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -11,6 +11,7 @@
* Enhancement: [haproxy/snmp] manage oss mib (#1475) * Enhancement: [haproxy/snmp] manage oss mib (#1475)
* Enhancement: [oracle] Fix segfault with last DBD::Oracle * Enhancement: [oracle] Fix segfault with last DBD::Oracle
* Break: [pdu/apc] modes refactoring * Break: [pdu/apc] modes refactoring
* Break: [pdu/eaton] modes refactoring
2019-04-12 Quentin Garnier <qgarnier@centreon.com> 2019-04-12 Quentin Garnier <qgarnier@centreon.com>
* Plugin added: Google Cloud Platform Compute Engine API * Plugin added: Google Cloud Platform Compute Engine API

6
hardware/pdu/eaton/snmp/mode/group.pm
View File

@ -82,6 +82,7 @@ sub prefix_group_output {
} }
my $mapping = { my $mapping = {
groupName => { oid => '.1.3.6.1.4.1.534.6.6.7.5.1.1.3' },
groupVoltage => { oid => '.1.3.6.1.4.1.534.6.6.7.5.3.1.3' }, # in mVolt groupVoltage => { oid => '.1.3.6.1.4.1.534.6.6.7.5.3.1.3' }, # in mVolt
groupCurrent => { oid => '.1.3.6.1.4.1.534.6.6.7.5.4.1.3' }, # in mA groupCurrent => { oid => '.1.3.6.1.4.1.534.6.6.7.5.4.1.3' }, # in mA
groupWatts => { oid => '.1.3.6.1.4.1.534.6.6.7.5.5.1.3' }, # in Watt groupWatts => { oid => '.1.3.6.1.4.1.534.6.6.7.5.5.1.3' }, # in Watt
@ -93,6 +94,7 @@ sub manage_selection {
$self->{group} = {}; $self->{group} = {};
my $snmp_result = $options{snmp}->get_multiple_table( my $snmp_result = $options{snmp}->get_multiple_table(
oids => [ oids => [
{ oid => $mapping->{groupName}->{oid} },
{ oid => $mapping->{groupVoltage}->{oid} }, { oid => $mapping->{groupVoltage}->{oid} },
{ oid => $mapping->{groupCurrent}->{oid} }, { oid => $mapping->{groupCurrent}->{oid} },
{ oid => $mapping->{groupWatts}->{oid} }, { oid => $mapping->{groupWatts}->{oid} },
@ -108,7 +110,9 @@ sub manage_selection {
my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance); my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance);
$result->{groupVoltage} *= 0.001 if (defined($result->{groupVoltage})); $result->{groupVoltage} *= 0.001 if (defined($result->{groupVoltage}));
$result->{groupCurrent} *= 0.001 if (defined($result->{groupCurrent})); $result->{groupCurrent} *= 0.001 if (defined($result->{groupCurrent}));
$self->{group}->{$instance} = { display => $instance, %$result }; my $display = $instance;
$display = $result->{groupName} if (defined($result->{groupName}) && $result->{groupName} ne '');
$self->{group}->{$display} = { display => $display, %$result };
} }
if (scalar(keys %{$self->{group}}) <= 0) { if (scalar(keys %{$self->{group}}) <= 0) {

6
hardware/pdu/eaton/snmp/mode/outlet.pm
View File

@ -82,6 +82,7 @@ sub prefix_outlet_output {
} }
my $mapping = { my $mapping = {
outletName => { oid => '.1.3.6.1.4.1.534.6.6.7.6.1.1.3' },
outletVoltage => { oid => '.1.3.6.1.4.1.534.6.6.7.6.3.1.2' }, # in mVolt outletVoltage => { oid => '.1.3.6.1.4.1.534.6.6.7.6.3.1.2' }, # in mVolt
outletCurrent => { oid => '.1.3.6.1.4.1.534.6.6.7.6.4.1.3' }, # in mA outletCurrent => { oid => '.1.3.6.1.4.1.534.6.6.7.6.4.1.3' }, # in mA
outletWatts => { oid => '.1.3.6.1.4.1.534.6.6.7.6.5.1.3' }, # in Watt outletWatts => { oid => '.1.3.6.1.4.1.534.6.6.7.6.5.1.3' }, # in Watt
@ -93,6 +94,7 @@ sub manage_selection {
$self->{outlet} = {}; $self->{outlet} = {};
my $snmp_result = $options{snmp}->get_multiple_table( my $snmp_result = $options{snmp}->get_multiple_table(
oids => [ oids => [
{ oid => $mapping->{outletName}->{oid} },
{ oid => $mapping->{outletVoltage}->{oid} }, { oid => $mapping->{outletVoltage}->{oid} },
{ oid => $mapping->{outletCurrent}->{oid} }, { oid => $mapping->{outletCurrent}->{oid} },
{ oid => $mapping->{outletWatts}->{oid} }, { oid => $mapping->{outletWatts}->{oid} },
@ -108,7 +110,9 @@ sub manage_selection {
my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance); my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance);
$result->{outletVoltage} *= 0.001 if (defined($result->{outletVoltage})); $result->{outletVoltage} *= 0.001 if (defined($result->{outletVoltage}));
$result->{outletCurrent} *= 0.001 if (defined($result->{outletCurrent})); $result->{outletCurrent} *= 0.001 if (defined($result->{outletCurrent}));
$self->{outlet}->{$instance} = { display => $instance, %$result }; my $display = $instance;
$display = $result->{outletName} if (defined($result->{outletName}) && $result->{outletName} ne '');
$self->{outlet}->{$display} = { display => $display, %$result };
} }
if (scalar(keys %{$self->{outlet}}) <= 0) { if (scalar(keys %{$self->{outlet}}) <= 0) {