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.

Sign up for GitHub

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

Jump to bottom

Don't queue metrics capture if metrics unsupported #17820

Merged
merged 1 commit into from
Aug 9, 2018
Merged

Don't queue metrics capture if metrics unsupported #17820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions app/models/manageiq/providers/container_manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ class ContainerManager < BaseManager
end
end

# TODO: move this to supports_feature_mixin
def supports_metrics?
true
end

# required by aggregate_hardware
alias :all_computer_systems :computer_systems
alias :all_computer_system_ids :computer_system_ids
Expand Down
2 changes: 2 additions & 0 deletions app/models/metric/targets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ def self.capture_container_targets(emses, _options)

targets = []
emses.each do |ems|
next unless ems.supports_metrics?

targets += with_archived(ems.all_container_nodes)
targets += with_archived(ems.all_container_groups)
targets += with_archived(ems.all_containers)
Expand Down