Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add MiddlewareServerEap and MiddlewareServerWildfly for Utilization charts #2976

Merged
merged 1 commit into from
Dec 8, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/application_controller/performance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ def perf_gen_data_before_wait
from_dt,
to_dt,
interval_type]
elsif %w(MiddlewareServer MiddlewareDatasource MiddlewareMessaging).include?(@perf_record.class.name.demodulize)
elsif %w(MiddlewareServer MiddlewareDatasource MiddlewareMessaging).any? { |e| @perf_record.kind_of?(e.constantize) }
rpt = perf_get_chart_rpt("vim_perf_#{interval_type}_#{@perf_record.chart_report_name}")
rpt.where_clause = ["resource_type = ? and resource_id = ? and timestamp >= ? and timestamp <= ? " \
"and capture_interval_name = ?",
Expand All @@ -660,7 +660,7 @@ def perf_gen_data_before_wait
f, to_dt = @perf_record.first_and_last_capture("realtime")
from_dt = to_dt.nil? ? nil : to_dt - @perf_options[:rt_minutes]
suffix = if %w(MiddlewareServer MiddlewareDatasource MiddlewareMessaging)
.include?(@perf_record.class.name.demodulize)
.any? { |e| @perf_record.kind_of?(e.constantize) }
"_#{@perf_record.chart_report_name}"
else
""
Expand Down