Add latest changes from gitlab-org/gitlab@master

4 files changed, 47 insertions, 15 deletions

diff --git a/db/docs/analytics_dashboards_pointers.yml b/db/docs/analytics_dashboards_pointers.yml
index b554911d3ad..37cb7e82805 100644
--- a/db/docs/analytics_dashboards_pointers.yml
+++ b/db/docs/analytics_dashboards_pointers.yml
@@ -3,8 +3,17 @@ table_name: analytics_dashboards_pointers
 classes:
 - Analytics::DashboardsPointer
 feature_categories:
-  - devops_reports
-description: Stores project link with configuration files for Analytics Dashboards group feature.
+- devops_reports
+description: Stores project link with configuration files for Analytics Dashboards
+  group feature.
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107673
 milestone: '15.8'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  target_project_id: projects
diff --git a/db/post_migrate/20240118190758_remove_ignored_columns_from_geo_node_statuses.rb b/db/post_migrate/20240118190758_remove_ignored_columns_from_geo_node_statuses.rb
new file mode 100644
index 00000000000..0a5f2f5d274
--- /dev/null
+++ b/db/post_migrate/20240118190758_remove_ignored_columns_from_geo_node_statuses.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+class RemoveIgnoredColumnsFromGeoNodeStatuses < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+
+  milestone '16.9'
+
+  IGNORED_COLLUMNS = [
+    :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
+  ]
+
+  def up
+    IGNORED_COLLUMNS.each do |column_name|
+      remove_column :geo_node_statuses, column_name, if_exists: true
+    end
+  end
+
+  def down
+    IGNORED_COLLUMNS.each do |column_name|
+      add_column :geo_node_statuses, column_name, :integer, if_not_exists: true
+    end
+  end
+end
diff --git a/db/schema_migrations/20240118190758 b/db/schema_migrations/20240118190758
new file mode 100644
index 00000000000..076999958ff
--- /dev/null
+++ b/db/schema_migrations/20240118190758
@@ -0,0 +1 @@
+78738644f53046494ba1f4a8e49ed9effc8147c8563e311bf3744a31a33449c6
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index a4efb7a734c..d9ceb1e6a9a 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -17301,9 +17301,6 @@ CREATE TABLE geo_node_statuses (
     id integer NOT NULL,
     geo_node_id integer NOT NULL,
     db_replication_lag_seconds integer,
-    lfs_objects_count integer,
-    lfs_objects_synced_count integer,
-    lfs_objects_failed_count integer,
     last_event_id bigint,
     last_event_date timestamp without time zone,
     cursor_last_event_id bigint,
@@ -17315,19 +17312,10 @@ CREATE TABLE geo_node_statuses (
     replication_slots_count integer,
     replication_slots_used_count integer,
     replication_slots_max_retained_wal_bytes bigint,
-    job_artifacts_count integer,
-    job_artifacts_synced_count integer,
-    job_artifacts_failed_count integer,
     version character varying,
     revision character varying,
-    lfs_objects_synced_missing_on_primary_count integer,
-    job_artifacts_synced_missing_on_primary_count integer,
     storage_configuration_digest bytea,
     projects_count integer,
-    container_repositories_count integer,
-    container_repositories_synced_count integer,
-    container_repositories_failed_count integer,
-    container_repositories_registry_count integer,
     status jsonb DEFAULT '{}'::jsonb NOT NULL
 );