Remove error message when no metrics are collected from gcp (elastic#…

…16916) (elastic#16924) (cherry picked from commit b3d86d5)
andrewkroh · Mar 10, 2020 · 5f51e67 · 5f51e67
1 parent 7dc1bff
commit 5f51e67
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/metrics_requester.go b/x-pack/metricbeat/module/googlecloud/stackdriver/metrics_requester.go
@@ -109,11 +109,6 @@ func (r *stackdriverMetricsRequester) Metrics(ctx context.Context, ms []string)
 	}
 
 	wg.Wait()
-
-	if len(results) == 0 {
-		return nil, errors.New("service returned 0 metrics")
-	}
-
 	return results, nil
 }
 

diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go b/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go
@@ -84,7 +84,6 @@ func (m *MetricSet) Fetch(ctx context.Context, reporter mb.ReporterV2) (err erro
 
 	responses, err := reqs.Metrics(ctx, m.config.Metrics)
 	if err != nil {
-
 		return errors.Wrapf(err, "error trying to get metrics for project '%s' and zone '%s' or region '%s'", m.config.ProjectID, m.config.Zone, m.config.Region)
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	responses, err := reqs.Metrics(ctx, m.config.Metrics)
     	if err != nil {
     		return errors.Wrapf(err, "error trying to get metrics for project '%s' and zone '%s' or region '%s'", m.config.ProjectID, m.config.Zone, m.config.Region)
     	}
@@ Expand Down @@