diff --git a/ee/app/models/geo_node_status.rb b/ee/app/models/geo_node_status.rb index 2ea0919bf90d039a320746840a4a8294d01491c1..206fab45161c8973eb750c0b98cb00e3941cacd8 100644 --- a/ee/app/models/geo_node_status.rb +++ b/ee/app/models/geo_node_status.rb @@ -1,28 +1,8 @@ # frozen_string_literal: true class GeoNodeStatus < ApplicationRecord - include IgnorableColumns include ShaAttribute - ignore_columns( - %i[ - container_repositories_count - container_repositories_failed_count - container_repositories_registry_count - container_repositories_synced_count - job_artifacts_count - job_artifacts_failed_count - job_artifacts_synced_count - job_artifacts_synced_missing_on_primary_count - lfs_objects_count - lfs_objects_failed_count - lfs_objects_synced_count - lfs_objects_synced_missing_on_primary_count - ], - remove_with: '16.7', - remove_after: '2023-11-22' - ) - belongs_to :geo_node delegate :selective_sync_type, to: :geo_node diff --git a/ee/lib/gitlab/geo/geo_node_status_check.rb b/ee/lib/gitlab/geo/geo_node_status_check.rb index 64f4d7e506517b029d31a11c176628d6f8309289..f5f240577d7772503e4bb65091d16a8ba9a4077f 100644 --- a/ee/lib/gitlab/geo/geo_node_status_check.rb +++ b/ee/lib/gitlab/geo/geo_node_status_check.rb @@ -24,7 +24,6 @@ def print_status print_geo_role print_node_health_status - print_container_repositories_status print_replicators_status print_repositories_checked_status print_replicators_verification_status @@ -38,7 +37,6 @@ def print_status end def print_replication_verification_status - print_container_repositories_status print_replicators_status print_replicators_verification_status end @@ -73,10 +71,6 @@ def conditional_replication_and_verification_checks_status !Gitlab::Geo.secondary? status.push current_node_status.repositories_checked_in_percentage end - - if ::Geo::ContainerRepositoryRegistry.replication_enabled? && current_node_status.container_repositories_count.to_i > 0 - status.push current_node_status.container_repositories_synced_in_percentage - end end end @@ -180,18 +174,6 @@ def print_replicators_status end end - def print_container_repositories_status - if ::Geo::ContainerRepositoryRegistry.replication_enabled? - print_counts_row( - description: 'Container repositories', - failed: current_node_status.container_repositories_failed_count, - succeeded: current_node_status.container_repositories_synced_count, - total: current_node_status.container_repositories_count, - percentage: current_node_status.container_repositories_synced_in_percentage - ) - end - end - def print_repositories_checked_status return unless Gitlab::Geo.primary? return unless Gitlab::CurrentSettings.repository_checks_enabled diff --git a/ee/spec/tasks/geo_rake_spec.rb b/ee/spec/tasks/geo_rake_spec.rb index 94d967e85b5568437ea0d94bc8ba429af0d69a4d..7edd46d6930da632630c97e932ce3ac227995d0f 100644 --- a/ee/spec/tasks/geo_rake_spec.rb +++ b/ee/spec/tasks/geo_rake_spec.rb @@ -179,8 +179,6 @@ /Health Status: /, /Sync Settings: /, /Database replication lag: /, - /Uploads: /, - /Container repositories: /, /Last event ID seen from primary: /, /Last status report was: / ] + self_service_framework_checks