diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 09:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 09:09:21 +0300 |
| commit | 3c97422b098235bca250f738922dab9c861f0ee7 (patch) | |
| tree | 5b3a1b25c5e203b6fb9ab569c578d745f93aff0a /app/services/alert_management | |
| parent | 38c3d3255398d615cf93867cb82902c3d2cb65a5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/alert_management')
| -rw-r--r-- | app/services/alert_management/process_prometheus_alert_service.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/app/services/alert_management/process_prometheus_alert_service.rb b/app/services/alert_management/process_prometheus_alert_service.rb index 545c5581f72..0591376bcdf 100644 --- a/app/services/alert_management/process_prometheus_alert_service.rb +++ b/app/services/alert_management/process_prometheus_alert_service.rb @@ -32,23 +32,6 @@ module AlertManagement super end - override :process_firing_alert - def process_firing_alert - super - - reset_alert_status - end - - def reset_alert_status - return if alert.trigger - - logger.warn( - message: 'Unable to update AlertManagement::Alert status to triggered', - project_id: project.id, - alert_id: alert.id - ) - end - override :incoming_payload def incoming_payload strong_memoize(:incoming_payload) do |