Merge pull request #14295 from moolitayer/mas_model_changes

Miq Alert Status model changes for resolved alerts

app/models/miq_alert_status.rb

@@ -1,9 +1,6 @@
-require 'ancestry'
-
 class MiqAlertStatus < ApplicationRecord
   SEVERITY_LEVELS = %w(error warning info).freeze
 
-  has_ancestry
   belongs_to :miq_alert
   belongs_to :resource, :polymorphic => true
   belongs_to :ext_management_system

db/migrate/20170309111313_add_resolved_to_alerts.rb

@@ -0,0 +1,5 @@
+class AddResolvedToAlerts < ActiveRecord::Migration[5.0]
+  def change
+    add_column :miq_alert_statuses, :resolved, :boolean
+  end
+end

db/migrate/20170309125642_add_alert_ems_ref.rb

@@ -0,0 +1,6 @@
+class AddAlertEmsRef < ActiveRecord::Migration[5.0]
+  def change
+    add_column :miq_alert_statuses, :event_ems_ref, :string
+    add_index :miq_alert_statuses, :event_ems_ref
+  end
+end

db/migrate/20170313160354_remove_ancestry_from_alerts.rb

@@ -0,0 +1,6 @@
+class RemoveAncestryFromAlerts < ActiveRecord::Migration[5.0]
+  def change
+    remove_index  :miq_alert_statuses, :ancestry
+    remove_column :miq_alert_statuses, :ancestry, :string
+  end
+end

db/schema.yml

@@ -4868,10 +4868,11 @@ miq_alert_statuses:
 - result
 - url
 - severity
-- ancestry
 - acknowledged
 - ems_id
 - description
+- resolved
+- event_ems_ref
 miq_alerts:
 - id
 - guid