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

enh(bind9/web): indent/typo (#2799)

This commit is contained in:
qgarnier 2021-05-17 09:07:05 +02:00 committed by GitHub
parent c1e15de68b
commit 1e5ca98a62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
apps/bind9/web/mode/serverusage.pm
View File

@ -26,10 +26,6 @@ use strict;
use warnings; use warnings;
use Digest::MD5 qw(md5_hex); use Digest::MD5 qw(md5_hex);
my $default_filter_counters = "opcode-query|opcode-iquery|opcode-status|opcode-notify|opcode-update";
$default_filter_counters .= "|qtype-a|qtype-aaaa|qtype-cname|qtype-mx|qtype-txt|qtype-soa|qtype-ptr";
$default_filter_counters .= "|nsstat-requestv4|nsstat-requestv6";
# From Bind 9.11.5 counter list # From Bind 9.11.5 counter list
# opcode = completed # opcode = completed
# rcode = not started # rcode = not started
@ -139,38 +135,34 @@ my @map = (
['zonestat-ixfrreqv4', 'zonestat IXFRReqv4 : %s', 'zonestat.ixfrreqv4.count'], ['zonestat-ixfrreqv4', 'zonestat IXFRReqv4 : %s', 'zonestat.ixfrreqv4.count'],
['zonestat-ixfrreqv6', 'zonestat IXFRReqv6 : %s', 'zonestat.ixfrreqv6.count'], ['zonestat-ixfrreqv6', 'zonestat IXFRReqv6 : %s', 'zonestat.ixfrreqv6.count'],
['zonestat-xfrsuccess', 'zonestat XfrSuccess : %s', 'zonestat.xfrsuccess.count'], ['zonestat-xfrsuccess', 'zonestat XfrSuccess : %s', 'zonestat.xfrsuccess.count'],
['zonestat-xfrfail', 'zonestat XfrFail : %s', 'zonestat.xfrfail.count'], ['zonestat-xfrfail', 'zonestat XfrFail : %s', 'zonestat.xfrfail.count']
); );
sub set_counters { sub set_counters {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->{maps_counters_type} = [ $self->{maps_counters_type} = [
{ name => 'server', type => 0, skipped_code => { -1 => 1, -10 => 1, 11 => -1 } } { name => 'server', type => 0, skipped_code => { -1 => 1, -10 => 1, 11 => -1 } }
]; ];
$self->{maps_counters}->{server} = []; $self->{maps_counters}->{server} = [];
for (my $i = 0; $i < scalar(@map); $i++) {
for (my $i = 0; $i < scalar(@map); $i++) { push @{$self->{maps_counters}->{server}}, {
my $perf_label = $map[$i]->[0]; label => $map[$i]->[0], nlabel => => $map[$i]->[2], display_ok => 0,
$perf_label =~ s/-/_/g; set => {
key_values => [ { name => $map[$i]->[0], diff => 1 } ],
push @{$self->{maps_counters}->{server}}, { output_template => $map[$i]->[1],
label => $map[$i]->[0], nlabel => => $map[$i]->[2], display_ok => 0, perfdatas => [
set => { { template => '%s', min => 0 }
key_values => [ { name => $perf_label, diff => 1 } ], ]
output_template => $map[$i]->[1], }
perfdatas => [ };
{ label => $perf_label, value => $perf_label , template => '%s', min => 0 }, }
],
}
};
}
} }
sub new { sub new {
my ($class, %options) = @_; my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1); my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1, statefile => 1);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
@ -180,12 +172,14 @@ sub new {
} }
sub check_options { sub check_options {
my ($self, %options) = @_; my ($self, %options) = @_;
$self->SUPER::check_options(%options); $self->SUPER::check_options(%options);
if ( ! defined($self->{option_results}->{filter_counters}) ) { if (!defined($self->{option_results}->{filter_counters})) {
$self->{option_results}->{filter_counters} = $default_filter_counters; $self->{option_results}->{filter_counters} = 'opcode-query|opcode-iquery|opcode-status|opcode-notify|opcode-update|' .
} 'qtype-a|qtype-aaaa|qtype-cname|qtype-mx|qtype-txt|qtype-soa|qtype-ptr|' .
'nsstat-requestv4|nsstat-requestv6';
}
} }
sub manage_selection { sub manage_selection {
@ -195,21 +189,21 @@ sub manage_selection {
# Init for all vars, some are not present in response if no request on the server # Init for all vars, some are not present in response if no request on the server
for (my $i = 0; $i < scalar(@map); $i++) { for (my $i = 0; $i < scalar(@map); $i++) {
my $perf_label = $map[$i]->[0]; $self->{server}->{ $map[$i]->[0] } = 0;
$perf_label =~ s/-/_/g;
$self->{server}->{$perf_label} = 0;
} }
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(
short_msg => 'All Bind 9 counters are ok'); severity => 'OK',
short_msg => 'All Bind 9 counters are ok'
);
foreach my $type (keys %{$result->{counters}}) { foreach my $type (keys %{$result->{counters}}) {
foreach my $counter (keys %{$result->{counters}->{$type}}) { foreach my $counter (keys %{$result->{counters}->{$type}}) {
$self->{server}->{lc($type) . '_' . lc($counter)} = $result->{counters}->{$type}->{$counter}; $self->{server}->{lc($type) . '-' . lc($counter)} = $result->{counters}->{$type}->{$counter};
} }
} }
$self->{cache_name} = "bind9_" . $self->{mode} . '_' . $options{custom}->get_uniq_id() . '_' . $self->{cache_name} = 'bind9_' . $self->{mode} . '_' . $options{custom}->get_uniq_id() . '_' .
(defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all')); (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all'));
} }

12
apps/bind9/web/plugin.pm
View File

@ -30,13 +30,13 @@ sub new {
bless $self, $class; bless $self, $class;
$self->{version} = '1.1'; $self->{version} = '1.1';
%{$self->{modes}} = ( $self->{modes} = {
'memory-usage' => 'apps::bind9::web::mode::memoryusage', 'memory-usage' => 'apps::bind9::web::mode::memoryusage',
'server-usage' => 'apps::bind9::web::mode::serverusage', 'server-usage' => 'apps::bind9::web::mode::serverusage',
'zone-usage' => 'apps::bind9::web::mode::zoneusage', 'zone-usage' => 'apps::bind9::web::mode::zoneusage'
); };
$self->{custom_modes}{api} = 'apps::bind9::web::custom::api'; $self->{custom_modes}->{api} = 'apps::bind9::web::custom::api';
return $self; return $self;
} }