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.

Sign up for GitHub

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

Jump to bottom

Pass additional metadata from alert to event #14301

Merged
merged 1 commit into from
Mar 29, 2017
Merged

Pass additional metadata from alert to event #14301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions app/models/ems_event.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,13 @@ def self.first_chained_event(ems_id, chain_id)
end

def parse_event_metadata
data = full_data || {}
[
event_type == "datawarehouse_alert" ? message : nil,
full_data.try(:[], :severity),
full_data.try(:[], :url),
data[:severity],
data[:url],
data[:ems_ref],
data[:resolved],
]
end

Expand Down
5 changes: 4 additions & 1 deletion app/models/miq_alert.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,16 @@ def evaluate(target, inputs = {})
end

def add_status_post_evaluate(target, result, event)
status_description, severity, url = event.parse_event_metadata if event.respond_to?(:parse_event_metadata)
status_description, severity, url, ems_ref, resolved = event.try(:parse_event_metadata)
status = miq_alert_statuses.find_or_initialize_by(:resource => target)

status.result = result
status.ems_id = target.try(:ems_id)
status.description = status_description || description
status.severity = severity unless severity.blank?
status.url = url unless url.blank?
status.event_ems_ref = ems_ref unless ems_ref.blank?
status.resolved = resolved
status.evaluated_on = Time.now.utc
status.save
miq_alert_statuses << status
Expand Down