diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-30 00:09:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-30 00:09:23 +0300 |
commit | ab593c8ded443f7ade3540ff8dac69ee51bc74fd (patch) | |
tree | 1fb8b2e194747f135d8610cd4b77766ac458b3a7 /app/serializers | |
parent | 860efb35e24e07a1a22bcafcddb5f0409d40354c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/cluster_entity.rb | 14 | ||||
-rw-r--r-- | app/serializers/cluster_serializer.rb | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/app/serializers/cluster_entity.rb b/app/serializers/cluster_entity.rb index df72a994143..8e256863bcd 100644 --- a/app/serializers/cluster_entity.rb +++ b/app/serializers/cluster_entity.rb @@ -19,21 +19,7 @@ class ClusterEntity < Grape::Entity Clusters::ClusterPresenter.new(cluster).show_path # rubocop: disable CodeReuse/Presenter end - 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 - expose :kubernetes_errors do |cluster| Clusters::KubernetesErrorEntity.new(cluster) end - - 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/cluster_serializer.rb b/app/serializers/cluster_serializer.rb index f71591612a6..30b8863efa2 100644 --- a/app/serializers/cluster_serializer.rb +++ b/app/serializers/cluster_serializer.rb @@ -10,8 +10,6 @@ class ClusterSerializer < BaseSerializer :cluster_type, :enabled, :environment_scope, - :gitlab_managed_apps_logs_path, - :enable_advanced_logs_querying, :id, :kubernetes_errors, :name, |