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