From 1efff88c1dbcca52c81242005f5362e334adab9a Mon Sep 17 00:00:00 2001 From: Mooli Tayer Date: Sun, 4 Jun 2017 13:07:58 +0300 Subject: [PATCH] Rename datawarehouse manager to monitoring manager --- .rubocop_local.yml | 2 +- app/models/ems_event.rb | 4 +- app/models/ems_refresh.rb | 2 +- app/models/ems_refresh/save_inventory.rb | 2 +- ...ehouse.rb => save_inventory_monitoring.rb} | 4 +- ...house_manager.rb => monitoring_manager.rb} | 6 +- app/models/miq_alert.rb | 6 +- app/models/miq_region.rb | 4 +- .../worker_management/monitor/class_names.rb | 8 +-- app/models/zone.rb | 4 +- config/dictionary_strings.rb | 4 -- config/permissions.tmpl.yml | 50 ---------------- config/yaml_strings.rb | 35 ----------- db/fixtures/miq_product_features.yml | 58 ------------------- db/fixtures/miq_shortcuts.yml | 5 -- lib/vmdb/loggers.rb | 4 +- spec/factories/ext_management_system.rb | 16 ++--- spec/models/ems_event_spec.rb | 2 +- spec/models/ext_management_system_spec.rb | 2 +- spec/models/miq_alert_spec.rb | 6 +- spec/requests/api/settings_spec.rb | 2 +- ...refresher_configuration_script_sources.yml | 2 +- 22 files changed, 38 insertions(+), 190 deletions(-) rename app/models/ems_refresh/{save_inventory_datawarehouse.rb => save_inventory_monitoring.rb} (65%) rename app/models/manageiq/providers/{datawarehouse_manager.rb => monitoring_manager.rb} (58%) delete mode 100644 config/permissions.tmpl.yml diff --git a/.rubocop_local.yml b/.rubocop_local.yml index c1df8b2c840..392ac79a70c 100644 --- a/.rubocop_local.yml +++ b/.rubocop_local.yml @@ -5,7 +5,7 @@ GlobalVars: - $api_log - $aws_log - $azure_log - - $datawarehouse_log + - $monitoring_log - $fog_log - $lenovo_log - $log diff --git a/app/models/ems_event.rb b/app/models/ems_event.rb index ff52e3ccf41..08d0da5538b 100644 --- a/app/models/ems_event.rb +++ b/app/models/ems_event.rb @@ -176,7 +176,7 @@ def self.first_chained_event(ems_id, chain_id) def parse_event_metadata data = full_data || {} [ - event_type == "datawarehouse_alert" ? message : nil, + event_type == "monitoring_alert" ? message : nil, data[:severity], data[:url], data[:ems_ref], @@ -216,7 +216,7 @@ def get_target(target_type) target_type = "src_vm_or_template" if target_type == "src_vm" target_type = "dest_vm_or_template" if target_type == "dest_vm" target_type = "middleware_server" if event.event_type == "hawkular_alert" - target_type = "container_node" if event.event_type == "datawarehouse_alert" + target_type = "container_node" if event.event_type == "monitoring_alert" event.send(target_type) end diff --git a/app/models/ems_refresh.rb b/app/models/ems_refresh.rb index eda9713ada8..f4a33fee700 100644 --- a/app/models/ems_refresh.rb +++ b/app/models/ems_refresh.rb @@ -5,7 +5,7 @@ module EmsRefresh extend EmsRefresh::SaveInventoryInfra extend EmsRefresh::SaveInventoryPhysicalInfra extend EmsRefresh::SaveInventoryContainer - extend EmsRefresh::SaveInventoryDatawarehouse + extend EmsRefresh::SaveInventoryMonitoring extend EmsRefresh::SaveInventoryNetwork extend EmsRefresh::SaveInventoryObjectStorage extend EmsRefresh::SaveInventoryHelper diff --git a/app/models/ems_refresh/save_inventory.rb b/app/models/ems_refresh/save_inventory.rb index c42505c84da..12639b04920 100644 --- a/app/models/ems_refresh/save_inventory.rb +++ b/app/models/ems_refresh/save_inventory.rb @@ -14,7 +14,7 @@ def save_ems_inventory(ems, hashes, target = nil) when ManageIQ::Providers::ContainerManager then save_ems_container_inventory(ems, hashes, target) when ManageIQ::Providers::NetworkManager then save_ems_network_inventory(ems, hashes, target) when ManageIQ::Providers::StorageManager then save_ems_storage_inventory(ems, hashes, target) - when ManageIQ::Providers::DatawarehouseManager then save_ems_datawarehouse_inventory(ems, hashes, target) + when ManageIQ::Providers::MonitoringManager then save_ems_monitoring_inventory(ems, hashes, target) end end diff --git a/app/models/ems_refresh/save_inventory_datawarehouse.rb b/app/models/ems_refresh/save_inventory_monitoring.rb similarity index 65% rename from app/models/ems_refresh/save_inventory_datawarehouse.rb rename to app/models/ems_refresh/save_inventory_monitoring.rb index bf476800c4a..442aa786dec 100644 --- a/app/models/ems_refresh/save_inventory_datawarehouse.rb +++ b/app/models/ems_refresh/save_inventory_monitoring.rb @@ -1,5 +1,5 @@ -module EmsRefresh::SaveInventoryDatawarehouse - def save_ems_datawarehouse_inventory(ems, hashes, target = nil) +module EmsRefresh::SaveInventoryMonitoring + def save_ems_monitoring_inventory(ems, hashes, target = nil) target = ems if target.nil? child_keys = [] diff --git a/app/models/manageiq/providers/datawarehouse_manager.rb b/app/models/manageiq/providers/monitoring_manager.rb similarity index 58% rename from app/models/manageiq/providers/datawarehouse_manager.rb rename to app/models/manageiq/providers/monitoring_manager.rb index bf405b7c978..bea8aeba48c 100644 --- a/app/models/manageiq/providers/datawarehouse_manager.rb +++ b/app/models/manageiq/providers/monitoring_manager.rb @@ -1,12 +1,12 @@ module ManageIQ::Providers - class DatawarehouseManager < BaseManager + class MonitoringManager < BaseManager class << model_name def route_key - "ems_datawarehouse" + "ems_monitoring" end def singular_route_key - "ems_datawarehouse" + "ems_monitoring" end end end diff --git a/app/models/miq_alert.rb b/app/models/miq_alert.rb index 2097fdc48a6..1ec2c9bc69a 100644 --- a/app/models/miq_alert.rb +++ b/app/models/miq_alert.rb @@ -84,7 +84,7 @@ def validate_automate_expressions next_frequency = (options || {}).fetch_path(:notifications, :delay_next_evaluation) if automate_expression[:always_evaluate] && next_frequency != 0 valid = false - errors.add(:notifications, "Datawarehouse alerts must have a 0 notification frequency") + errors.add(:notifications, "External alerts must have a 0 notification frequency") end valid end @@ -457,7 +457,7 @@ def self.automate_expressions {:name => :mw_operator, :description => _("Operator"), :values => [">", ">=", "<", "<=", "="]}, {:name => :value_mw_garbage_collector, :description => _("Duration Per Minute (ms)"), :numeric => true} ]}, - {:name => "dwh_generic", :description => _("All Datawarehouse alerts"), :db => ["ContainerNode"], :responds_to_events => "datawarehouse_alert", + {:name => "dwh_generic", :description => _("All External alerts"), :db => ["ContainerNode"], :responds_to_events => "external_alert", :options => [], :always_evaluate => true} ] end @@ -520,7 +520,7 @@ def self.expression_by_name(name) def self.raw_events @raw_events ||= expression_by_name("event_threshold")[:options].find { |h| h[:name] == :event_types }[:values] + - %w(hawkular_alert datawarehouse_alert) + %w(hawkular_alert external_alert) end def self.event_alertable?(event) diff --git a/app/models/miq_region.rb b/app/models/miq_region.rb index 36f2388224b..db4ddff7696 100644 --- a/app/models/miq_region.rb +++ b/app/models/miq_region.rb @@ -180,8 +180,8 @@ def ems_middlewares ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::MiddlewareManager } end - def ems_datawarehouses - ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::DatawarehouseManager } + def ems_monitors + ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::MonitoringManager } end def ems_configproviders diff --git a/app/models/miq_server/worker_management/monitor/class_names.rb b/app/models/miq_server/worker_management/monitor/class_names.rb index 91adafb3966..7dfbeaf5ee9 100644 --- a/app/models/miq_server/worker_management/monitor/class_names.rb +++ b/app/models/miq_server/worker_management/monitor/class_names.rb @@ -27,7 +27,7 @@ module MiqServer::WorkerManagement::Monitor::ClassNames ManageIQ::Providers::Foreman::ConfigurationManager::RefreshWorker ManageIQ::Providers::Foreman::ProvisioningManager::RefreshWorker ManageIQ::Providers::Hawkular::MiddlewareManager::RefreshWorker - ManageIQ::Providers::Hawkular::DatawarehouseManager::RefreshWorker + ManageIQ::Providers::Hawkular::MonitoringManager::RefreshWorker ManageIQ::Providers::Kubernetes::ContainerManager::RefreshWorker ManageIQ::Providers::Openshift::ContainerManager::RefreshWorker ManageIQ::Providers::Microsoft::InfraManager::RefreshWorker @@ -47,7 +47,7 @@ module MiqServer::WorkerManagement::Monitor::ClassNames ManageIQ::Providers::EmbeddedAnsible::AutomationManager::EventCatcher ManageIQ::Providers::Azure::CloudManager::EventCatcher ManageIQ::Providers::Hawkular::MiddlewareManager::EventCatcher - ManageIQ::Providers::Hawkular::DatawarehouseManager::EventCatcher + ManageIQ::Providers::Hawkular::MonitoringManager::EventCatcher ManageIQ::Providers::Google::CloudManager::EventCatcher ManageIQ::Providers::Kubernetes::ContainerManager::EventCatcher ManageIQ::Providers::Openshift::ContainerManager::EventCatcher @@ -103,7 +103,7 @@ module MiqServer::WorkerManagement::Monitor::ClassNames ManageIQ::Providers::Foreman::ConfigurationManager::RefreshWorker ManageIQ::Providers::Foreman::ProvisioningManager::RefreshWorker ManageIQ::Providers::Hawkular::MiddlewareManager::RefreshWorker - ManageIQ::Providers::Hawkular::DatawarehouseManager::RefreshWorker + ManageIQ::Providers::Hawkular::MonitoringManager::RefreshWorker ManageIQ::Providers::Kubernetes::ContainerManager::RefreshWorker ManageIQ::Providers::Lenovo::PhysicalInfraManager::RefreshWorker ManageIQ::Providers::Openshift::ContainerManager::RefreshWorker @@ -135,7 +135,7 @@ module MiqServer::WorkerManagement::Monitor::ClassNames ManageIQ::Providers::AnsibleTower::AutomationManager::EventCatcher ManageIQ::Providers::EmbeddedAnsible::AutomationManager::EventCatcher ManageIQ::Providers::Hawkular::MiddlewareManager::EventCatcher - ManageIQ::Providers::Hawkular::DatawarehouseManager::EventCatcher + ManageIQ::Providers::Hawkular::MonitoringManager::EventCatcher ManageIQ::Providers::Google::CloudManager::EventCatcher ManageIQ::Providers::Kubernetes::ContainerManager::EventCatcher ManageIQ::Providers::Openshift::ContainerManager::EventCatcher diff --git a/app/models/zone.rb b/app/models/zone.rb index f2b5e280d25..f55fead8fc4 100644 --- a/app/models/zone.rb +++ b/app/models/zone.rb @@ -141,8 +141,8 @@ def middleware_servers ems_middlewares.flat_map(&:middleware_servers) end - def ems_datawarehouses - ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::DatawarehouseManager } + def ems_monitors + ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::MonitoringManager } end def ems_configproviders diff --git a/config/dictionary_strings.rb b/config/dictionary_strings.rb index c02ceeb44bd..e6bc75387e1 100644 --- a/config/dictionary_strings.rb +++ b/config/dictionary_strings.rb @@ -2348,10 +2348,6 @@ _("Containers Providers") # TRANSLATORS: en.yml key: dictionary.table.ems_containers _("Containers Providers") -# TRANSLATORS: en.yml key: dictionary.table.ems_datawarehouse -_("Datawarehouse Provider") -# TRANSLATORS: en.yml key: dictionary.table.ems_datawarehouse (plural form) -_("Datawarehouse Providers") # TRANSLATORS: en.yml key: dictionary.table.ems_middleware _("Middleware Provider") # TRANSLATORS: en.yml key: dictionary.table.ems_middleware (plural form) diff --git a/config/permissions.tmpl.yml b/config/permissions.tmpl.yml deleted file mode 100644 index 8ab0e163290..00000000000 --- a/config/permissions.tmpl.yml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- :aut -- :automate -- :ansible -- :at -- :bst -- :clo -- :cnt -- :compute -- :con -- :conf -- :inf -- :mdl -- :dwh -- :net -- :opt -- :ost -- :phy -- :set -- :sto -- :svc -- :vi -- ems-type:ansible_tower_automation -- ems-type:azure -- ems-type:azure_network -- ems-type:cinder -- ems-type:ec2 -- ems-type:ec2_network -- ems-type:ec2_ebs_storage -- ems-type:embedded_ansible_automation -- ems-type:s3 -- ems-type:foreman_configuration -- ems-type:foreman_provisioning -- ems-type:gce -- ems-type:gce_network -- ems-type:hawkular -- ems-type:hawkular_datawarehouse -- ems-type:kubernetes -- ems-type:lenovo_ph_infra -- ems-type:nuage_network -- ems-type:openshift -- ems-type:openstack -- ems-type:openstack_infra -- ems-type:openstack_network -- ems-type:rhevm -- ems-type:scvmm -- ems-type:swift -- ems-type:vmware_cloud -- ems-type:vmware_cloud_network -- ems-type:vmwarews diff --git a/config/yaml_strings.rb b/config/yaml_strings.rb index 85843722dee..46e67502aef 100644 --- a/config/yaml_strings.rb +++ b/config/yaml_strings.rb @@ -2215,32 +2215,6 @@ # TRANSLATORS: file: db/fixtures/miq_product_features.yml _("Edit Tags of Middleware Messaging") # TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Everything under Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("View Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Display Lists of Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Display Individual Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Display Timelines for Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Perform Operations on Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Refresh Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Re-check Authentication Status of Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Edit Tags of Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Modify Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Remove Datawarehouse Providers") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Edit a Datawarehouse Provider") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml -_("Add a Datawarehouse Provider") -# TRANSLATORS: file: db/fixtures/miq_product_features.yml # TRANSLATORS: file: product/views/ManageIQ_Providers_NetworkManager.yaml _("Network Providers") # TRANSLATORS: file: db/fixtures/miq_product_features.yml @@ -3918,7 +3892,6 @@ # TRANSLATORS: file: product/views/ManageIQ_Providers_CloudManager_Vm-vms.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_CloudManager_Vm.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_ContainerManager.yaml -# TRANSLATORS: file: product/views/ManageIQ_Providers_DatawarehouseManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_EmbeddedAnsible_AutomationManager_Playbook.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_EmbeddedAutomationManager_Authentication.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_EmbeddedAutomationManager_ConfigurationScriptSource.yaml @@ -4273,7 +4246,6 @@ # TRANSLATORS: file: product/views/ManageIQ_Providers_CloudManager_Template.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_ConfigurationManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_ContainerManager.yaml -# TRANSLATORS: file: product/views/ManageIQ_Providers_DatawarehouseManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_EmbeddedAutomationManager_Authentication.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_Foreman_ConfigurationManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_Foreman_ConfigurationManager_ConfiguredSystem.yaml @@ -4634,7 +4606,6 @@ # TRANSLATORS: file: product/views/ConfiguredSystem.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_AnsibleTower_AutomationManager_ConfiguredSystem.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_ContainerManager.yaml -# TRANSLATORS: file: product/views/ManageIQ_Providers_DatawarehouseManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_Foreman_ConfigurationManager_ConfiguredSystem.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_InfraManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_MiddlewareManager.yaml @@ -4667,7 +4638,6 @@ # TRANSLATORS: file: product/views/Host-hosts.yaml # TRANSLATORS: file: product/views/Host.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_ContainerManager.yaml -# TRANSLATORS: file: product/views/ManageIQ_Providers_DatawarehouseManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_MiddlewareManager.yaml # TRANSLATORS: file: product/views/MiqServer.yaml _("IP Address") @@ -6676,7 +6646,6 @@ # TRANSLATORS: file: product/views/ContainerImageRegistry.yaml # TRANSLATORS: file: product/views/FirewallRule.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_ContainerManager.yaml -# TRANSLATORS: file: product/views/ManageIQ_Providers_DatawarehouseManager.yaml # TRANSLATORS: file: product/views/ManageIQ_Providers_MiddlewareManager.yaml _("Port") # TRANSLATORS: file: product/views/ManageIQ_Providers_CloudManager_Vm-all_vms_and_templates.yaml @@ -6719,10 +6688,6 @@ # TRANSLATORS: file: product/views/MiqGroup.yaml # TRANSLATORS: file: product/views/User.yaml _("Role") -# TRANSLATORS: file: product/views/ManageIQ_Providers_DatawarehouseManager.yaml -_("Datawarehouse Providers") -# TRANSLATORS: file: product/views/ManageIQ_Providers_DatawarehouseManager.yaml -_("EmsDatawarehouse") # TRANSLATORS: file: product/views/ServiceCatalog.yaml # TRANSLATORS: file: product/views/ServiceTemplate.yaml # TRANSLATORS: file: product/views/ServiceTemplateCatalog.yaml diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml index b11683ab6ca..92b08d82e78 100644 --- a/db/fixtures/miq_product_features.yml +++ b/db/fixtures/miq_product_features.yml @@ -3976,64 +3976,6 @@ :feature_type: control :identifier: middleware_messaging_tag -# EmsDatawarehouse -- :name: Providers - :description: Everything under Datawarehouse Providers - :feature_type: node - :identifier: ems_datawarehouse - :children: - - :name: View - :description: View Datawarehouse Providers - :feature_type: view - :identifier: ems_datawarehouse_view - :children: - - :name: List - :description: Display Lists of Datawarehouse Providers - :feature_type: view - :identifier: ems_datawarehouse_show_list - - :name: Show - :description: Display Individual Datawarehouse Providers - :feature_type: view - :identifier: ems_datawarehouse _show - - :name: Timeline - :description: Display Timelines for Datawarehouse Providers - :feature_type: view - :identifier: ems_datawarehouse_timeline - - :name: Operate - :description: Perform Operations on Datawarehouse Providers - :feature_type: control - :identifier: ems_datawarehouse_control - :children: - - :name: Refresh - :description: Refresh Datawarehouse Providers - :feature_type: control - :identifier: ems_datawarehouse_refresh - - :name: Re-check Authentication Status - :description: Re-check Authentication Status of Datawarehouse Providers - :feature_type: control - :identifier: ems_datawarehouse_recheck_auth_status - - :name: Edit Tags - :description: Edit Tags of Datawarehouse Providers - :feature_type: control - :identifier: ems_datawarehouse_tag - - :name: Modify - :description: Modify Datawarehouse Providers - :feature_type: admin - :identifier: ems_datawarehouse_admin - :children: - - :name: Remove - :description: Remove Datawarehouse Providers - :feature_type: admin - :identifier: ems_datawarehouse_delete - - :name: Edit - :description: Edit a Datawarehouse Provider - :feature_type: admin - :identifier: ems_datawarehouse_edit - - :name: Add - :description: Add a Datawarehouse Provider - :feature_type: admin - :identifier: ems_datawarehouse_new - # EmsNetwork - :name: Network Providers :description: Everything under Network Providers diff --git a/db/fixtures/miq_shortcuts.yml b/db/fixtures/miq_shortcuts.yml index 7ff5eb1325c..e0db785aab5 100644 --- a/db/fixtures/miq_shortcuts.yml +++ b/db/fixtures/miq_shortcuts.yml @@ -339,11 +339,6 @@ :url: /middleware_topology :rbac_feature_name: middleware_topology_view :startup: true -- :name: ems_datawarehouse - :description: Datawarehouse / Providers - :url: /ems_datawarehouse - :rbac_feature_name: ems_datawarehouse_show_list - :startup: true - :name: ems_block_storage :description: Storage / Block Storage / Managers :url: /ems_block_storage/show_list diff --git a/lib/vmdb/loggers.rb b/lib/vmdb/loggers.rb index 99e9c9e619a..9ca74a1ab0e 100644 --- a/lib/vmdb/loggers.rb +++ b/lib/vmdb/loggers.rb @@ -26,7 +26,7 @@ def self.apply_config(config) apply_config_value(config, $aws_log, :level_aws, :level_aws_in_evm) apply_config_value(config, $kube_log, :level_kube, :level_kube_in_evm) apply_config_value(config, $mw_log, :level_mw, :level_mw_in_evm) - apply_config_value(config, $datawarehouse_log, :level_datawarehouse, :level_datawarehouse_in_evm) + apply_config_value(config, $monitoring_log, :level_monitoring, :level_monitoring_in_evm) apply_config_value(config, $scvmm_log, :level_scvmm, :level_scvmm_in_evm) apply_config_value(config, $api_log, :level_api, :level_api_in_evm) apply_config_value(config, $fog_log, :level_fog, :level_fog_in_evm) @@ -51,7 +51,7 @@ def self.create_loggers $lenovo_log = MirroredLogger.new(path_dir.join("lenovo.log"), " ") $kube_log = MirroredLogger.new(path_dir.join("kubernetes.log"), " ") $mw_log = MirroredLogger.new(path_dir.join("middleware.log"), " ") - $datawarehouse_log = MirroredLogger.new(path_dir.join("datawarehouse.log"), " ") + $monitorng_log = MirroredLogger.new(path_dir.join("monitorng.log"), " ") $scvmm_log = MirroredLogger.new(path_dir.join("scvmm.log"), " ") $azure_log = MirroredLogger.new(path_dir.join("azure.log"), " ") $api_log = MirroredLogger.new(path_dir.join("api.log"), " ") diff --git a/spec/factories/ext_management_system.rb b/spec/factories/ext_management_system.rb index 65a059e809c..fafa2a81858 100644 --- a/spec/factories/ext_management_system.rb +++ b/spec/factories/ext_management_system.rb @@ -50,9 +50,9 @@ :parent => :ext_management_system do end - factory :ems_datawarehouse, - :aliases => ["manageiq/providers/datawarehouse_manager"], - :class => "ManageIQ::Providers::DatawarehouseManager", + factory :ems_monitorng, + :aliases => ["manageiq/providers/monitoring_manager"], + :class => "ManageIQ::Providers::MonitornghouseManager", :parent => :ext_management_system do end @@ -391,11 +391,11 @@ :parent => :ems_middleware do end - # Leaf classes for datawarehouse_manager + # Leaf classes for monitoring_manager - factory :ems_hawkular_datawarehouse, - :aliases => ["manageiq/providers/hawkular/datawarehouse_manager"], - :class => "ManageIQ::Providers::Hawkular::DatawarehouseManager", - :parent => :ems_datawarehouse do + factory :ems_hawkular_monitorng, + :aliases => ["manageiq/providers/hawkular/monitoring_manager"], + :class => "ManageIQ::Providers::Hawkular::MonitringManager", + :parent => :ems_monitoring do end end diff --git a/spec/models/ems_event_spec.rb b/spec/models/ems_event_spec.rb index 00dcc3032a6..89931a2835d 100644 --- a/spec/models/ems_event_spec.rb +++ b/spec/models/ems_event_spec.rb @@ -1,7 +1,7 @@ describe EmsEvent do context "model" do let(:ems1) { FactoryGirl.create(:ems_kubernetes) } - let(:ems2) { FactoryGirl.create(:ems_hawkular_datawarehouse) } + let(:ems2) { FactoryGirl.create(:ems_hawkular_monitoring) } it "Find ems events and generated events for ext management systems" do generated_event = FactoryGirl.create(:ems_event, :ext_management_system => ems1, :generating_ems => ems2) diff --git a/spec/models/ext_management_system_spec.rb b/spec/models/ext_management_system_spec.rb index b1bcee424d9..7b215972173 100644 --- a/spec/models/ext_management_system_spec.rb +++ b/spec/models/ext_management_system_spec.rb @@ -31,7 +31,7 @@ "gce" => "Google Compute Engine", "gce_network" => "Google Network", "hawkular" => "Hawkular", - "hawkular_datawarehouse" => "Hawkular Datawarehouse", + "hawkular_monitoring" => "Hawkular Monitoring", "kubernetes" => "Kubernetes", "openshift" => "OpenShift", "openstack" => "OpenStack", diff --git a/spec/models/miq_alert_spec.rb b/spec/models/miq_alert_spec.rb index f4f6685268a..d4f60e1938f 100644 --- a/spec/models/miq_alert_spec.rb +++ b/spec/models/miq_alert_spec.rb @@ -166,10 +166,10 @@ expect(mas.description).to eq("VM Unregistered") end - it "miq_alert_status.description = ems_event.message if present and datawarehouse_alert" do + it "miq_alert_status.description = ems_event.message if present and monitoring_alert" do @alert.evaluate( [@vm.class.base_class.name, @vm.id], - :ems_event => FactoryGirl.create(:ems_event, :message => "oh no!", :event_type => "datawarehouse_alert") + :ems_event => FactoryGirl.create(:ems_event, :message => "oh no!", :event_type => "monitoring_alert") ) mas = @alert.miq_alert_statuses.where(:resource_type => @vm.class.base_class.name, :resource_id => @vm.id).first expect(mas.description).to eq("oh no!") @@ -528,7 +528,7 @@ ) end.to raise_error( ActiveRecord::RecordInvalid, - 'Validation failed: Notifications Datawarehouse alerts must have a 0 notification frequency' + 'Validation failed: Notifications Monitoring alerts must have a 0 notification frequency' ) end diff --git a/spec/requests/api/settings_spec.rb b/spec/requests/api/settings_spec.rb index 69233e9b883..2603672c42c 100644 --- a/spec/requests/api/settings_spec.rb +++ b/spec/requests/api/settings_spec.rb @@ -46,7 +46,7 @@ "product": { "maindb": "ExtManagementSystem", "container_deployment_wizard": false, - "datawarehouse_manager": false + "monitoring_manager": false }, "server": { "role": "database_operations,event,reporting,scheduler,smartstate,ems_operations,ems_inventory,user_interface,websocket,web_services,automate", diff --git a/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_configuration_script_sources.yml b/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_configuration_script_sources.yml index 0a24790a540..ed2b81065c4 100644 --- a/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_configuration_script_sources.yml +++ b/spec/vcr_cassettes/manageiq/providers/ansible_tower/automation_manager/refresher_configuration_script_sources.yml @@ -399,7 +399,7 @@ http_interactions: - Activity Reports/110_Provisioning Activity - by Approver.yaml","product/reports/900_Provisioning - Activity Reports/120_Provisioning Activity - by Datastore.yaml","product/reports/900_Provisioning - Activity Reports/130_Provisioning Activity - by Requester.yaml","product/reports/900_Provisioning - - Activity Reports/140_Provisioning Activity - by VM.yaml","product/timelines/miq_reports/tl_bottleneck_events.yaml","product/timelines/miq_reports/tl_events_daily.yaml","product/timelines/miq_reports/tl_events_hourly.yaml","product/timelines/miq_reports/tl_policy_events_daily.yaml","product/timelines/miq_reports/tl_policy_events_hourly.yaml","product/views/Account-groups.yaml","product/views/Account-users.yaml","product/views/AdvancedSetting.yaml","product/views/ArbitrationProfile.yaml","product/views/AutomationRequest.yaml","product/views/AvailabilityZone.yaml","product/views/ChargebackRate.yaml","product/views/CimBaseStorageExtent.yaml","product/views/CimStorageExtent.yaml","product/views/CloudNetwork.yaml","product/views/CloudObjectStoreContainer-cloud_object_store_containers.yaml","product/views/CloudObjectStoreContainer.yaml","product/views/CloudObjectStoreObject-cloud_object_store_objects.yaml","product/views/CloudObjectStoreObject.yaml","product/views/CloudService.yaml","product/views/CloudSubnet.yaml","product/views/CloudTenant.yaml","product/views/CloudVolume-based_volumes.yaml","product/views/CloudVolume.yaml","product/views/CloudVolumeBackup-cloud_volume_backups.yaml","product/views/CloudVolumeBackup.yaml","product/views/CloudVolumeSnapshot-cloud_volume_snapshots.yaml","product/views/CloudVolumeSnapshot.yaml","product/views/Condition.yaml","product/views/ConditionSet.yaml","product/views/ConfiguredSystem.yaml","product/views/Container.yaml","product/views/ContainerBuild.yaml","product/views/ContainerGroup.yaml","product/views/ContainerImage.yaml","product/views/ContainerImageRegistry.yaml","product/views/ContainerNode.yaml","product/views/ContainerProject.yaml","product/views/ContainerReplicator.yaml","product/views/ContainerRoute.yaml","product/views/ContainerService.yaml","product/views/ContainerTemplate.yaml","product/views/CustomizationTemplate.yaml","product/views/Dialog.yaml","product/views/ems_block_storage.yaml","product/views/ems_object_storage.yaml","product/views/EmsCluster.yaml","product/views/EventLog-event_logs.yaml","product/views/Filesystem.yaml","product/views/FirewallRule.yaml","product/views/Flavor.yaml","product/views/FloatingIp.yaml","product/views/Group.yaml","product/views/GuestApplication.yaml","product/views/Host.yaml","product/views/HostAggregate.yaml","product/views/InstanceOrImage.yaml","product/views/IsoDatastore.yaml","product/views/Job.yaml","product/views/LdapRegion.yaml","product/views/LoadBalancer.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager_ConfigurationScript.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager_ConfiguredSystem.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager_Job.yaml","product/views/ManageIQ_Providers_CloudManager.yaml","product/views/ManageIQ_Providers_CloudManager_AuthKeyPair.yaml","product/views/ManageIQ_Providers_CloudManager_OrchestrationStack.yaml","product/views/ManageIQ_Providers_CloudManager_Template-all_vms_and_templates.yaml","product/views/ManageIQ_Providers_CloudManager_Template.yaml","product/views/ManageIQ_Providers_CloudManager_Vm-all_vms_and_templates.yaml","product/views/ManageIQ_Providers_CloudManager_Vm-vms.yaml","product/views/ManageIQ_Providers_CloudManager_Vm.yaml","product/views/ManageIQ_Providers_ConfigurationManager.yaml","product/views/ManageIQ_Providers_ContainerManager.yaml","product/views/ManageIQ_Providers_DatawarehouseManager.yaml","product/views/ManageIQ_Providers_Foreman_ConfigurationManager.yaml","product/views/ManageIQ_Providers_Foreman_ConfigurationManager_ConfiguredSystem.yaml","product/views/ManageIQ_Providers_InfraManager.yaml","product/views/ManageIQ_Providers_InfraManager_Template.yaml","product/views/ManageIQ_Providers_InfraManager_Vm.yaml","product/views/ManageIQ_Providers_MiddlewareManager.yaml","product/views/ManageIQ_Providers_NetworkManager.yaml","product/views/ManageIQ_Providers_StorageManager.yaml","product/views/ManageIQ_Providers_Vmware_CloudManager_OrchestrationTemplate.yaml","product/views/MiddlewareDatasource.yaml","product/views/MiddlewareDeployment.yaml","product/views/MiddlewareDomain.yaml","product/views/MiddlewareMessaging.yaml","product/views/MiddlewareServer.yaml","product/views/MiddlewareServerGroup.yaml","product/views/MiqAction.yaml","product/views/MiqActionSet.yaml","product/views/MiqAeClass.yaml","product/views/MiqAeInstance.yaml","product/views/MiqAlert.yaml","product/views/MiqDialog.yaml","product/views/MiqEvent-actions.yaml","product/views/MiqEvent.yaml","product/views/MiqGroup.yaml","product/views/MiqPolicy.yaml","product/views/MiqPolicySet.yaml","product/views/MiqProvision.yaml","product/views/MiqReportResult-all.yaml","product/views/MiqReportResult.yaml","product/views/MiqRequest.yaml","product/views/MiqSchedule.yaml","product/views/MiqServer.yaml","product/views/MiqTask.yaml","product/views/MiqTemplate-all_miq_templates.yaml","product/views/MiqTemplate.yaml","product/views/MiqUserRole.yaml","product/views/MiqWidget-all.yaml","product/views/MiqWidget.yaml","product/views/MiqWorker.yaml","product/views/NetworkPort.yaml","product/views/NetworkRouter.yaml","product/views/OntapFileShare.yaml","product/views/OntapLogicalDisk.yaml","product/views/OntapStorageSystem.yaml","product/views/OntapStorageVolume.yaml","product/views/OpenscapRuleResult.yaml","product/views/OrchestrationStack.yaml","product/views/OrchestrationStackOutput.yaml","product/views/OrchestrationStackParameter.yaml","product/views/OrchestrationStackResource.yaml","product/views/OrchestrationTemplate.yaml","product/views/OrchestrationTemplateAzure.yaml","product/views/OrchestrationTemplateCfn.yaml","product/views/OrchestrationTemplateHot.yaml","product/views/OrchestrationTemplateVnfd.yaml","product/views/OsProcess-processes.yaml","product/views/Patch.yaml","product/views/PersistentVolume.yaml","product/views/Policy.yaml","product/views/PolicySet.yaml","product/views/ProductUpdate.yaml","product/views/PxeImageType.yaml","product/views/PxeServer.yaml","product/views/RegistryItem.yaml","product/views/ResourcePool.yaml","product/views/ScanHistory.yaml","product/views/ScanItemSet.yaml","product/views/SecurityGroup.yaml","product/views/ServerBuild.yaml","product/views/Service.yaml","product/views/ServiceCatalog.yaml","product/views/ServiceTemplate.yaml","product/views/ServiceTemplateCatalog.yaml","product/views/SniaLocalFileSystem.yaml","product/views/Storage.yaml","product/views/StorageCluster.yaml","product/views/StorageFile-debris_files.yaml","product/views/StorageFile-disk_files.yaml","product/views/StorageFile-files.yaml","product/views/StorageFile-snapshot_files.yaml","product/views/StorageFile-vm_misc_files.yaml","product/views/StorageFile-vm_ram_files.yaml","product/views/StorageManager.yaml","product/views/SystemService-filesystem_drivers.yaml","product/views/SystemService-kernel_drivers.yaml","product/views/SystemService-linux_initprocesses.yaml","product/views/SystemService-win32_services.yaml","product/views/SystemService.yaml","product/views/Tenant.yaml","product/views/User.yaml","product/views/Vm-all_vms.yaml","product/views/Vm-VmReconfigureRequest.yaml","product/views/Vm.yaml","product/views/Vm__restricted.yaml","product/views/VmdbDatabaseConnection.yaml","product/views/VmdbDatabaseSetting.yaml","product/views/VmdbIndex.yaml","product/views/VmdbTableEvm.yaml","product/views/VmOrTemplate-all_archived.yaml","product/views/VmOrTemplate-all_orphaned.yaml","product/views/VmOrTemplate-all_vms_and_templates.yaml","product/views/VmOrTemplate.yaml","product/views/Vsc.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/binary_blob_hash.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/binary_blob_obj.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/miq_report_hash.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/miq_report_obj.yaml","spec/models/rss_feed/data/newest_vms.yml"]' + - Activity Reports/140_Provisioning Activity - by VM.yaml","product/timelines/miq_reports/tl_bottleneck_events.yaml","product/timelines/miq_reports/tl_events_daily.yaml","product/timelines/miq_reports/tl_events_hourly.yaml","product/timelines/miq_reports/tl_policy_events_daily.yaml","product/timelines/miq_reports/tl_policy_events_hourly.yaml","product/views/Account-groups.yaml","product/views/Account-users.yaml","product/views/AdvancedSetting.yaml","product/views/ArbitrationProfile.yaml","product/views/AutomationRequest.yaml","product/views/AvailabilityZone.yaml","product/views/ChargebackRate.yaml","product/views/CimBaseStorageExtent.yaml","product/views/CimStorageExtent.yaml","product/views/CloudNetwork.yaml","product/views/CloudObjectStoreContainer-cloud_object_store_containers.yaml","product/views/CloudObjectStoreContainer.yaml","product/views/CloudObjectStoreObject-cloud_object_store_objects.yaml","product/views/CloudObjectStoreObject.yaml","product/views/CloudService.yaml","product/views/CloudSubnet.yaml","product/views/CloudTenant.yaml","product/views/CloudVolume-based_volumes.yaml","product/views/CloudVolume.yaml","product/views/CloudVolumeBackup-cloud_volume_backups.yaml","product/views/CloudVolumeBackup.yaml","product/views/CloudVolumeSnapshot-cloud_volume_snapshots.yaml","product/views/CloudVolumeSnapshot.yaml","product/views/Condition.yaml","product/views/ConditionSet.yaml","product/views/ConfiguredSystem.yaml","product/views/Container.yaml","product/views/ContainerBuild.yaml","product/views/ContainerGroup.yaml","product/views/ContainerImage.yaml","product/views/ContainerImageRegistry.yaml","product/views/ContainerNode.yaml","product/views/ContainerProject.yaml","product/views/ContainerReplicator.yaml","product/views/ContainerRoute.yaml","product/views/ContainerService.yaml","product/views/ContainerTemplate.yaml","product/views/CustomizationTemplate.yaml","product/views/Dialog.yaml","product/views/ems_block_storage.yaml","product/views/ems_object_storage.yaml","product/views/EmsCluster.yaml","product/views/EventLog-event_logs.yaml","product/views/Filesystem.yaml","product/views/FirewallRule.yaml","product/views/Flavor.yaml","product/views/FloatingIp.yaml","product/views/Group.yaml","product/views/GuestApplication.yaml","product/views/Host.yaml","product/views/HostAggregate.yaml","product/views/InstanceOrImage.yaml","product/views/IsoDatastore.yaml","product/views/Job.yaml","product/views/LdapRegion.yaml","product/views/LoadBalancer.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager_ConfigurationScript.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager_ConfiguredSystem.yaml","product/views/ManageIQ_Providers_AnsibleTower_ConfigurationManager_Job.yaml","product/views/ManageIQ_Providers_CloudManager.yaml","product/views/ManageIQ_Providers_CloudManager_AuthKeyPair.yaml","product/views/ManageIQ_Providers_CloudManager_OrchestrationStack.yaml","product/views/ManageIQ_Providers_CloudManager_Template-all_vms_and_templates.yaml","product/views/ManageIQ_Providers_CloudManager_Template.yaml","product/views/ManageIQ_Providers_CloudManager_Vm-all_vms_and_templates.yaml","product/views/ManageIQ_Providers_CloudManager_Vm-vms.yaml","product/views/ManageIQ_Providers_CloudManager_Vm.yaml","product/views/ManageIQ_Providers_ConfigurationManager.yaml","product/views/ManageIQ_Providers_ContainerManager.yaml","product/views/ManageIQ_Providers_Foreman_ConfigurationManager.yaml","product/views/ManageIQ_Providers_Foreman_ConfigurationManager_ConfiguredSystem.yaml","product/views/ManageIQ_Providers_InfraManager.yaml","product/views/ManageIQ_Providers_InfraManager_Template.yaml","product/views/ManageIQ_Providers_InfraManager_Vm.yaml","product/views/ManageIQ_Providers_MiddlewareManager.yaml","product/views/ManageIQ_Providers_NetworkManager.yaml","product/views/ManageIQ_Providers_StorageManager.yaml","product/views/ManageIQ_Providers_Vmware_CloudManager_OrchestrationTemplate.yaml","product/views/MiddlewareDatasource.yaml","product/views/MiddlewareDeployment.yaml","product/views/MiddlewareDomain.yaml","product/views/MiddlewareMessaging.yaml","product/views/MiddlewareServer.yaml","product/views/MiddlewareServerGroup.yaml","product/views/MiqAction.yaml","product/views/MiqActionSet.yaml","product/views/MiqAeClass.yaml","product/views/MiqAeInstance.yaml","product/views/MiqAlert.yaml","product/views/MiqDialog.yaml","product/views/MiqEvent-actions.yaml","product/views/MiqEvent.yaml","product/views/MiqGroup.yaml","product/views/MiqPolicy.yaml","product/views/MiqPolicySet.yaml","product/views/MiqProvision.yaml","product/views/MiqReportResult-all.yaml","product/views/MiqReportResult.yaml","product/views/MiqRequest.yaml","product/views/MiqSchedule.yaml","product/views/MiqServer.yaml","product/views/MiqTask.yaml","product/views/MiqTemplate-all_miq_templates.yaml","product/views/MiqTemplate.yaml","product/views/MiqUserRole.yaml","product/views/MiqWidget-all.yaml","product/views/MiqWidget.yaml","product/views/MiqWorker.yaml","product/views/NetworkPort.yaml","product/views/NetworkRouter.yaml","product/views/OntapFileShare.yaml","product/views/OntapLogicalDisk.yaml","product/views/OntapStorageSystem.yaml","product/views/OntapStorageVolume.yaml","product/views/OpenscapRuleResult.yaml","product/views/OrchestrationStack.yaml","product/views/OrchestrationStackOutput.yaml","product/views/OrchestrationStackParameter.yaml","product/views/OrchestrationStackResource.yaml","product/views/OrchestrationTemplate.yaml","product/views/OrchestrationTemplateAzure.yaml","product/views/OrchestrationTemplateCfn.yaml","product/views/OrchestrationTemplateHot.yaml","product/views/OrchestrationTemplateVnfd.yaml","product/views/OsProcess-processes.yaml","product/views/Patch.yaml","product/views/PersistentVolume.yaml","product/views/Policy.yaml","product/views/PolicySet.yaml","product/views/ProductUpdate.yaml","product/views/PxeImageType.yaml","product/views/PxeServer.yaml","product/views/RegistryItem.yaml","product/views/ResourcePool.yaml","product/views/ScanHistory.yaml","product/views/ScanItemSet.yaml","product/views/SecurityGroup.yaml","product/views/ServerBuild.yaml","product/views/Service.yaml","product/views/ServiceCatalog.yaml","product/views/ServiceTemplate.yaml","product/views/ServiceTemplateCatalog.yaml","product/views/SniaLocalFileSystem.yaml","product/views/Storage.yaml","product/views/StorageCluster.yaml","product/views/StorageFile-debris_files.yaml","product/views/StorageFile-disk_files.yaml","product/views/StorageFile-files.yaml","product/views/StorageFile-snapshot_files.yaml","product/views/StorageFile-vm_misc_files.yaml","product/views/StorageFile-vm_ram_files.yaml","product/views/StorageManager.yaml","product/views/SystemService-filesystem_drivers.yaml","product/views/SystemService-kernel_drivers.yaml","product/views/SystemService-linux_initprocesses.yaml","product/views/SystemService-win32_services.yaml","product/views/SystemService.yaml","product/views/Tenant.yaml","product/views/User.yaml","product/views/Vm-all_vms.yaml","product/views/Vm-VmReconfigureRequest.yaml","product/views/Vm.yaml","product/views/Vm__restricted.yaml","product/views/VmdbDatabaseConnection.yaml","product/views/VmdbDatabaseSetting.yaml","product/views/VmdbIndex.yaml","product/views/VmdbTableEvm.yaml","product/views/VmOrTemplate-all_archived.yaml","product/views/VmOrTemplate-all_orphaned.yaml","product/views/VmOrTemplate-all_vms_and_templates.yaml","product/views/VmOrTemplate.yaml","product/views/Vsc.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/binary_blob_hash.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/binary_blob_obj.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/miq_report_hash.yaml","spec/migrations/data/20150625220141_fix_serialized_reports_for_rails_four_spec/miq_report_obj.yaml","spec/models/rss_feed/data/newest_vms.yml"]' http_version: recorded_at: Tue, 07 Feb 2017 10:41:22 GMT - request: