diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-08 20:06:24 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-08 20:06:24 +0000 |
| commit | 0e456465d16d23e68096231cf9e45ea1064e9294 (patch) | |
| tree | 6df0fba2035f66f75a31a396ca5a7f28ebd8f48b | |
| parent | 6bd2db0e4ca9e1c87f5b1778253d1414de2added (diff) | |
| parent | cfcaac7badd030a2bc605660e9af98cd60a10176 (diff) | |
| download | gitlab-ce-0e456465d16d23e68096231cf9e45ea1064e9294.tar.gz | |
Merge branch 'enable-prom-endpoint-by-default' into 'master'
Enable the prometheus endpoint by default
See merge request gitlab-org/gitlab-ce!31565
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 07eb689d031..b709ac85e39 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -11,7 +11,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController before_action :verify_api_request!, only: :terminal_websocket_authorize before_action :expire_etag_cache, only: [:index] before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do - push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint) + push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint, default_enabled: true) push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards) push_frontend_feature_flag(:environment_metrics_additional_panel_types) push_frontend_feature_flag(:prometheus_computed_alerts) |