summaryrefslogtreecommitdiff
path: root/lib/gitlab/alert_management/alert_params.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
commit85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch)
tree9160f299afd8c80c038f08e1545be119f5e3f1e1 /lib/gitlab/alert_management/alert_params.rb
parent15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff)
downloadgitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'lib/gitlab/alert_management/alert_params.rb')
-rw-r--r--lib/gitlab/alert_management/alert_params.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/alert_management/alert_params.rb b/lib/gitlab/alert_management/alert_params.rb
index 84a75e62ecf..3bb839c1114 100644
--- a/lib/gitlab/alert_management/alert_params.rb
+++ b/lib/gitlab/alert_management/alert_params.rb
@@ -20,8 +20,10 @@ module Gitlab
hosts: Array(annotations[:hosts]),
payload: payload,
started_at: parsed_payload['startsAt'],
+ ended_at: parsed_payload['endsAt'],
severity: annotations[:severity],
- fingerprint: annotations[:fingerprint]
+ fingerprint: annotations[:fingerprint],
+ environment: annotations[:environment]
}
end