Merge pull request ManageIQ#15354 from moolitayer/add_monitoring_manager

Add monitoring manager

.rubocop_local.yml

@@ -16,6 +16,7 @@ GlobalVars:
   - $rhevm_log
   - $kube_log
   - $mw_log
+  - $cn_monitoring_log
   - $scvmm_log
   - $vim_log
   - $websocket_log

app/models/manageiq/providers/container_manager.rb

@@ -1,6 +1,7 @@
 module ManageIQ::Providers
   class ContainerManager < BaseManager
     include AvailabilityMixin
+    include HasMonitoringManagerMixin
     include SupportsFeatureMixin
 
     has_many :container_nodes, :foreign_key => :ems_id, :dependent => :destroy

app/models/manageiq/providers/monitoring_manager.rb

@@ -0,0 +1,11 @@
+module ManageIQ::Providers
+  class MonitoringManager < BaseManager
+    def self.ems_type
+      "monitoring".freeze
+    end
+
+    def self.description
+      "Monitoring Manager".freeze
+    end
+  end
+end

app/models/miq_region.rb

@@ -185,6 +185,10 @@ def ems_datawarehouses
     ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::DatawarehouseManager }
   end
 
+  def ems_monitors
+    ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::MonitoringManager }
+  end
+
   def ems_configproviders
     ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::ConfigurationManager }
   end

app/models/mixins/has_monitoring_manager_mixin.rb

@@ -0,0 +1,21 @@
+module HasMonitoringManagerMixin
+  extend ActiveSupport::Concern
+
+  private
+
+  def ensure_monitoring_manager
+    # monitoring_manager should be defined by child classes.
+    if try(:monitoring_manager_needed?)
+      build_monitoring_manager(:parent_manager => self)
+      monitoring_manager.name = "#{name} Monitoring Manager"
+    end
+    ensure_monitoring_manager_properties
+  end
+
+  def ensure_monitoring_manager_properties
+    if monitoring_manager
+      monitoring_manager.zone_id = zone_id
+      monitoring_manager.provider_region = provider_region
+    end
+  end
+end

app/models/zone.rb

@@ -146,6 +146,10 @@ def ems_datawarehouses
     ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::DatawarehouseManager }
   end
 
+  def ems_monitors
+    ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::MonitoringManager }
+  end
+
   def ems_configproviders
     ext_management_systems.select { |e| e.kind_of? ManageIQ::Providers::ConfigurationManager }
   end

config/permissions.tmpl.yml

@@ -35,6 +35,7 @@
 - ems-type:gce_network
 - ems-type:hawkular
 - ems-type:hawkular_datawarehouse
+- ems-type:monitoring # removed in https://github.com/ManageIQ/manageiq/pull/15506
 - ems-type:kubernetes
 - ems-type:lenovo_ph_infra
 - ems-type:nuage_network

config/settings.yml

@@ -857,6 +857,7 @@
   :level_rails: info
   :level_lenovo: info
   :level_mw: info
+  :level_cn_monitoring: info
   :level_kube: info
   :level_api: info
   :level_fog: info

lib/vmdb/loggers.rb

@@ -26,6 +26,7 @@ def self.apply_config(config)
       apply_config_value(config, $kube_log,          :level_kube)
       apply_config_value(config, $mw_log,            :level_mw)
       apply_config_value(config, $datawarehouse_log, :level_datawarehouse)
+      apply_config_value(config, $cn_monitoring_log, :level_cn_monitoring)
       apply_config_value(config, $scvmm_log,         :level_scvmm)
       apply_config_value(config, $api_log,           :level_api)
       apply_config_value(config, $fog_log,           :level_fog)
@@ -52,6 +53,7 @@ def self.create_loggers
       $kube_log          = create_multicast_logger(path_dir.join("kubernetes.log"))
       $mw_log            = create_multicast_logger(path_dir.join("middleware.log"))
       $datawarehouse_log = create_multicast_logger(path_dir.join("datawarehouse.log"))
+      $cn_monitoring_log = create_multicast_logger(path_dir.join("container_monitoring.log"))
       $scvmm_log         = create_multicast_logger(path_dir.join("scvmm.log"))
       $azure_log         = create_multicast_logger(path_dir.join("azure.log"))
       $api_log           = create_multicast_logger(path_dir.join("api.log"))

spec/models/ext_management_system_spec.rb

@@ -34,6 +34,7 @@
       "hawkular_datawarehouse"      => "Hawkular Datawarehouse",
       "kubernetes"                  => "Kubernetes",
       "openshift"                   => "OpenShift",
+      "monitoring"                  => "Monitoring Manager", # removed in https://github.com/ManageIQ/manageiq/pull/15506
       "openstack"                   => "OpenStack",
       "openstack_infra"             => "OpenStack Platform Director",
       "openstack_network"           => "OpenStack Network",