Merge branch 'fix-metric-schema' into 'master'

Make milestone a string in metrics schema

See merge request gitlab-org/gitlab!55140

config/metrics/counts_28d/20210201124930_deployments.yml

@@ -7,7 +7,7 @@ product_group: group::ops release
 product_category:
 value_type: number
 status: data_available
-milestone: 13.2
+milestone: "13.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
 time_frame: 28d
 data_source: database

config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml

@@ -8,7 +8,7 @@ product_group: group::product planning
 product_category: issue_tracking
 value_type: number
 status: implemented
-milestone: 13.10
+milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
 data_source: redis_hll

config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml

@@ -8,7 +8,7 @@ product_group: group::product planning
 product_category: issue_tracking
 value_type: number
 status: implemented
-milestone: 13.10
+milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
 data_source: redis_hll

config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml

@@ -7,7 +7,7 @@ product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
-milestone: 13.6
+milestone: "13.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 time_frame: 7d
 data_source: redis_hll

config/metrics/counts_all/20210201124934_deployments.yml

@@ -6,7 +6,7 @@ product_stage: release
 product_group: group::ops release
 value_type: number
 status: data_available
-milestone: 8.12
+milestone: "8.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
 time_frame: all
 data_source: database

config/metrics/license/20210201124932_recorded_at.yml

@@ -7,7 +7,7 @@ product_group: group::product intelligence
 product_category: collection
 value_type: string
 status: data_available
-milestone: 8.10
+milestone: "8.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 time_frame: none
 data_source: ruby

config/metrics/license/20210201124933_uuid.yml

@@ -7,7 +7,7 @@ product_group: group::product intelligence
 product_category: collection
 value_type: string
 status: data_available
-milestone: 9.1
+milestone: "9.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
 time_frame: none
 data_source: database

config/metrics/schema.json

@@ -29,10 +29,12 @@
       "enum": ["data_available", "planned", "in_progress", "implemented", "not_used", "deprecated"]
     },
     "milestone": {
-      "type": ["number", "null"]
+      "type": ["string", "null"],
+      "pattern": "^[0-9]+\\.[0-9]+$"
     },
     "milestone_removed": {
-      "type": ["number", "null"]
+      "type": ["string", "null"],
+      "pattern": "^[0-9]+\\.[0-9]+$"
     },
     "introduced_by_url": {
       "type": ["string", "null"]

doc/development/usage_ping/dictionary.md

@@ -11211,7 +11211,7 @@ When the Usage Ping computation was started
 | `product_category` | `collection` |
 | `value_type` | string |
 | `status` | data_available |
-| `milestone` | 8.1 |
+| `milestone` | 8.10 |
 | `introduced_by_url` | [Introduced by](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557) |
 | `time_frame` | none |
 | `data_source` | Ruby |
@@ -17653,7 +17653,7 @@ Missing description
 | `product_category` | `issue_tracking` |
 | `value_type` | number |
 | `status` | implemented |
-| `milestone` | 13.1 |
+| `milestone` | 13.10 |
 | `introduced_by_url` | [Introduced by](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264) |
 | `time_frame` | 28d |
 | `data_source` | Redis_hll |
@@ -17674,7 +17674,7 @@ Missing description
 | `product_category` | `issue_tracking` |
 | `value_type` | number |
 | `status` | implemented |
-| `milestone` | 13.1 |
+| `milestone` | 13.10 |
 | `introduced_by_url` | [Introduced by](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264) |
 | `time_frame` | 28d |
 | `data_source` | Redis_hll |

ee/config/metrics/counts_all/20210201124936_geo_nodes.yml

@@ -6,7 +6,7 @@ product_group: group::geo
 product_category: disaster_recovery
 value_type: number
 status: data_available
-milestone: 11.2
+milestone: "11.2"
 time_frame: all
 data_source: database
 distribution:

generator_templates/usage_metric_definition/metric_definition.yml

@@ -8,7 +8,7 @@ product_group:
 product_category:
 value_type: <%= value_type %>
 status: implemented
-milestone: <%= milestone %>
+milestone: "<%= milestone %>"
 introduced_by_url:
 time_frame: <%= time_frame %>
 data_source: