CTOR 2085 - Plugin(cloud::google::gcp::management::stackdriver) - Mode(getmetrics): fix unit path

.gitleaksignore

@@ -1 +1 @@
-tests/cloud/gcp/gcp_config.json:private-key:5
+tests/cloud/google/gcp/gcp_config.json:private-key:5

packaging/centreon-plugin-Cloud-Gcp-Management-Stackdriver-Api/deb.json

@@ -1,5 +1,6 @@
 {
     "dependencies": [
+        "libjson-perl",
         "libdatetime-perl",
         "libjson-webtoken-perl",
         "libcrypt-openssl-rsa-perl"

src/cloud/google/gcp/custom/api.pm

@@ -315,9 +315,11 @@ sub gcp_get_metrics {
         get_param => $get_param
     );
 
+
     my %aggregations = map { $_ => 1 } @{$options{aggregations}};
     my $instance_key = [split /\./, $options{instance_key}];
     my $results = {};
+    my $value;
     foreach my $timeserie (@{$response->{timeSeries}}) {
         my $instance = $self->get_instance(
             timeserie => $timeserie,
@@ -332,49 +334,62 @@ sub gcp_get_metrics {
             $results->{$instance} = {};
         }
 
-        my $metric_calc = { points => 0 };
-        my $value;
+        if (!defined($results->{$instance}->{$metric_name})) {
+            $results->{$instance}->{$metric_name} = { points => 0, unit => $response->{unit} // '' };
+        }
+
         foreach my $point (@{$timeserie->{points}}) {
             if (defined($point->{value})) {
                 if (lc($timeserie->{valueType}) eq 'distribution') {
-                    $value = $point->{value}->{ lc($timeserie->{valueType}) . 'Value' }->{ $options{distribution_value} };
+                    if (defined($point->{value}->{ lc($timeserie->{valueType}) . 'Value' }->{ $options{distribution_value} })) {
+                        $value = $point->{value}->{ lc($timeserie->{valueType}) . 'Value' }->{ $options{distribution_value} };
+                    } else {
+                        next;
+                    }
                 } else {
                     $value = $point->{value}->{ lc($timeserie->{valueType}) . 'Value' };
                 }
                 if (defined($aggregations{average})) {
-                    $metric_calc->{average} = 0 if (!defined($metric_calc->{average}));
-                    $metric_calc->{average} += $value;
-                    $metric_calc->{points}++;
+                    $results->{$instance}->{$metric_name}->{average} = 0 if (!defined($results->{$instance}->{$metric_name}->{average}));
+                    $results->{$instance}->{$metric_name}->{average} += $value;
+                    $results->{$instance}->{$metric_name}->{points}++;
                 }
                 if (defined($aggregations{minimum})) {
-                    $metric_calc->{minimum} = $value
-                        if (!defined($metric_calc->{minimum}) || $value < $metric_calc->{minimum});
+                    $results->{$instance}->{$metric_name}->{minimum} = $value
+                        if (!defined($results->{$instance}->{$metric_name}->{minimum}) || $value < $results->{$instance}->{$metric_name}->{minimum});
                 }
                 if (defined($aggregations{maximum})) {
-                    $metric_calc->{maximum} = $value
-                        if (!defined($metric_calc->{maximum}) || $value > $metric_calc->{maximum});
+                    $results->{$instance}->{$metric_name}->{maximum} = $value
+                        if (!defined($results->{$instance}->{$metric_name}->{maximum}) || $value > $results->{$instance}->{$metric_name}->{maximum});
                 }
                 if (defined($aggregations{total})) {
-                    $metric_calc->{total} = 0 if (!defined($metric_calc->{total}));
-                    $metric_calc->{total} += $value;
-                    $metric_calc->{points}++;
+                    $results->{$instance}->{$metric_name}->{total} = 0 if (!defined($results->{$instance}->{$metric_name}->{total}));
+                    $results->{$instance}->{$metric_name}->{total} += $value;
+                    $results->{$instance}->{$metric_name}->{points}++;
                 }
             }
         }
 
-        if (defined($metric_calc->{average})) {
-            $metric_calc->{average} /= $metric_calc->{points};
-        }
-        $metric_calc->{unit} = $timeserie->{unit} // undef;
-        $results->{$instance}->{$metric_name} = $metric_calc;
         $results->{$instance}->{resource} = $timeserie->{resource};
         $results->{$instance}->{labels} = $timeserie->{metric}->{labels};
     }
 
+    my $undefined_metrics = 0; # GCP can return data without any metric values. In this case $results->{ $options{dimension_value} is defined and --zeroed is useless.
+    foreach my $instance_name (keys %$results) {
+        foreach my $label (keys %{$results->{$instance_name}}) {
+            foreach my $aggregation (@{$options{aggregations}}) {
+                $undefined_metrics = defined($results->{$instance_name}->{$label}->{$aggregation}) ? 1 : $undefined_metrics;
+                if ($aggregation eq 'average' && defined($results->{$instance_name}->{$label}->{average})) {
+                    $results->{$instance_name}->{$label}->{average} = $results->{$instance_name}->{$label}->{average} / $results->{$instance_name}->{$label}->{points};
+                }
+            }
+        }
+    }
+
     if (defined($self->{option_results}->{zeroed}) && (!defined($options{dimension_operator}) || $options{dimension_operator} eq '' || $options{dimension_operator} eq 'equals')) {
-        if ($options{dimension_name} eq $options{dimension_zeroed} && !defined($results->{ $options{dimension_value} })) { 
+        if ($options{dimension_name} eq $options{dimension_zeroed} && (!defined($results->{ $options{dimension_value} }) || $undefined_metrics == 0)) { 
             $results->{ $options{dimension_value} } = {
-                $options{metric} => { average => 0, minimum => 0, maximum => 0, total => 0 }
+                $options{metric} => { average => 0, minimum => 0, maximum => 0, total => 0, unit => '' }
             };
         }
     }

src/cloud/google/gcp/management/stackdriver/mode/getmetrics.pm

@@ -131,6 +131,7 @@ sub check_options {
     $self->{gcp_api} = $self->{option_results}->{api};
     $self->{gcp_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 600;
     $self->{distribution_value} = $self->{option_results}->{distribution_value};
+    $self->{gcp_dimension_zeroed} = $self->{option_results}->{dimension_name};
 
     if (defined($self->{option_results}->{extra_filter})) {
         $self->{gcp_extra_filters} = [];
@@ -168,7 +169,8 @@ sub manage_selection {
         extra_filters => $self->{gcp_extra_filters},
         aggregations => $self->{gcp_aggregations},
         timeframe => $self->{gcp_timeframe},
-        distribution_value => $self->{distribution_value}
+        distribution_value => $self->{distribution_value},
+        dimension_zeroed => $self->{gcp_dimension_zeroed}
     );
 
     $self->{metrics} = {};
@@ -187,6 +189,11 @@ sub manage_selection {
             }
         }
     }
+
+    if (scalar(keys %{$self->{metrics}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => "No metrics. Check your options or check GCP API distribution metrics' time series points returns the mean or count values.");
+        $self->{output}->option_exit();
+    }
 }
 
 1;

tests/cloud/gcp/management/stackdriver/getmetrics.robot → tests/cloud/google/gcp/management/stackdriver/getmetrics.robot

@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation       GCP Management StackDriver plugin
 
-Resource            ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource
+Resource            ${CURDIR}${/}..${/}..${/}..${/}..${/}..${/}resources/import.resource
 
 Suite Setup         Start Mockoon    ${MOCKOON_JSON}
 Suite Teardown      Stop Mockoon