Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 3 deletions

diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb
index e2d24e74b29..df72a994143 100644
--- a/app/serializers/cluster_entity.rb
+++ b/app/serializers/cluster_entity.rb
@@ -19,7 +19,7 @@ class ClusterEntity < Grape::Entity
     Clusters::ClusterPresenter.new(cluster).show_path # rubocop: disable CodeReuse/Presenter
   end
 
-  expose :gitlab_managed_apps_logs_path do |cluster|
+  expose :gitlab_managed_apps_logs_path, if: -> (*) { logging_enabled? } do |cluster|
     Clusters::ClusterPresenter.new(cluster, current_user: request.current_user).gitlab_managed_apps_logs_path # rubocop: disable CodeReuse/Presenter
   end
 
@@ -27,7 +27,13 @@ class ClusterEntity < Grape::Entity
     Clusters::KubernetesErrorEntity.new(cluster)
   end
 
-  expose :enable_advanced_logs_querying do |cluster|
+  expose :enable_advanced_logs_querying, if: -> (*) { logging_enabled? } do |cluster|
     cluster.elastic_stack_available?
   end
+
+  private
+
+  def logging_enabled?
+    Feature.enabled?(:monitor_logging, object.project)
+  end
 end
diff --git a/app/serializers/environment_entity.rb b/app/serializers/environment_entity.rb
index 634be365a9d..ac99463bd64 100644
--- a/app/serializers/environment_entity.rb
+++ b/app/serializers/environment_entity.rb
@@ -103,7 +103,8 @@ class EnvironmentEntity < Grape::Entity
   end
 
   def can_read_pod_logs?
-    can?(current_user, :read_pod_logs, environment.project)
+    Feature.enabled?(:monitor_logging, environment.project) &&
+      can?(current_user, :read_pod_logs, environment.project)
   end
 
   def can_read_deploy_board?