Add latest changes from gitlab-org/gitlab@master

2 files changed, 42 insertions, 0 deletions

diff --git a/config/metrics/objects_schemas/batched_background_migrations_metric.json b/config/metrics/objects_schemas/batched_background_migrations_metric.json
new file mode 100644
index 00000000000..968e804f600
--- /dev/null
+++ b/config/metrics/objects_schemas/batched_background_migrations_metric.json
@@ -0,0 +1,18 @@
+{
+  "type": "array",
+  "items": {
+    "type": [
+      {
+        "type": "object",
+        "properties": {
+          "job_class_name": {
+            "type": "string"
+          },
+          "elapsed_time": {
+            "type": "integer"
+          }
+        }
+      }
+    ]
+  }
+}
diff --git a/config/metrics/settings/20230602180038_batched_background_migrations_metric.yml b/config/metrics/settings/20230602180038_batched_background_migrations_metric.yml
new file mode 100644
index 00000000000..aa96cb8da50
--- /dev/null
+++ b/config/metrics/settings/20230602180038_batched_background_migrations_metric.yml
@@ -0,0 +1,24 @@
+---
+key_path: batched_background_migrations_metric
+name: "batched_background_migrations"
+description: "Tracks the execution time of batched background migrations"
+product_section: enablement
+product_stage: data_stores
+product_group: database
+value_type: object
+status: active
+milestone: "16.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122510
+time_frame: 7d
+data_source: database
+data_category: optional
+instrumentation_class: BatchedBackgroundMigrationsMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+value_json_schema: "config/metrics/objects_schemas/batched_background_migrations_metric.json"