Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/sidebars/projects/menus/monitor_menu.rb b/lib/sidebars/projects/menus/monitor_menu.rb
index 23e1a95c401..ecd062f333e 100644
--- a/lib/sidebars/projects/menus/monitor_menu.rb
+++ b/lib/sidebars/projects/menus/monitor_menu.rb
@@ -6,7 +6,7 @@ module Sidebars
       class MonitorMenu < ::Sidebars::Menu
         override :configure_menu_items
         def configure_menu_items
-          return false unless context.project.feature_available?(:operations, context.current_user)
+          return false unless feature_enabled?
 
           add_item(metrics_dashboard_menu_item)
           add_item(error_tracking_menu_item)
@@ -41,6 +41,14 @@ module Sidebars
 
         private
 
+        def feature_enabled?
+          if ::Feature.enabled?(:split_operations_visibility_permissions, context.project)
+            context.project.feature_available?(:monitor, context.current_user)
+          else
+            context.project.feature_available?(:operations, context.current_user)
+          end
+        end
+
         def metrics_dashboard_menu_item
           unless can?(context.current_user, :metrics_dashboard, context.project)
             return ::Sidebars::NilMenuItem.new(item_id: :metrics)