Unify setting sections

ManageIQ · Mar 7, 2017 · d9d2d03 · d9d2d03
1 parent 029fff1
commit d9d2d03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/models/manageiq/providers/hawkular/datawarehouse_manager/event_catcher/stream.rb b/app/models/manageiq/providers/hawkular/datawarehouse_manager/event_catcher/stream.rb
@@ -18,7 +18,7 @@ def hawkular_alert_criteria
   end
 
   def alert_tenants
-    ::Settings.ems.ems_datawarehouse.alertable_tenants
+    ManageIQ::Providers::Hawkular::DatawarehouseManager::EventCatcher.worker_settings[:alertable_tenants]
   end
 
   def post_fetch(alerts)

diff --git a/config/settings.yml b/config/settings.yml
@@ -107,8 +107,6 @@
   :ems_azure:
     :disabled_regions: []
     :additional_regions: {}
-  :ems_datawarehouse:
-    :alertable_tenants: ['_system', '_ops']
 :event_streams:
   :history:
     :keep_events: 6.months
@@ -1276,7 +1274,8 @@
       :event_catcher_hawkular:
         :poll: 10.seconds
       :event_catcher_hawkular_datawarehouse:
-        :poll: 30.seconds
+        :alertable_tenants: ['_system', '_ops']
+        :poll: 1.minute
       :event_catcher_google:
         :poll: 15.seconds
       :event_catcher_kubernetes: