Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add alert statuses on ext_management_system #13324

Merged
merged 1 commit into from
Jan 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/models/ext_management_system.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def self.supported_types_and_descriptions_hash
has_many :policy_events, -> { order "timestamp" }, :class_name => "PolicyEvent", :foreign_key => "ems_id"

has_many :blacklisted_events, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
has_many :miq_alert_statuses, :foreign_key => "ems_id"
has_many :ems_folders, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
has_many :ems_clusters, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
has_many :resource_pools, :foreign_key => "ems_id", :dependent => :destroy, :inverse_of => :ext_management_system
Expand Down
1 change: 1 addition & 0 deletions app/models/miq_alert.rb
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ def evaluate(target, inputs = {})
def add_status_post_evaluate(target, result)
status = miq_alert_statuses.find_or_initialize_by(:resource => target)
status.result = result
status.ems_id = target.try(:ems_id)
status.evaluated_on = Time.now.utc
status.save
miq_alert_statuses << status
Expand Down
1 change: 1 addition & 0 deletions app/models/miq_alert_status.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ class MiqAlertStatus < ApplicationRecord
has_ancestry
belongs_to :miq_alert
belongs_to :resource, :polymorphic => true
belongs_to :ext_management_system
has_many :miq_alert_status_actions, -> { order "created_at" }, :dependent => :destroy
virtual_column :assignee, :type => :string

Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20170110090935_add_ems_to_miq_alert_status.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddEmsToMiqAlertStatus < ActiveRecord::Migration[5.0]
def change
add_column :miq_alert_statuses, :ems_id, :bigint
end
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migration LGTM

16 changes: 16 additions & 0 deletions db/migrate/20170115140217_update_ems_in_miq_alert_status.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
class UpdateEmsInMiqAlertStatus < ActiveRecord::Migration[5.0]
class MiqAlertStatus < ActiveRecord::Base; end

def up
say_with_time("update ems_id in miq alert statuses") do
%w(vms hosts ems_clusters container_images).each do |alert_resource|
arel_table = Arel::Table.new(alert_resource.to_sym)
klass_name = alert_resource.classify
klass_name = 'VmOrTemplate' if alert_resource == 'vms'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

join_sql = arel_table.project(arel_table[:ems_id])
.where(arel_table[:id].eq(MiqAlertStatus.arel_table[:resource_id])).to_sql
MiqAlertStatus.where(:resource_type => klass_name).update_all("ems_id = (#{join_sql})")
end
end
end
end
1 change: 1 addition & 0 deletions db/schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4827,6 +4827,7 @@ miq_alert_statuses:
- severity
- ancestry
- acknowledged
- ems_id
miq_alerts:
- id
- guid
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
require_migration

describe UpdateEmsInMiqAlertStatus do
let(:miq_alert_status_stub) { migration_stub(:MiqAlertStatus) }

migration_context :up do
it 'it sets ems_id for vms' do
ext = FactoryGirl.create(:ext_management_system)
vm = FactoryGirl.create(:vm_cloud, :ext_management_system => ext)
miq_alert_status = miq_alert_status_stub.create!(:resource_type => "VmOrTemplate", :resource_id => vm.id)
expect(miq_alert_status.ems_id).to be_nil
migrate
expect(miq_alert_status.reload.ems_id).to eq(ext.id)
end
end
end