Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(azure-elasticpool): the thresholds weren't applied correctly in storage mode #5294

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 51 additions & 26 deletions src/cloud/azure/database/elasticpool/mode/storage.pm
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ sub custom_metric_calc {
my ($self, %options) = @_;

$self->{result_values}->{timeframe} = $options{new_datas}->{$self->{instance} . '_timeframe'};
$self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{metric}};
$self->{result_values}->{metric} = $options{extra_options}->{metric};
$self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_' . $options{extra_options}->{metric}};
$self->{result_values}->{metric} = $options{extra_options}->{metric};

return 0;
}

Expand All @@ -67,8 +68,8 @@ sub custom_metric_threshold {
my $exit = $self->{perfdata}->threshold_check(
value => $self->{result_values}->{value},
threshold => [
{ label => 'critical-' . $metrics_mapping{$self->{result_values}->{metric}}->{label} , exit_litteral => 'critical' },
{ label => 'warning-' . $metrics_mapping{$self->{result_values}->{metric}}->{label}, exit_litteral => 'warning' }
{ label => 'critical-' . $self->{thlabel}, exit_litteral => 'critical' },
{ label => 'warning-' . $self->{thlabel}, exit_litteral => 'warning' }
]
);
return $exit;
Expand All @@ -82,8 +83,8 @@ sub custom_metric_perfdata {
nlabel => $metrics_mapping{$self->{result_values}->{metric}}->{nlabel},
unit => $metrics_mapping{$self->{result_values}->{metric}}->{unit},
value => sprintf('%.2f', $self->{result_values}->{value}),
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $metrics_mapping{$self->{result_values}->{metric}}->{label}),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $metrics_mapping{$self->{result_values}->{metric}}->{label})
warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{thlabel}),
critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{thlabel})
);
}

Expand Down Expand Up @@ -112,7 +113,7 @@ sub prefix_statistics_output {
sub long_output {
my ($self, %options) = @_;

return "Checking Pool'" . $options{instance_value}->{display} . "' ";
return "Checking Pool '" . $options{instance_value}->{display} . "' ";
}

sub set_counters {
Expand All @@ -128,7 +129,7 @@ sub set_counters {
}
];

foreach my $metric (keys %metrics_mapping) {
foreach my $metric (sort keys %metrics_mapping) {
my $entry = {
label => $metrics_mapping{$metric}->{label},
nlabel => $metrics_mapping{$metric}->{nlabel},
Expand Down Expand Up @@ -186,8 +187,8 @@ sub check_options {
}

foreach my $metric (keys %metrics_mapping) {
next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
&& $metric !~ /$self->{option_results}->{filter_metric}/);
next if ( !centreon::plugins::misc::is_empty($self->{option_results}->{filter_metric})
&& $metric !~ /$self->{option_results}->{filter_metric}/ );

push @{$self->{az_metrics}}, $metric;
}
Expand Down Expand Up @@ -254,48 +255,72 @@ __END__

=head1 MODE

Check Azure SQL Elastic Pool Storage metrics.
Monitor Azure SQL Elastic Pool Storage metrics.

Example:

Using resource name:

perl centreon_plugins.pl --plugin=cloud::azure::database::elasticpool::plugin --custommode=azcli --mode=storage
--resource=<sqlserver>/elasticpools/<elasticpool> --resource-group=<resourcegroup> --aggregation='average'
--allocated-data-storage-percent='90' --verbose
perl centreon_plugins.pl --plugin=cloud::azure::database::elasticpool::plugin --custommode=azcli --mode=storage
--resource=<sqlserver>/elasticpools/<elasticpool> --resource-group=<resourcegroup> --aggregation='average'
--allocated-data-storage-percent='90' --verbose

Using resource ID:

perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=sessions
--resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Sql/servers/xxx/elasticpools/xxx'
--aggregation='average' --allocated-data-storage-percent='90' --verbose
perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=sessions
--resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Sql/servers/xxx/elasticpools/xxx'
--aggregation='average' --allocated-data-storage-percent='90' --verbose

Default aggregation: 'average' / 'minimum' and 'maximum' are valid.
Available aggregations: 'average' (default) 'minimum' and 'maximum'.

=over 8

=item B<--resource>

Set resource name or ID (required).
Define the resource name or ID (required).

=item B<--resource-group>

Set resource group (required if resource's name is used).
Define the resource group to monitor (required if the resource name is used).

=item B<--filter-metric>

Filter on specific metrics. The Azure format must be used, for example: 'allocated_data_storage_percent'
(can be a regexp).

=item B<--warning-*>
=item B<--warning-allocated-data-storage>

Thresholds.

=item B<--critical-allocated-data-storage>

Thresholds.

=item B<--warning-allocated-data-storage-percent>

Thresholds.

=item B<--critical-allocated-data-storage-percent>

Thresholds.


=item B<--warning-storage-percent>

Thresholds.

=item B<--critical-storage-percent>

Thresholds.

=item B<--warning-storage-used>

Thresholds.

Warning threshold where * can be: 'allocated-data-storage', allocated-data-storage-percent',
'storage-percent', 'storage-used'.
=item B<--critical-storage-used>

=item B<--critical-*>
Thresholds.

Critical threshold where * can be: 'allocated-data-storage', allocated-data-storage-percent',
'storage-percent', 'storage-used'.

=back

Expand Down
Loading
Loading