1 files changed, 19 insertions, 13 deletions
diff --git a/app/controllers/groups/observability_controller.rb b/app/controllers/groups/observability_controller.rb
index 5b6503494c4..4b1f2b582ce 100644
--- a/app/controllers/groups/observability_controller.rb
+++ b/app/controllers/groups/observability_controller.rb
@@ -9,35 +9,41 @@ module Groups
       default_frame_src = p.directives['frame-src'] || p.directives['default-src']
 
       # When ObservabilityUI is not authenticated, it needs to be able to redirect to the GL sign-in page, hence 'self'
-      frame_src_values = Array.wrap(default_frame_src) | [ObservabilityController.observability_url, "'self'"]
+      frame_src_values = Array.wrap(default_frame_src) | [observability_url, "'self'"]
 
       p.frame_src(*frame_src_values)
     end
 
-    before_action :check_observability_allowed, only: :index
+    before_action :check_observability_allowed
 
-    def index
-      # Format: https://observe.gitlab.com/-/GROUP_ID
-      @observability_iframe_src = "#{ObservabilityController.observability_url}/-/#{@group.id}"
+    def dashboards
+      render_observability
+    end
 
-      # Uncomment below for testing with local GDK
-      # @observability_iframe_src = "#{ObservabilityController.observability_url}/9970?groupId=14485840"
+    def manage
+      render_observability
+    end
 
-      render layout: 'group', locals: { base_layout: 'layouts/fullscreen' }
+    def explore
+      render_observability
     end
 
     private
 
+    def render_observability
+      render 'observability', layout: 'group', locals: { base_layout: 'layouts/fullscreen' }
+    end
+
     def self.observability_url
-      return ENV['OVERRIDE_OBSERVABILITY_URL'] if ENV['OVERRIDE_OBSERVABILITY_URL']
-      # TODO Make observability URL configurable https://gitlab.com/gitlab-org/opstrace/opstrace-ui/-/issues/80
-      return "https://staging.observe.gitlab.com" if Gitlab.staging?
+      Gitlab::Observability.observability_url
+    end
 
-      "https://observe.gitlab.com"
+    def observability_url
+      self.class.observability_url
     end
 
     def check_observability_allowed
-      return render_404 unless self.class.observability_url.present?
+      return render_404 unless observability_url.present?
 
       render_404 unless can?(current_user, :read_observability, @group)
     end