diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /app/serializers/cluster_entity.rb | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
download | gitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'app/serializers/cluster_entity.rb')
-rw-r--r-- | app/serializers/cluster_entity.rb | 10 |
1 files changed, 8 insertions, 2 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 |