From d9d2d035cd08bd152e35ffe9b939359d7250a155 Mon Sep 17 00:00:00 2001
From: Mooli Tayer <mtayer@redhat.com>
Date: Tue, 7 Mar 2017 13:41:53 +0200
Subject: [PATCH] Unify setting sections

---
 .../hawkular/datawarehouse_manager/event_catcher/stream.rb   | 2 +-
 config/settings.yml                                          | 5 ++---
 2 files changed, 3 insertions(+), 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
index 083ec7041b1..6383afc7bb3 100644
--- 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
index 8b5a282b115..ee0dd38f780 100644
--- 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: