summaryrefslogtreecommitdiff
path: root/app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-17 03:07:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-17 03:07:10 +0000
commit9bf8cb8d34039f3cef9e1b2f812ce634f2bebe69 (patch)
treec1e4d7a8dc008004b3e3861a4d8f6d9439ffabf8 /app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb
parente91080371b32e69d038b3a94261688c09dbcd641 (diff)
downloadgitlab-ce-9bf8cb8d34039f3cef9e1b2f812ce634f2bebe69.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb')
-rw-r--r--app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb b/app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb
index ea9fd2de961..6a24a7308b7 100644
--- a/app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb
+++ b/app/controllers/concerns/metrics/dashboard/prometheus_api_proxy.rb
@@ -9,6 +9,8 @@ module Metrics::Dashboard::PrometheusApiProxy
end
def prometheus_proxy
+ return not_found if Feature.enabled?(:remove_monitor_metrics)
+
variable_substitution_result =
proxy_variable_substitution_service.new(proxyable, permit_params).execute