Merge pull request #228 from yaacov/recatch-no-metrics

recatch the metrics not found error (cherry picked from commit 9769743) https://bugzilla.redhat.com/show_bug.cgi?id=1552314
ManageIQ · Mar 6, 2018 · cdc323e · cdc323e
1 parent 73a8d77
commit cdc323e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/kubernetes/container_manager/metrics_capture.rb b/app/models/manageiq/providers/kubernetes/container_manager/metrics_capture.rb
@@ -97,9 +97,9 @@ def perf_collect_metrics(interval_name, start_time = nil, end_time = nil)
         begin
           context.collect_metrics
         rescue NoMetricsFoundError => e
-          _log.debug("Metrics unavailable: #{e.message}")
+          _log.warn("Metrics missing: [#{target_name}] #{e.message}")
         rescue StandardError => e
-          _log.error("Metrics unavailable: #{e.message}")
+          _log.error("Metrics unavailable: [#{target_name}] #{e.message}")
           ems.update_attributes(:last_metrics_error       => :unavailable,
                                 :last_metrics_update_date => Time.now.utc) if ems
           raise

diff --git a/...nageiq/providers/kubernetes/container_manager/metrics_capture/hawkular_capture_context.rb b/...nageiq/providers/kubernetes/container_manager/metrics_capture/hawkular_capture_context.rb
@@ -213,7 +213,7 @@ def insert_metrics(raw_metrics, type)
         #    "cpu/usage_rate" => "machine/<utl>/cpu/usage_rate"
         full_key = get_metrics_key(raw_metrics, 'gauge', key)
         unless full_key
-          raise CollectionFailure, "#{key} missing while query metrics"
+          raise NoMetricsFoundError, "#{key} missing while query metrics"
         end
 
         # insert the raw metrics into the @ts_values global object

diff --git a/...geiq/providers/kubernetes/container_manager/metrics_capture/prometheus_capture_context.rb b/...geiq/providers/kubernetes/container_manager/metrics_capture/prometheus_capture_context.rb
@@ -93,6 +93,8 @@ def fetch_counters_data(resource, metric_title, conversion_factor = 1)
         metric_title,
         conversion_factor
       )
+    rescue NoMetricsFoundError
+      raise
     rescue StandardError => e
       raise CollectionFailure, "#{e.class.name}: #{e.message}"
     end