Merge pull request #5256 from PanSpagetka/add-amazon-memory-chart

Add Memory for Amazon Availability Zones

app/controllers/application_controller/performance.rb

@@ -852,7 +852,6 @@ def perf_gen_tag_data_after_wait
                   end
 
     chart_layout = perf_get_chart_layout(layout_name, @perf_options[:model])
-    perf_filter_charts(chart_layout, rpt)
 
     if @perf_options[:index]
       chart_index = @perf_options[:index].to_i
@@ -1273,7 +1272,6 @@ def perf_gen_charts(rpt, perf_options, parent = false)
     case perf_options[:typ]
     when "Hourly"
       chart_layout = perf_get_chart_layout("hourly_perf_charts", model_title)
-      perf_filter_charts(chart_layout, rpt)
       if perf_options[:index]
         chart = chart_layout[perf_options[:index].to_i]
         perf_remove_chart_cols(chart)
@@ -1303,7 +1301,6 @@ def perf_gen_charts(rpt, perf_options, parent = false)
       end
     when "realtime"
       chart_layout = perf_get_chart_layout("realtime_perf_charts", model_title)
-      perf_filter_charts(chart_layout, rpt)
       if perf_options[:index]
         chart = chart_layout[perf_options[:index].to_i]
         perf_remove_chart_cols(chart)
@@ -1332,7 +1329,6 @@ def perf_gen_charts(rpt, perf_options, parent = false)
       end
     when "Daily"
       chart_layout = perf_get_chart_layout("daily_perf_charts", model_title)
-      perf_filter_charts(chart_layout, rpt)
       if perf_options[:index]
         chart = chart_layout[perf_options[:index].to_i]
         if chart
@@ -1548,21 +1544,6 @@ def perf_remove_report_cols(report, charts = nil)
     new_rpt
   end
 
-  # Deletes memory chart from chart_layout, if it is a chart for Amazon Availability Zone
-  # rpt.where_clause[0] should be query string
-  # rpt.where_clause[1] should be model name string
-  # rpt.where_clause[2] should be id
-  def perf_filter_charts(chart_layout, rpt)
-    return unless rpt&.where_clause
-    model = rpt.where_clause.dig(1).constantize
-    id = rpt.where_clause.dig(2)
-    return unless model && id
-    if model == AvailabilityZone &&
-       model.find(id).type == "ManageIQ::Providers::Amazon::CloudManager::AvailabilityZone"
-      chart_layout.reject! { |chart| chart[:title].include?("Memory") }
-    end
-  end
-
   def process_chart_trends(chart, rpt, options)
     if chart[:trends] && rpt.extras && rpt.extras[:trend]
       trendcol = perf_get_chart_trendcol(chart)