summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-10 23:02:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-10 23:02:09 +0000
commit8c21e23045073c07c43f4f4d9012ced728702e98 (patch)
treea14b5f617927e4f3419e599967eab727f4755491 /app/workers
parent0a3f1f55493660acfabd198d2e1649a881d8852b (diff)
downloadgitlab-ce-8c21e23045073c07c43f4f4d9012ced728702e98.tar.gz
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/incident_management/process_alert_worker.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/workers/incident_management/process_alert_worker.rb b/app/workers/incident_management/process_alert_worker.rb
index bc23dbda693..5d5c10014f8 100644
--- a/app/workers/incident_management/process_alert_worker.rb
+++ b/app/workers/incident_management/process_alert_worker.rb
@@ -29,7 +29,11 @@ module IncidentManagement
end
def parsed_payload(alert)
- Gitlab::Alerting::NotificationPayloadParser.call(alert.payload.to_h, alert.project)
+ if alert.prometheus?
+ alert.payload
+ else
+ Gitlab::Alerting::NotificationPayloadParser.call(alert.payload.to_h, alert.project)
+ end
end
def create_issue_for(alert)