Commit 6d40bfe3 authored by Peter Leitzen's avatar Peter Leitzen Committed by Nick Thomas

Remove feature flag incident_management

After we introduced the Ghost user we can safely
make incident_management generally available.
parent 2e92d2ba
......@@ -158,7 +158,7 @@ receivers:
### Taking action on an alert **[ULTIMATE]**
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/4925) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.9.
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/4925) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.10.
Alerts can be used to trigger actions, like open an issue automatically. To configure the actions:
......@@ -172,25 +172,6 @@ Once enabled, an issue will be opened automatically when an alert is triggered.
If the metric exceeds the threshold of the alert for over 5 minutes, an email will be sent to all [Maintainers and Owners](../../permissions.md#project-members-permissions) of the project.
**Note:**
If you are running a self-managed instance, the new interface shown on
this page will not be available unless the feature flag
`incident_management` is enabled, which can be done from the Rails console by
instance administrators.
Use these commands to start the Rails console:
```sh
# Omnibus GitLab
gitlab-rails console
# Installation from source
cd /home/git/gitlab
sudo -u git -H bin/rails console RAILS_ENV=production
```
Then run `Feature.enable(:incident_management)` to enable the feature flag.
## Determining the performance impact of a merge
> [Introduced][ce-10408] in GitLab 9.2.
......
......@@ -50,16 +50,8 @@ module EE
project.feature_available?(:tracing, current_user)
end
def has_incident_management_license?
project.feature_available?(:incident_management, current_user)
end
def incident_management_feature_enabled?
::Feature.enabled?(:incident_management)
end
def incident_management_available?
incident_management_feature_enabled? && has_incident_management_license?
project.feature_available?(:incident_management, current_user)
end
end
......
......@@ -19,16 +19,8 @@ module Projects
private
def has_incident_management_license?
project.feature_available?(:incident_management)
end
def incident_management_feature_enabled?
Feature.enabled?(:incident_management)
end
def incident_management_available?
has_incident_management_license? && incident_management_feature_enabled?
project.feature_available?(:incident_management)
end
def incident_management_setting
......
---
title: Remove feature flag `:incident_management`
merge_request: 10569
author:
type: added
......@@ -392,16 +392,6 @@ describe Projects::Settings::OperationsController do
it_behaves_like 'user without write access', :internal, :maintainer
end
context 'with incident_management feature flag disabled' do
before do
stub_feature_flags(incident_management: false)
end
it_behaves_like 'user without write access', :public, :maintainer
it_behaves_like 'user without write access', :private, :maintainer
it_behaves_like 'user without write access', :internal, :maintainer
end
private
def update_project(project, tracing_params: nil, incident_management_params: nil)
......
......@@ -110,8 +110,6 @@ describe Projects::Prometheus::Alerts::NotifyService do
with_them do
before do
stub_feature_flags(incident_management: false)
cluster = create(:cluster, :provided_by_user,
projects: [project],
enabled: cluster_enabled)
......@@ -151,8 +149,6 @@ describe Projects::Prometheus::Alerts::NotifyService do
end
before do
stub_feature_flags(incident_management: false)
stub_licensed_features(multiple_clusters: true)
create(:clusters_applications_prometheus, :installed,
......@@ -193,8 +189,6 @@ describe Projects::Prometheus::Alerts::NotifyService do
let(:alert_manager_token) { token_input }
before do
stub_feature_flags(incident_management: false)
create(:prometheus_service, project: project)
if alerting_setting
......@@ -215,18 +209,6 @@ describe Projects::Prometheus::Alerts::NotifyService do
end
end
context 'incident_management feature flag disabled' do
before do
create(:prometheus_service, project: project)
create(:project_alerting_setting, project: project, token: token)
create(:project_incident_management_setting, send_email: true, project: project)
stub_feature_flags(incident_management: false)
end
it_behaves_like 'notifies alerts'
end
context 'no incident_management license' do
before do
create(:prometheus_service, project: project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment