Add latest changes from gitlab-org/gitlab@master

3 files changed, 110 insertions, 0 deletions

diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index eac5e643b2e..7c2d341b779 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -332,6 +332,16 @@ configuration option in `gitlab.yml`. These metrics are served from the
 | `geo_dependency_proxy_blob_verification_total`   | Gauge   | 15.6  | Number of dependency proxy blobs verifications tried on secondary | |
 | `geo_dependency_proxy_blob_verified`             | Gauge   | 15.6  | Number of dependency proxy blobs verified on secondary | |
 | `geo_dependency_proxy_blob_verification_failed`  | Gauge   | 15.6  | Number of dependency proxy blobs verifications failed on secondary | |
+| `geo_dependency_proxy_manifests`                     | Gauge   | 15.6  | Number of dependency proxy manifests on primary | `url` |
+| `geo_dependency_proxy_manifests_checksum_total`      | Gauge   | 15.6  | Number of dependency proxy manifests tried to checksum on primary | `url` |
+| `geo_dependency_proxy_manifests_checksummed`         | Gauge   | 15.6  | Number of dependency proxy manifests successfully checksummed on primary | `url` |
+| `geo_dependency_proxy_manifests_checksum_failed`     | Gauge   | 15.6  | Number of dependency proxy manifests failed to calculate the checksum on primary | `url` |
+| `geo_dependency_proxy_manifests_synced`              | Gauge   | 15.6  | Number of syncable dependency proxy manifests synced on secondary | `url` |
+| `geo_dependency_proxy_manifests_failed`              | Gauge   | 15.6  | Number of syncable dependency proxy manifests failed to sync on secondary | `url` |
+| `geo_dependency_proxy_manifests_registry`            | Gauge   | 15.6  | Number of dependency proxy manifests in the registry | `url` |
+| `geo_dependency_proxy_manifests_verification_total`  | Gauge   | 15.6  | Number of dependency proxy manifests verifications tried on secondary | `url` |
+| `geo_dependency_proxy_manifests_verified`            | Gauge   | 15.6  | Number of dependency proxy manifests verified on secondary | `url` |
+| `geo_dependency_proxy_manifests_verification_failed` | Gauge   | 15.6  | Number of dependency proxy manifests verifications failed on secondary | `url` |
 
 ## Database load balancing metrics **(PREMIUM SELF)**
 
diff --git a/doc/api/geo_nodes.md b/doc/api/geo_nodes.md
index 00380e1624b..6b62e82f54d 100644
--- a/doc/api/geo_nodes.md
+++ b/doc/api/geo_nodes.md
@@ -523,6 +523,18 @@ Example response:
     "container_repositories_registry_count": 5,
     "container_repositories_synced_in_percentage": "100.00%",
     "container_repositories_synced_missing_on_primary_count": 0,
+    "dependency_proxy_manifests_count": 5,
+    "dependency_proxy_manifests_checksum_total_count": 5,
+    "dependency_proxy_manifests_checksummed_count": 5,
+    "dependency_proxy_manifests_checksum_failed_count": 5,
+    "dependency_proxy_manifests_synced_count": 5,
+    "dependency_proxy_manifests_failed_count": 0,
+    "dependency_proxy_manifests_registry_count": 5,
+    "dependency_proxy_manifests_verification_total_count": 5,
+    "dependency_proxy_manifests_verified_count": 5,
+    "dependency_proxy_manifests_verification_failed_count": 5,
+    "dependency_proxy_manifests_synced_in_percentage": "100.00%",
+    "dependency_proxy_manifests_verified_in_percentage": "100.00%"
   },
   {
     "geo_node_id": 2,
@@ -707,6 +719,18 @@ Example response:
     "container_repositories_registry_count": 5,
     "container_repositories_synced_in_percentage": "100.00%",
     "container_repositories_synced_missing_on_primary_count": 0,
+    "dependency_proxy_manifests_count": 5,
+    "dependency_proxy_manifests_checksum_total_count": 5,
+    "dependency_proxy_manifests_checksummed_count": 5,
+    "dependency_proxy_manifests_checksum_failed_count": 5,
+    "dependency_proxy_manifests_synced_count": 5,
+    "dependency_proxy_manifests_failed_count": 0,
+    "dependency_proxy_manifests_registry_count": 5,
+    "dependency_proxy_manifests_verification_total_count": 5,
+    "dependency_proxy_manifests_verified_count": 5,
+    "dependency_proxy_manifests_verification_failed_count": 5,
+    "dependency_proxy_manifests_synced_in_percentage": "100.00%",
+    "dependency_proxy_manifests_verified_in_percentage": "100.00%"
   }
 ]
 ```
@@ -901,6 +925,18 @@ Example response:
   "container_repositories_registry_count": 5,
   "container_repositories_synced_in_percentage": "100.00%",
   "container_repositories_synced_missing_on_primary_count": 0,
+  "dependency_proxy_manifests_count": 5,
+  "dependency_proxy_manifests_checksum_total_count": 5,
+  "dependency_proxy_manifests_checksummed_count": 5,
+  "dependency_proxy_manifests_checksum_failed_count": 5,
+  "dependency_proxy_manifests_synced_count": 5,
+  "dependency_proxy_manifests_failed_count": 0,
+  "dependency_proxy_manifests_registry_count": 5,
+  "dependency_proxy_manifests_verification_total_count": 5,
+  "dependency_proxy_manifests_verified_count": 5,
+  "dependency_proxy_manifests_verification_failed_count": 5,
+  "dependency_proxy_manifests_synced_in_percentage": "100.00%",
+  "dependency_proxy_manifests_verified_in_percentage": "100.00%"
 }
 ```
 
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 3d22277e0f2..647246705ed 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -7367,6 +7367,29 @@ The edge type for [`DependencyProxyManifest`](#dependencyproxymanifest).
 | <a id="dependencyproxymanifestedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
 | <a id="dependencyproxymanifestedgenode"></a>`node` | [`DependencyProxyManifest`](#dependencyproxymanifest) | The item at the end of the edge. |
 
+#### `DependencyProxyManifestRegistryConnection`
+
+The connection type for [`DependencyProxyManifestRegistry`](#dependencyproxymanifestregistry).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="dependencyproxymanifestregistryconnectionedges"></a>`edges` | [`[DependencyProxyManifestRegistryEdge]`](#dependencyproxymanifestregistryedge) | A list of edges. |
+| <a id="dependencyproxymanifestregistryconnectionnodes"></a>`nodes` | [`[DependencyProxyManifestRegistry]`](#dependencyproxymanifestregistry) | A list of nodes. |
+| <a id="dependencyproxymanifestregistryconnectionpageinfo"></a>`pageInfo` | [`PageInfo!`](#pageinfo) | Information to aid in pagination. |
+
+#### `DependencyProxyManifestRegistryEdge`
+
+The edge type for [`DependencyProxyManifestRegistry`](#dependencyproxymanifestregistry).
+
+##### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="dependencyproxymanifestregistryedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. |
+| <a id="dependencyproxymanifestregistryedgenode"></a>`node` | [`DependencyProxyManifestRegistry`](#dependencyproxymanifestregistry) | The item at the end of the edge. |
+
 #### `DeploymentConnection`
 
 The connection type for [`Deployment`](#deployment).
@@ -11804,6 +11827,25 @@ Dependency proxy manifest.
 | <a id="dependencyproxymanifeststatus"></a>`status` | [`DependencyProxyManifestStatus!`](#dependencyproxymanifeststatus) | Status of the manifest (default, pending_destruction, processing, error). |
 | <a id="dependencyproxymanifestupdatedat"></a>`updatedAt` | [`Time!`](#time) | Date of most recent update. |
 
+### `DependencyProxyManifestRegistry`
+
+Represents the Geo replication and verification state of a dependency_proxy_manifest.
+
+#### Fields
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="dependencyproxymanifestregistrycreatedat"></a>`createdAt` | [`Time`](#time) | Timestamp when the DependencyProxyManifestRegistry was created. |
+| <a id="dependencyproxymanifestregistrydependencyproxymanifestid"></a>`dependencyProxyManifestId` | [`ID!`](#id) | ID of the Dependency Proxy Manifest. |
+| <a id="dependencyproxymanifestregistryid"></a>`id` | [`ID!`](#id) | ID of the DependencyProxyManifestRegistry. |
+| <a id="dependencyproxymanifestregistrylastsyncfailure"></a>`lastSyncFailure` | [`String`](#string) | Error message during sync of the DependencyProxyManifestRegistry. |
+| <a id="dependencyproxymanifestregistrylastsyncedat"></a>`lastSyncedAt` | [`Time`](#time) | Timestamp of the most recent successful sync of the DependencyProxyManifestRegistry. |
+| <a id="dependencyproxymanifestregistryretryat"></a>`retryAt` | [`Time`](#time) | Timestamp after which the DependencyProxyManifestRegistry is resynced. |
+| <a id="dependencyproxymanifestregistryretrycount"></a>`retryCount` | [`Int`](#int) | Number of consecutive failed sync attempts of the DependencyProxyManifestRegistry. |
+| <a id="dependencyproxymanifestregistrystate"></a>`state` | [`RegistryState`](#registrystate) | Sync state of the DependencyProxyManifestRegistry. |
+| <a id="dependencyproxymanifestregistryverificationretryat"></a>`verificationRetryAt` | [`Time`](#time) | Timestamp after which the DependencyProxyManifestRegistry is reverified. |
+| <a id="dependencyproxymanifestregistryverifiedat"></a>`verifiedAt` | [`Time`](#time) | Timestamp of the most recent successful verification of the DependencyProxyManifestRegistry. |
+
 ### `DependencyProxySetting`
 
 Group-level Dependency Proxy settings.
@@ -13001,6 +13043,28 @@ four standard [pagination arguments](#connection-pagination-arguments):
 | <a id="geonodedependencyproxyblobregistriesreplicationstate"></a>`replicationState` | [`ReplicationStateEnum`](#replicationstateenum) | Filters registries by their replication state. |
 | <a id="geonodedependencyproxyblobregistriesverificationstate"></a>`verificationState` | [`VerificationStateEnum`](#verificationstateenum) | Filters registries by their verification state. |
 
+##### `GeoNode.dependencyProxyManifestRegistries`
+
+Find Dependency Proxy Manifest registries on this Geo node. Ignored if `geo_dependency_proxy_manifest_replication` feature flag is disabled.
+
+WARNING:
+**Introduced** in 15.6.
+This feature is in Alpha. It can be changed or removed at any time.
+
+Returns [`DependencyProxyManifestRegistryConnection`](#dependencyproxymanifestregistryconnection).
+
+This field returns a [connection](#connections). It accepts the
+four standard [pagination arguments](#connection-pagination-arguments):
+`before: String`, `after: String`, `first: Int`, `last: Int`.
+
+###### Arguments
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| <a id="geonodedependencyproxymanifestregistriesids"></a>`ids` | [`[ID!]`](#id) | Filters registries by their ID. |
+| <a id="geonodedependencyproxymanifestregistriesreplicationstate"></a>`replicationState` | [`ReplicationStateEnum`](#replicationstateenum) | Filters registries by their replication state. |
+| <a id="geonodedependencyproxymanifestregistriesverificationstate"></a>`verificationState` | [`VerificationStateEnum`](#verificationstateenum) | Filters registries by their verification state. |
+
 ##### `GeoNode.groupWikiRepositoryRegistries`
 
 Find group wiki repository registries on this Geo node.