small indent fix

This commit is contained in:
garnier-quentin 2020-04-10 14:56:38 +02:00
parent f158cb0e18
commit 1868c35d8b
2 changed files with 15 additions and 14 deletions

View File

@ -56,8 +56,10 @@ sub run {
$_->{id}, $_->{name}, $_->{state} )); $_->{id}, $_->{name}, $_->{state} ));
} }
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(
short_msg => 'List VPN connections:'); severity => 'OK',
short_msg => 'List VPN connections:'
);
$self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1); $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1, force_long_output => 1);
$self->{output}->exit(); $self->{output}->exit();
} }

View File

@ -29,8 +29,7 @@ my %metrics_mapping = (
'TunnelState' => { 'TunnelState' => {
'output' => 'Tunnel State', 'output' => 'Tunnel State',
'label' => 'tunnel-state', 'label' => 'tunnel-state',
'nlabel' => { 'nlabel' => { 'absolute' => 'vpn.tunnel.tunnelstate' },
'absolute' => 'vpn.tunnel.tunnelstate'},
'unit' => '' 'unit' => ''
}, },
'TunnelDataIn' => { 'TunnelDataIn' => {
@ -38,7 +37,7 @@ my %metrics_mapping = (
'label' => 'tunnel-datain', 'label' => 'tunnel-datain',
'nlabel' => { 'nlabel' => {
'absolute' => 'vpn.tunnel.datain.bytes', 'absolute' => 'vpn.tunnel.datain.bytes',
'per_second' => 'vpn.tunnel.datain.bytespersecond', 'per_second' => 'vpn.tunnel.datain.bytespersecond'
}, },
'unit' => 'B' 'unit' => 'B'
}, },
@ -47,7 +46,7 @@ my %metrics_mapping = (
'label' => 'tunnel-dataout', 'label' => 'tunnel-dataout',
'nlabel' => { 'nlabel' => {
'absolute' => 'vpn.tunnel.dataout.bytes', 'absolute' => 'vpn.tunnel.dataout.bytes',
'per_second' => 'vpn.tunnel.dataout.bytespersecond', 'per_second' => 'vpn.tunnel.dataout.bytespersecond'
}, },
'unit' => 'B' 'unit' => 'B'
} }
@ -79,8 +78,10 @@ sub custom_metric_threshold {
my $exit = $self->{perfdata}->threshold_check( my $exit = $self->{perfdata}->threshold_check(
value => defined($self->{instance_mode}->{option_results}->{per_sec}) ? $self->{result_values}->{value_per_sec} : $self->{result_values}->{value}, value => defined($self->{instance_mode}->{option_results}->{per_sec}) ? $self->{result_values}->{value_per_sec} : $self->{result_values}->{value},
threshold => [ { label => 'critical-' . $metrics_mapping{$self->{result_values}->{metric}}->{label} , exit_litteral => 'critical' }, threshold => [
{ label => 'warning-' . $metrics_mapping{$self->{result_values}->{metric}}->{label}, exit_litteral => 'warning' } ] { label => 'critical-' . $metrics_mapping{$self->{result_values}->{metric}}->{label} , exit_litteral => 'critical' },
{ label => 'warning-' . $metrics_mapping{$self->{result_values}->{metric}}->{label}, exit_litteral => 'warning' }
]
); );
return $exit; return $exit;
} }
@ -139,11 +140,9 @@ sub custom_metric_output {
sub custom_metric_output_state { sub custom_metric_output_state {
my ($self, %options) = @_; my ($self, %options) = @_;
my $msg = "";
my $value = $self->{result_values}->{value}; my $value = $self->{result_values}->{value};
$msg = sprintf("%s: %.2f", $metrics_mapping{$self->{result_values}->{metric}}->{output}, $value); return sprintf("%s: %.2f", $metrics_mapping{$self->{result_values}->{metric}}->{output}, $value);
return $msg;
} }
sub prefix_metric_output { sub prefix_metric_output {
@ -199,9 +198,9 @@ sub new {
bless $self, $class; bless $self, $class;
$options{options}->add_options(arguments => { $options{options}->add_options(arguments => {
'vpnid:s@' => { name => 'vpn_id' }, 'vpnid:s@' => { name => 'vpn_id' },
'per-sec' => { name => 'per_sec' }, 'per-sec' => { name => 'per_sec' },
'filter-metric:s' => { name => 'filter_metric' } 'filter-metric:s' => { name => 'filter_metric' }
}); });
return $self; return $self;