indent enhance

This commit is contained in:
garnier-quentin 2020-02-04 18:00:00 +01:00
parent 09d51ae29a
commit e991b4cfde
5 changed files with 48 additions and 46 deletions

View File

@ -73,16 +73,14 @@ sub new {
my ($class, %options) = @_; my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{ 'instance:s' => { name => 'instance', default => 'layer' },
"instance:s" => { name => 'instance', default => 'layer' }, 'top:s' => { name => 'top' },
"top:s" => { name => 'top' }, 'filter:s' => { name => 'filter' },
"filter:s" => { name => 'filter' }, 'from:s' => { name => 'from', default => 'http' },
"from:s" => { name => 'from', default => 'http' }, });
"filter-counters:s" => { name => 'filter_counters' },
});
return $self; return $self;
} }

View File

@ -83,15 +83,13 @@ sub new {
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{ 'instance:s' => { name => 'instance', default => 'layer' },
"instance:s" => { name => 'instance', default => 'layer' }, 'top:s' => { name => 'top' },
"top:s" => { name => 'top' }, 'filter:s' => { name => 'filter' },
"filter:s" => { name => 'filter' }, 'from:s' => { name => 'from' },
"from:s" => { name => 'from' }, });
"filter-counters:s" => { name => 'filter_counters' },
});
return $self; return $self;
} }

View File

@ -65,6 +65,7 @@ sub set_counters {
} }
}, },
]; ];
$self->{maps_counters}->{instances} = [ $self->{maps_counters}->{instances} = [
{ label => 'traffic', set => { { label => 'traffic', set => {
key_values => [ { name => 'traffic' }, { name => 'key' }, { name => 'instance_label' } ], key_values => [ { name => 'traffic' }, { name => 'key' }, { name => 'instance_label' } ],
@ -116,16 +117,14 @@ sub new {
my ($class, %options) = @_; my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{ 'instance:s' => { name => 'instance', default => 'layer' },
"instance:s" => { name => 'instance', default => 'layer' }, 'top:s' => { name => 'top' },
"top:s" => { name => 'top' }, 'filter:s' => { name => 'filter' },
"filter:s" => { name => 'filter' }, 'from:s' => { name => 'from' },
"from:s" => { name => 'from' }, });
"filter-counters:s" => { name => 'filter_counters' },
});
return $self; return $self;
} }

View File

@ -55,15 +55,14 @@ sub new {
my ($class, %options) = @_; my ($class, %options) = @_;
my $self = $class->SUPER::new(package => __PACKAGE__, %options); my $self = $class->SUPER::new(package => __PACKAGE__, %options);
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => $options{options}->add_options(arguments => {
{ 'instance:s' => { name => 'instance', default => 'layer' },
"instance:s" => { name => 'instance', default => 'layer' }, 'top:s' => { name => 'top' },
"top:s" => { name => 'top' }, 'filter:s' => { name => 'filter' },
"filter:s" => { name => 'filter' }, 'from:s' => { name => 'from' },
"from:s" => { name => 'from' }, });
});
return $self; return $self;
} }

View File

@ -32,7 +32,7 @@ my $oid_powerSupplyTableEntry = '.1.3.6.1.4.1.674.10892.5.4.600.12.1';
sub load { sub load {
my ($self) = @_; my ($self) = @_;
push @{$self->{request}}, { oid => $oid_powerSupplyTableEntry }; push @{$self->{request}}, { oid => $oid_powerSupplyTableEntry };
} }
@ -51,17 +51,25 @@ sub check {
next if ($self->check_filter(section => 'psu', instance => $instance)); next if ($self->check_filter(section => 'psu', instance => $instance));
$self->{components}->{psu}->{total}++; $self->{components}->{psu}->{total}++;
$self->{output}->output_add(long_msg => sprintf("power supply '%s' status is '%s' [instance = %s]", $self->{output}->output_add(
$result->{powerSupplyLocationName}, $result->{powerSupplyStatus}, $instance, long_msg => sprintf(
)); "power supply '%s' status is '%s' [instance = %s]",
$result->{powerSupplyLocationName}, $result->{powerSupplyStatus}, $instance,
)
);
my $exit = $self->get_severity(label => 'default.status', section => 'psu.status', value => $result->{powerSupplyStatus}); my $exit = $self->get_severity(label => 'default.status', section => 'psu.status', value => $result->{powerSupplyStatus});
if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) {
$self->{output}->output_add(severity => $exit, $self->{output}->output_add(
short_msg => sprintf("Power supply '%s' status is '%s'", $result->{powerSupplyLocationName}, $result->{powerSupplyStatus})); severity => $exit,
short_msg => sprintf(
"Power supply '%s' status is '%s'",
$result->{powerSupplyLocationName},
$result->{powerSupplyStatus}
)
);
} }
} }
} }
1; 1;