7 files changed, 11 insertions, 33 deletions
diff --git a/config/metrics/counts_28d/deployments.yml b/config/metrics/counts_28d/deployments.yml
index dabd50ef5be..02d620c214e 100644
--- a/config/metrics/counts_28d/deployments.yml
+++ b/config/metrics/counts_28d/deployments.yml
@@ -1,11 +1,8 @@
-name: deployments
+key_path: counts_monthly.deployments
 description: Total deployments count for recent 28 days
 value_type: integer
 stage: release
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: counts_monthy.deployments
 milestone: 13.2
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
 group: 'group::ops release'
diff --git a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
index 997263f9e30..5f8492f13c1 100644
--- a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
@@ -1,12 +1,9 @@
-name: g_project_management_issue_title_changed_weekly
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
 description: Distinct users count that changed issue title in a group for last recent week
 value_type: integer
 product_category: issue_tracking
 stage: plan
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
 milestone: 13.6
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 group: 'group::project management'
diff --git a/config/metrics/counts_all/deployments.yml b/config/metrics/counts_all/deployments.yml
index bb78e8d6144..abddb09c3dd 100644
--- a/config/metrics/counts_all/deployments.yml
+++ b/config/metrics/counts_all/deployments.yml
@@ -1,11 +1,8 @@
-name: deployments
+key_path: counts.deployments
 description: Total deployments count
 value_type: integer
 stage: release
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: counts.deployments
 milestone: 8.12
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
 group: 'group::ops release'
diff --git a/config/metrics/license/recorded_at.yml b/config/metrics/license/recorded_at.yml
index 5b2b3b37290..0ffb65de671 100644
--- a/config/metrics/license/recorded_at.yml
+++ b/config/metrics/license/recorded_at.yml
@@ -1,12 +1,9 @@
-name: recorded_at
+key_path: recorded_at
 description: When the Usage Ping computation was started
 value_type: string
 product_category: collection
 stage: growth
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: recorded_at
 milestone: 8.10
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 group: group::product analytics
diff --git a/config/metrics/license/uuid.yml b/config/metrics/license/uuid.yml
index 38e0d74fc22..86b38a26cbc 100644
--- a/config/metrics/license/uuid.yml
+++ b/config/metrics/license/uuid.yml
@@ -1,13 +1,9 @@
-name: uuid
+key_path: uuid
 description: GitLab instance unique identifier
 value_type: string
 product_category: collection
 stage: growth
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: uuid
-  generation_2: license.uuid
 milestone: 9.1
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
 group: group::product analytics
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index 4d1120a7d8d..d9a53c88e5d 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -1,8 +1,8 @@
 {
   "type": "object",
-  "required": ["name", "description", "value_type", "status", "default_generation", "full_path", "group", "time_frame", "data_source", "distribution", "tier"],
+  "required": ["key_path", "description", "value_type", "status", "group", "time_frame", "data_source", "distribution", "tier"],
   "properties": {
-    "name": {
+    "key_path": {
       "type": "string"
     },
     "description": {
@@ -22,12 +22,6 @@
       "type": ["string"],
       "enum": ["data_available", "planned", "in_progress", "implmented"]
     },
-    "default_generation": {
-      "type": "string"
-    },
-    "full_path": {
-      "type": "object"
-    },
     "milestone": {
       "type": ["number", "null"]
     },
@@ -61,6 +55,9 @@
         "type": "string",
         "enum": ["free", "starter", "premium", "ultimate", "bronze", "silver", "gold"]
       }
+    },
+    "skip_validation": {
+      "type": "boolean"
     }
   }
 }
diff --git a/config/metrics/settings/database_adapter.yml b/config/metrics/settings/database_adapter.yml
index b24fc933a08..b80906ab025 100644
--- a/config/metrics/settings/database_adapter.yml
+++ b/config/metrics/settings/database_adapter.yml
@@ -1,12 +1,9 @@
-name: adapter
+key_path: database.adapter
 description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
 value_type: string
 product_category: collection
 stage: growth
 status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: database.adapter
 group: group::enablement distribution
 time_frame: none
 data_source: database