diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-30 06:09:55 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-30 06:09:55 +0000 |
commit | 0629b103246d6c8b24e753f62ccfc8649df2c315 (patch) | |
tree | 7a68ccda8a1fbd1728bdbf97f636801843a7bdf1 /app/workers/incident_management | |
parent | 2dfc1088178535959894aff4e80edb8936b9dedf (diff) | |
download | gitlab-ce-0629b103246d6c8b24e753f62ccfc8649df2c315.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/incident_management')
-rw-r--r-- | app/workers/incident_management/process_alert_worker.rb | 6 |
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 9a8cc93c660..26c86a3aa2b 100644 --- a/app/workers/incident_management/process_alert_worker.rb +++ b/app/workers/incident_management/process_alert_worker.rb @@ -30,7 +30,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) |