Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyasonik <syasonik@gitlab.com>2019-04-11 08:58:18 +0300
committersyasonik <syasonik@gitlab.com>2019-04-24 13:23:03 +0300
commita2920682ec307b9aa830903014139948cdbb9b1f (patch)
tree0538f32dafcb794e2fc6ead9a45a6b576862f80c /app/controllers/projects
parent6735f4c705ac6a08ac0b5e847c9f197b81c8502a (diff)
Add inital dashboard endpoint support
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/environments_controller.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index e35f34be23c..41fe70052ce 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -12,6 +12,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
before_action :expire_etag_cache, only: [:index]
before_action only: [:metrics, :additional_metrics] do
push_frontend_feature_flag(:metrics_time_window)
+ push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint)
+ push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards)
end
def index
@@ -156,6 +158,18 @@ class Projects::EnvironmentsController < Projects::ApplicationController
end
end
+ def metrics_dashboard
+ access_denied! unless Feature.enabled?(:environment_metrics_use_prometheus_endpoint, project)
+
+ respond_to do |format|
+ format.json do
+ dashboard = MetricsDashboardService.new(@project).find(params[:dashboard])
+
+ render json: dashboard, status: :ok
+ end
+ end
+ end
+
def search
respond_to do |format|
format.json do