From 9944f38314f4e86eb67f3da24e38391ad5932faa Mon Sep 17 00:00:00 2001 From: Colin Gagnaire Date: Mon, 5 Aug 2019 11:06:53 +0200 Subject: [PATCH] allow multiple metrics in azure getmetrics, fix interval option --- cloud/azure/custom/api.pm | 10 ++-- .../management/monitor/mode/getmetrics.pm | 49 ++++++++++--------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/cloud/azure/custom/api.pm b/cloud/azure/custom/api.pm index c1d0da9bb..77bfcbe50 100644 --- a/cloud/azure/custom/api.pm +++ b/cloud/azure/custom/api.pm @@ -95,7 +95,7 @@ sub check_options { if (defined($self->{option_results}->{aggregation})) { foreach my $aggregation (@{$self->{option_results}->{aggregation}}) { - if ($aggregation !~ /average|maximum|minimum|total/i) { + if ($aggregation !~ /average|maximum|minimum|total|count/i) { $self->{output}->add_option_msg(short_msg => "Aggregation '" . $aggregation . "' is not handled"); $self->{output}->option_exit(); } @@ -280,9 +280,11 @@ sub azure_get_metrics_set_url { my $encoded_aggregations = $uri->encode(join(',', @{$options{aggregations}})); my $encoded_timespan = $uri->encode($options{start_time} . '/' . $options{end_time}); - my $url = $self->{management_endpoint} . "/subscriptions/" . $self->{subscription} . "/resourceGroups/" . $options{resource_group} . - "/providers/" . $options{resource_namespace} . "/" . $options{resource_type} . "/" . $options{resource} . '/providers/microsoft.insights/metrics' . - "?api-version=" . $self->{api_version} . "&metricnames=" . $encoded_metrics . "&aggregation=" . $encoded_aggregations . "×pan=" . $encoded_timespan; + my $url = $self->{management_endpoint} . "/subscriptions/" . $self->{subscription} . "/resourceGroups/" . + $options{resource_group} . "/providers/" . $options{resource_namespace} . "/" . $options{resource_type} . + "/" . $options{resource} . "/providers/microsoft.insights/metrics?api-version=" . $self->{api_version} . + "&metricnames=" . $encoded_metrics . "&aggregation=" . $encoded_aggregations . + "×pan=" . $encoded_timespan . "&interval=" . $options{interval}; return $url; } diff --git a/cloud/azure/management/monitor/mode/getmetrics.pm b/cloud/azure/management/monitor/mode/getmetrics.pm index 49228b90a..0aa51ad2b 100644 --- a/cloud/azure/management/monitor/mode/getmetrics.pm +++ b/cloud/azure/management/monitor/mode/getmetrics.pm @@ -29,27 +29,30 @@ use Data::Dumper; sub custom_metric_perfdata { my ($self, %options) = @_; - $self->{output}->perfdata_add(label => $self->{result_values}->{perf_label}, - value => $self->{result_values}->{value}, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-metric'), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-metric'), - ); + $self->{output}->perfdata_add( + label => $self->{result_values}->{perf_label}, + value => $self->{result_values}->{value}, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-metric'), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-metric'), + ); } sub custom_metric_threshold { my ($self, %options) = @_; - my $exit = $self->{perfdata}->threshold_check(value => $self->{result_values}->{value}, - threshold => [ { label => 'critical-metric', exit_litteral => 'critical' }, - { label => 'warning-metric', exit_litteral => 'warning' } ]); + my $exit = $self->{perfdata}->threshold_check( + value => $self->{result_values}->{value}, + threshold => [ { label => 'critical-metric', exit_litteral => 'critical' }, + { label => 'warning-metric', exit_litteral => 'warning' } ]); return $exit; } sub custom_metric_output { my ($self, %options) = @_; - my $msg = "Metric '" . $self->{result_values}->{label} . "' of resource '" . $self->{result_values}->{display} . "' value is " . $self->{result_values}->{value}; + my $msg = "Metric '" . $self->{result_values}->{name} . "' of resource '" . $self->{result_values}->{display} . + "' and aggregation '" . $self->{result_values}->{aggregation} . "' value is " . $self->{result_values}->{value}; return $msg; } @@ -57,6 +60,7 @@ sub custom_metric_calc { my ($self, %options) = @_; $self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_value'}; + $self->{result_values}->{name} = $options{new_datas}->{$self->{instance} . '_name'}; $self->{result_values}->{label} = $options{new_datas}->{$self->{instance} . '_label'}; $self->{result_values}->{aggregation} = $options{new_datas}->{$self->{instance} . '_aggregation'}; $self->{result_values}->{perf_label} = $options{new_datas}->{$self->{instance} . '_perf_label'}; @@ -68,12 +72,12 @@ sub set_counters { my ($self, %options) = @_; $self->{maps_counters_type} = [ - { name => 'metrics', type => 0 }, + { name => 'metrics', type => 1, message_multiple => 'All metrics are ok' }, ]; $self->{maps_counters}->{metrics} = [ { label => 'metric', set => { - key_values => [ { name => 'value' }, { name => 'label' }, { name => 'aggregation' }, + key_values => [ { name => 'value' }, { name => 'name' }, { name => 'label' }, { name => 'aggregation' }, { name => 'perf_label' }, { name => 'display' } ], closure_custom_calc => $self->can('custom_metric_calc'), closure_custom_output => $self->can('custom_metric_output'), @@ -89,14 +93,13 @@ sub new { my $self = $class->SUPER::new(package => __PACKAGE__, %options); bless $self, $class; - $options{options}->add_options(arguments => - { - "resource:s" => { name => 'resource' }, - "resource-group:s" => { name => 'resource_group' }, - "resource-type:s" => { name => 'resource_type' }, - "resource-namespace:s" => { name => 'resource_namespace' }, - "metric:s@" => { name => 'metric' }, - }); + $options{options}->add_options(arguments => { + "resource:s" => { name => 'resource' }, + "resource-group:s" => { name => 'resource_group' }, + "resource-type:s" => { name => 'resource_type' }, + "resource-namespace:s" => { name => 'resource_namespace' }, + "metric:s@" => { name => 'metric' }, + }); return $self; } @@ -106,7 +109,7 @@ sub check_options { $self->SUPER::check_options(%options); if (!defined($self->{option_results}->{resource})) { - $self->{output}->add_option_msg(short_msg => "Need to specify either --resource with --resource-group and --resource-type options or --resource ."); + $self->{output}->add_option_msg(short_msg => "Need to specify either --resource with --resource-group, --resource-type and --resource-namespace options or --resource ."); $self->{output}->option_exit(); } @@ -164,8 +167,9 @@ sub manage_selection { foreach my $aggregation (('minimum', 'maximum', 'average', 'total')) { next if (!defined($results->{$label}->{$aggregation})); - $self->{metrics} = { + $self->{metrics}->{$label . '_' . $aggregation} = { display => $self->{az_resource}, + name => $results->{$label}->{name}, label => $label, aggregation => $aggregation, value => $results->{$label}->{$aggregation}, @@ -173,6 +177,7 @@ sub manage_selection { }; } } + print Dumper $self->{metrics}; $self->{output}->output_add(long_msg => sprintf("Raw data:\n%s", Dumper($raw_results)), debug => 1); } @@ -214,7 +219,7 @@ Set resource type (Required if resource's name is used). =item B<--metric> -Set monitor metrics (Required). +Set monitor metrics (Required) (Can be multiple). =item B<--warning-metric>