Merge pull request #685 from agrare/move_default_filtered_events_to_s…

…ettings Move default filtered event names to Settings
ManageIQ · Jan 28, 2025 · f7f1e55 · f7f1e55
2 parents 5f7aeb5 + 63d5088
commit f7f1e55
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/app/models/manageiq/providers/ovirt/infra_manager.rb b/app/models/manageiq/providers/ovirt/infra_manager.rb
@@ -103,17 +103,6 @@ def self.host_vendor
     "ovirt".freeze
   end
 
-  def self.default_blacklisted_event_names
-    %w(
-      UNASSIGNED
-      USER_REMOVE_VG
-      USER_REMOVE_VG_FAILED
-      USER_VDC_LOGIN
-      USER_VDC_LOGOUT
-      USER_VDC_LOGIN_FAILED
-    )
-  end
-
   def self.without_iso_datastores
     includes(:iso_datastore).where(:iso_datastores => {:id => nil})
   end

diff --git a/app/models/manageiq/providers/ovirt/network_manager.rb b/app/models/manageiq/providers/ovirt/network_manager.rb
@@ -33,11 +33,7 @@ def self.description
   end
 
   def self.default_blacklisted_event_names
-    %w(
-      scheduler.run_instance.start
-      scheduler.run_instance.scheduled
-      scheduler.run_instance.end
-    )
+    Settings.ems["ems_#{ems_type}"].blacklisted_event_names
   end
 
   def supported_auth_types

diff --git a/config/settings.yml b/config/settings.yml
@@ -10,7 +10,13 @@
     :service:
       :read_timeout: 1.hour
       :open_timeout: 1.minute
-    :blacklisted_event_names: []
+    :blacklisted_event_names:
+    - UNASSIGNED
+    - USER_REMOVE_VG
+    - USER_REMOVE_VG_FAILED
+    - USER_VDC_LOGIN
+    - USER_VDC_LOGIN_FAILED
+    - USER_VDC_LOGOUT
     :event_handling:
       :event_groups:
         :console:
@@ -44,6 +50,11 @@
           - security_group.update.end
     :connection_manager:
       :purge_interval: 1.hour
+  :ems_ovirt_network:
+    :blacklisted_event_names:
+    - scheduler.run_instance.end
+    - scheduler.run_instance.scheduled
+    - scheduler.run_instance.start
 :http_proxy:
   :rhevm:
     :host: