From 9deb1407534a59c65b5d7756aca57b552994c69b Mon Sep 17 00:00:00 2001
From: Jonas Larsen <jlarsen@gitlab.com>
Date: Tue, 20 Feb 2024 13:26:43 +0000
Subject: [PATCH] Remove format validation of product_group from json schema
Since the product groups will be validated against the current values
of stages.yml we don't need to worry about the format of the string in
the schema
---
...10216184517_p_ci_templates_5_min_production_app_monthly.yml | 2 +-
...210216184515_p_ci_templates_5_min_production_app_weekly.yml | 2 +-
config/metrics/schema/base.json | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index ee41e49bcad13..31fdc454dd226 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_mo
description: Number of projects using 5 min production app CI template in last 7 days.
product_section: seg
product_stage: deploy
-product_group: five_min_app
+product_group: 5-min-app
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index 7be982f8ef2f1..692597a2a98ff 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_we
description: Number of projects using 5 min production app CI template in last 7 days.
product_section: seg
product_stage: deploy
-product_group: five_min_app
+product_group: 5-min-app
value_type: number
status: removed
milestone_removed: '14.6'
diff --git a/config/metrics/schema/base.json b/config/metrics/schema/base.json
index 0d16a55c9fbfe..84953bdb64a9a 100644
--- a/config/metrics/schema/base.json
+++ b/config/metrics/schema/base.json
@@ -33,8 +33,7 @@
]
},
"product_group": {
- "type": "string",
- "pattern": "^$|^([a-z]+_)*[a-z]+$"
+ "type": "string"
},
"value_type": {
"type": "string",
--
GitLab