diff options
author | James Lopez <james@gitlab.com> | 2019-04-04 07:31:24 +0000 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2019-04-04 07:31:24 +0000 |
commit | a6a3eb813fab81359ed0b81a25929d10766d25dc (patch) | |
tree | a3dc6dee42630b6c1829381bdb933a8bfdb27a7d /app/controllers | |
parent | d0a0d3d3d5043d1497a5cd42e6c6bc073f6a5b58 (diff) | |
parent | ab1e1b55a84ffc6b09233a6831be9bdc77c05115 (diff) | |
download | gitlab-ce-a6a3eb813fab81359ed0b81a25929d10766d25dc.tar.gz |
Merge branch 'support-time-windows-api' into 'master'
Support time window parameters in additional metrics endpoint
See merge request gitlab-org/gitlab-ce!26228
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/environments_controller.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index e9cd475a199..4fa6cd94ae5 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -10,6 +10,9 @@ class Projects::EnvironmentsController < Projects::ApplicationController before_action :environment, only: [:show, :edit, :update, :stop, :terminal, :terminal_websocket_authorize, :metrics] before_action :verify_api_request!, only: :terminal_websocket_authorize before_action :expire_etag_cache, only: [:index] + before_action only: [:metrics, :additional_metrics] do + push_frontend_feature_flag(:metrics_time_window) + end def index @environments = project.environments @@ -146,7 +149,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController def additional_metrics respond_to do |format| format.json do - additional_metrics = environment.additional_metrics || {} + additional_metrics = environment.additional_metrics(*metrics_params) || {} render json: additional_metrics, status: additional_metrics.any? ? :ok : :no_content end @@ -186,6 +189,13 @@ class Projects::EnvironmentsController < Projects::ApplicationController @environment ||= project.environments.find(params[:id]) end + def metrics_params + return unless Feature.enabled?(:metrics_time_window, project) + return unless params[:start].present? || params[:end].present? + + params.require([:start, :end]).values_at(:start, :end) + end + def search_environment_names return [] unless params[:query] |