Skip to content

Commit

Permalink
Merge pull request #936 from agrare/fix_vmware_default_blacklisted_ev…
Browse files Browse the repository at this point in the history
…ent_names_other_providers

Fix vCloud and Tanzu inheriting vSphere's filtered events
  • Loading branch information
Fryguy authored Jan 28, 2025
2 parents 181d0cd + fbe70d4 commit dc6103d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/models/manageiq/providers/vmware/cloud_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ def self.description
@description ||= "VMware vCloud".freeze
end

def self.default_blacklisted_event_names
Settings.ems["ems_#{ems_type}"].blacklisted_event_names
end

def self.params_for_create
{
:fields => [
Expand Down
4 changes: 4 additions & 0 deletions app/models/manageiq/providers/vmware/container_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ def self.display_name(number = 1)
n_('Container Provider (Vmware)', 'Container Providers (Vmware)', number)
end

def self.default_blacklisted_event_names
Settings.ems["ems_#{ems_type}"].blacklisted_event_names
end

def self.kubernetes_auth_options(options)
{:bearer_token => options[:bearer] || wcp_login(options)}
end
Expand Down
4 changes: 4 additions & 0 deletions app/models/manageiq/providers/vmware/infra_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,10 @@ def self.provision_class(via)
end
end

def self.default_blacklisted_event_names
Settings.ems.ems_vmware.blacklisted_event_names
end

def verify_credentials(auth_type = nil, _options = {})
user, pwd = auth_user_pwd(auth_type)
self.class.raw_connect(:ip => hostname, :port => port, :user => user, :pass => pwd, :verify_ssl => verify_ssl, :certificate_authority => certificate_authority)
Expand Down
4 changes: 4 additions & 0 deletions app/models/manageiq/providers/vmware/network_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ def self.hostname_required?
false
end

def self.default_blacklisted_event_names
Settings.ems["ems_#{ems_type}"].blacklisted_event_names
end

def description
@description ||= "VMware Cloud Network".freeze
end
Expand Down
6 changes: 6 additions & 0 deletions config/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
:historical: 100
:hourly: 250
:realtime: 100
:ems_vmware_cloud:
:blacklisted_event_names: []
:ems_vmware_cloud_network:
:blacklisted_event_names: []
:ems_vmware_tanzu:
:blacklisted_event_names: []
:ems_refresh:
:vmware_tanzu:
:refresh_interval: 24.hours
Expand Down

0 comments on commit dc6103d

Please sign in to comment.