diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 18:09:32 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 18:09:32 +0000 |
| commit | ed5add1c2f001c9bd54e664b32f212de172eca6a (patch) | |
| tree | f9449cbecde36706f25a62f426b5398566ae5cca /app/models/prometheus_alert.rb | |
| parent | de2fb5b82c92c90f90ed67ced45143c04e934fb8 (diff) | |
| download | gitlab-ce-ed5add1c2f001c9bd54e664b32f212de172eca6a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/prometheus_alert.rb')
| -rw-r--r-- | app/models/prometheus_alert.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/prometheus_alert.rb b/app/models/prometheus_alert.rb index a1303f59129..fbc0281296f 100644 --- a/app/models/prometheus_alert.rb +++ b/app/models/prometheus_alert.rb @@ -56,7 +56,8 @@ class PrometheusAlert < ApplicationRecord "for" => "5m", "labels" => { "gitlab" => "hook", - "gitlab_alert_id" => prometheus_metric_id + "gitlab_alert_id" => prometheus_metric_id, + "gitlab_prometheus_alert_id" => id } } end |