Fix group level and names for miq event

app/models/ems_event.rb

@@ -10,14 +10,18 @@ class EmsEvent < EventStream
     'Rename_Task',
   ]
 
+  CLASS_GROUP_LEVELS = %i[critical warning].freeze
+
   def self.description
     _("Management Events")
   end
 
+  def self.class_group_levels
+    CLASS_GROUP_LEVELS
+  end
+
   def self.group_names_and_levels
-    result = {:description => description}
-    event_groups.each_with_object(result) do |(group_name, group_details), hash|
-      hash[:group_names] ||= {}
+    event_groups.each_with_object(default_group_names_and_levels) do |(group_name, group_details), hash|
       hash[:group_names][group_name] = group_details[:name]
 
       group_details.each_key do |level|

app/models/event_stream.rb

@@ -35,13 +35,21 @@ class EventStream < ApplicationRecord
 
   after_commit :emit_notifications, :on => :create
 
-  # TODO: Consider moving since this is EmsEvent specific. group, group_level and group_name exposed as a virtual columns for reports/api.
-  GROUP_LEVELS = %i(critical detail warning).freeze
+  DEFAULT_GROUP_NAME  = :other
+  DEFAULT_GROUP_LEVEL = :detail
 
   def self.description
     raise NotImplementedError, "Description must be implemented in a subclass"
   end
 
+  def self.class_group_levels
+    []
+  end
+
+  def self.group_levels
+    class_group_levels + [DEFAULT_GROUP_LEVEL]
+  end
+
   def emit_notifications
     Notification.emit_for_event(self)
   rescue => err
@@ -64,29 +72,29 @@ def self.event_groups
 
   # TODO: Consider moving since this is EmsEvent specific. group, group_level and group_name exposed as a virtual columns for reports/api.
   def self.group_and_level(event_type)
-    level = :detail # the level is detail as default
+    level = DEFAULT_GROUP_LEVEL # the level is detail as default
     egroups = event_groups
 
     group = egroups.detect do |_, value|
-      GROUP_LEVELS
+      group_levels
         .detect { |lvl| value[lvl]&.any? { |typ| !typ.starts_with?("/") && typ == event_type } }
         .tap { |level_found| level = level_found || level }
     end&.first
 
     group ||= egroups.detect do |_, value|
-      GROUP_LEVELS
+      group_levels
         .detect { |lvl| value[lvl]&.any? { |typ| typ.starts_with?("/") && Regexp.new(typ[1..-2]).match?(event_type) } }
         .tap { |level_found| level = level_found || level }
     end&.first
 
-    group ||= :other
+    group ||= DEFAULT_GROUP_NAME
     return group, level
   end
 
   def self.group_name(group)
     return if group.nil?
     group = event_groups[group.to_sym]
-    group.nil? ? 'Other' : group[:name]
+    group.nil? ? DEFAULT_GROUP_NAME.to_s.capitalize : group[:name]
   end
 
   # TODO: Consider moving since this is EmsEvent specific. group, group_level and group_name exposed as a virtual columns for reports/api.
@@ -112,6 +120,14 @@ def self.timeline_classes
     EventStream.subclasses.select { |e| e.respond_to?(:group_names_and_levels) }
   end
 
+  def self.default_group_names_and_levels
+    {
+      :description  => description,
+      :group_names  => {DEFAULT_GROUP_NAME => DEFAULT_GROUP_NAME.to_s.capitalize},
+      :group_levels => {}
+    }.freeze
+  end
+
   def self.timeline_options
     timeline_classes.map { |c| [c.name.to_sym, c.group_names_and_levels] }.to_h
   end

app/models/miq_event.rb

@@ -20,14 +20,26 @@ class MiqEvent < EventStream
                                         ContainerReplicator, ContainerGroup, ContainerProject,
                                         ContainerNode, ContainerImage, PhysicalServer].freeze
 
+  CLASS_GROUP_LEVELS = [MiqPolicy::CONDITION_SUCCESS, MiqPolicy::CONDITION_FAILURE].collect { |level| level.downcase.to_sym }
+
+  def self.description
+    _("Management Events")
+  end
+
+  def self.class_group_levels
+    CLASS_GROUP_LEVELS
+  end
+
   def self.description
     _("Policy Events")
   end
 
   def self.group_names_and_levels
-    hash = {:description => description}
-    hash[:group_names] = MiqEventDefinitionSet.all.pluck(:name, :description).to_h.symbolize_keys
-    hash[:group_levels] = [MiqPolicy::CONDITION_SUCCESS, MiqPolicy::CONDITION_FAILURE].index_by { |c| c.downcase.to_sym }
+    hash = default_group_names_and_levels
+    hash[:group_names].merge!(MiqEventDefinitionSet.all.pluck(:name, :description).to_h.symbolize_keys)
+    group_levels.each do |level|
+      hash[:group_levels][level] ||= level.to_s.capitalize
+    end
     hash
   end
 

spec/models/event_stream_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe EventStream do
   describe ".event_groups" do
     EventStream.event_groups.each do |group_name, group_data|
-      EventStream::GROUP_LEVELS.each do |level|
+      (EmsEvent.group_levels + MiqEvent.group_levels).each do |level|
         group_data[level]&.each do |typ|
           it ":#{group_name}/:#{level}/#{typ} is string or regex", :providers_common => true do
             expect(typ.kind_of?(Regexp) || typ.kind_of?(String)).to eq(true)
@@ -37,12 +37,16 @@
       expect(options[:EmsEvent].keys.sort).to eq %i[description group_levels group_names]
       expect(options[:EmsEvent][:description]).to eq(EmsEvent.description)
       expect(options[:EmsEvent][:group_levels].keys.sort).to eq %i[critical detail warning]
-      expect(options[:EmsEvent][:group_names].keys).to include(*%i[addition configuration console deletion devices])
+      expect(options[:EmsEvent][:group_levels].values.sort).to eq %w[Critical Detail Warning]
+      expect(options[:EmsEvent][:group_names].keys).to include(*%i[addition configuration console deletion devices other])
+      expect(options[:EmsEvent][:group_names].values).to include(*%w[Network Status Other])
 
       expect(options[:MiqEvent].keys.sort).to eq %i[description group_levels group_names]
       expect(options[:MiqEvent][:description]).to eq(MiqEvent.description)
-      expect(options[:MiqEvent][:group_levels].keys.sort).to eq %i[failure success]
-      expect(options[:MiqEvent][:group_names].keys).to include(*%i[auth_validation authentication compliance container_operations ems_operations evm_operations])
+      expect(options[:MiqEvent][:group_levels].keys.sort).to eq %i[detail failure success]
+      expect(options[:MiqEvent][:group_levels].values.sort).to eq %w[Detail Failure Success]
+      expect(options[:MiqEvent][:group_names].keys).to include(*%i[auth_validation authentication compliance container_operations ems_operations evm_operations other])
+      expect(options[:MiqEvent][:group_names].values).to include(*%w[Other Compliance])
     end
   end
 end