diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-20 18:19:03 +0300 |
commit | 14bd84b61276ef29b97d23642d698de769bacfd2 (patch) | |
tree | f9eba90140c1bd874211dea17750a0d422c04080 /app/helpers/groups | |
parent | 891c388697b2db0d8ee0c8358a9bdbf6dc56d581 (diff) |
Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42
Diffstat (limited to 'app/helpers/groups')
-rw-r--r-- | app/helpers/groups/observability_helper.rb | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/app/helpers/groups/observability_helper.rb b/app/helpers/groups/observability_helper.rb index 6cd6566cee1..7661817da7b 100644 --- a/app/helpers/groups/observability_helper.rb +++ b/app/helpers/groups/observability_helper.rb @@ -22,19 +22,8 @@ module Groups }.freeze def observability_iframe_src(group) - # Format: https://observe.gitlab.com/GROUP_ID - - # When running Observability UI in standalone mode (i.e. not backed by Observability Backend) - # the group-id is not required. This is mostly used for local dev - base_url = ENV['STANDALONE_OBSERVABILITY_UI'] == 'true' ? observability_url : "#{observability_url}/-/#{group.id}" - - sanitized_path = if params[:observability_path] && sanitize(params[:observability_path]) != '' - CGI.unescapeHTML(sanitize(params[:observability_path])) - else - observability_config_for(params).fetch(:path) - end - - "#{base_url}#{sanitized_path}" + Gitlab::Observability.build_full_url(group, params[:observability_path], + observability_config_for(params).fetch(:path)) end def observability_page_title @@ -43,10 +32,6 @@ module Groups private - def observability_url - Gitlab::Observability.observability_url - end - def observability_config_for(params) ACTION_TO_PATH.fetch(params[:action], ACTION_TO_PATH['dashboards']) end |