diff --git a/doc/api/geo_nodes.md b/doc/api/geo_nodes.md index 402170fba3768a3b782efa5b46c1c1aab3f014b8..ba970d2cdb199fc342d91ad8a2d8dd7144e4b450 100644 --- a/doc/api/geo_nodes.md +++ b/doc/api/geo_nodes.md @@ -325,9 +325,11 @@ Example response: "design_repositories_failed_count": nil, "design_repositories_synced_in_percentage": "0.00%", "projects_count": 41, + "repositories_count": 41, "repositories_failed_count": nil, "repositories_synced_count": nil, "repositories_synced_in_percentage": "0.00%", + "wikis_count": 41, "wikis_failed_count": nil, "wikis_synced_count": nil, "wikis_synced_in_percentage": "0.00%", @@ -402,9 +404,11 @@ Example response: "design_repositories_failed_count": nil, "design_repositories_synced_in_percentage": "0.00%", "projects_count": 41, + "repositories_count": 41, "repositories_failed_count": 1, "repositories_synced_count": 40, "repositories_synced_in_percentage": "97.56%", + "wikis_count": 41, "wikis_failed_count": 0, "wikis_synced_count": 41, "wikis_synced_in_percentage": "100.00%", @@ -448,9 +452,6 @@ Example response: ] ``` -NOTE: **Note:** -In GitLab 12.0, deprecated fields `wikis_count` and `repositories_count` were removed. Use `projects_count` instead. - ## Retrieve status about a specific Geo node ```plaintext @@ -495,9 +496,11 @@ Example response: "design_repositories_failed_count": nil, "design_repositories_synced_in_percentage": "0.00%", "projects_count": 41, + "repositories_count": 41, "repositories_failed_count": 1, "repositories_synced_count": 40, "repositories_synced_in_percentage": "97.56%", + "wikis_count": 41, "wikis_failed_count": 0, "wikis_synced_count": 41, "wikis_synced_in_percentage": "100.00%", @@ -517,9 +520,6 @@ Example response: Note: The `health_status` parameter can only be in an "Healthy" or "Unhealthy" state, while the `health` parameter can be empty, "Healthy", or contain the actual error message. -NOTE: **Note:** -In GitLab 12.0, deprecated fields `wikis_count` and `repositories_count` were removed. Use `projects_count` instead. - ## Retrieve project sync or verification failures that occurred on the current node This only works on a secondary node. diff --git a/ee/changelogs/unreleased/228722_01-re-add-project-and-wiki-counts.yml b/ee/changelogs/unreleased/228722_01-re-add-project-and-wiki-counts.yml new file mode 100644 index 0000000000000000000000000000000000000000..3aa3540f868fb76e24e95ddbef2f2fc8ed97dcc0 --- /dev/null +++ b/ee/changelogs/unreleased/228722_01-re-add-project-and-wiki-counts.yml @@ -0,0 +1,5 @@ +--- +title: Geo API - Expose repositories_count and wikis_count +merge_request: 38361 +author: +type: changed diff --git a/ee/lib/ee/api/entities/geo_node_status.rb b/ee/lib/ee/api/entities/geo_node_status.rb index ee4cb269bca7e63e80161aec3a9e4556ef6a5dba..af932641002dc5ccdd6a61252293eb383088c1dc 100644 --- a/ee/lib/ee/api/entities/geo_node_status.rb +++ b/ee/lib/ee/api/entities/geo_node_status.rb @@ -19,6 +19,10 @@ class GeoNodeStatus < Grape::Entity end end + # Aliased from :project_count + expose :repositories_count + expose :wikis_count + expose :replication_slots_count expose :replication_slots_used_count diff --git a/ee/spec/factories/geo_node_statuses.rb b/ee/spec/factories/geo_node_statuses.rb index f16364b04e46fa5b8f24fe8205c76014068b2ecc..fc3be5b0205d804c46adb6030b075c5ad82f47f4 100644 --- a/ee/spec/factories/geo_node_statuses.rb +++ b/ee/spec/factories/geo_node_statuses.rb @@ -27,8 +27,10 @@ design_repositories_failed_count { 3 } design_repositories_synced_count { 200 } projects_count { 10 } + repositories_count { 10 } repositories_synced_count { 5 } repositories_failed_count { 0 } + wikis_count { 10 } wikis_synced_count { 4 } wikis_failed_count { 1 } repositories_checksummed_count { 600 } diff --git a/ee/spec/fixtures/api/schemas/public_api/v4/geo_node_status.json b/ee/spec/fixtures/api/schemas/public_api/v4/geo_node_status.json index 5dd41fbba8425ddaa4a8cbe4155dceb8da211f31..8740e91cb8c2490884b024e8872f78387be17d80 100644 --- a/ee/spec/fixtures/api/schemas/public_api/v4/geo_node_status.json +++ b/ee/spec/fixtures/api/schemas/public_api/v4/geo_node_status.json @@ -33,8 +33,10 @@ "design_repositories_synced_count", "repositories_replication_enabled", "projects_count", + "repositories_count", "repositories_failed_count", "repositories_synced_count", + "wikis_count", "wikis_failed_count", "wikis_synced_count", "repository_verification_enabled", @@ -113,10 +115,12 @@ "design_repositories_synced_in_percentage": { "type": "string" }, "repositories_replication_enabled": { "type": ["boolean", "null"] }, "projects_count": { "type": "integer" }, + "repositories_count": { "type": "integer" }, "repositories_failed_count": { "type": ["integer", "null"] }, "repository_verification_enabled": { "type": ["boolean", "null"] }, "repositories_synced_count": { "type": ["integer", "null"] }, "repositories_synced_in_percentage": { "type": "string" }, + "wikis_count": { "type": "integer" }, "wikis_failed_count": { "type": ["integer", "null"] }, "wikis_synced_count": { "type": ["integer", "null"] }, "wikis_synced_in_percentage": { "type": "string" },