Add latest changes from gitlab-org/gitlab@master

165 files changed, 0 insertions, 165 deletions

diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
index d4bca957360..e5d08397792 100644
--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Composer packages published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
index 8c312a52af0..2abc15afbc1 100644
--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Conan packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index 5e56465dbd4..57b851d7240 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of container images published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index 828e3662601..6a5f5010b3d 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Debian packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
index 6233c2339de..7c0748dd38b 100644
--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of generic packages published to the registry using
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 3df457db03b..4b9d7df0c7c 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Go modules published to the registry using a depl
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
index 8485e4013f3..b2bcc111441 100644
--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Maven packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
index 7d8c3585aa2..e4fe75251dd 100644
--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of npm packages published to the registry using a de
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
index f2a0460bc27..48a08d9924c 100644
--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of NuGet packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
index a0c74b4f002..84cbb71a20c 100644
--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of Python packages published to the registry using a
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index 27863bdde3d..9478f660aac 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a package tag to the re
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 967e8e5888e..ff92a09009a 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of unique users who published packages to the regist
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
index 85bacdd8f17..e7972ef2de0 100644
--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a Composer package to t
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
index 78e2ad69fe8..ef942bfa457 100644
--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Conan package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index 3ecf501dc1b..1ddb6cdbfa4 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a container image to th
 product_section: ops
 product_stage: package
 product_group: package
-product_category: container registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index e71927d20ee..22e130b9969 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Debian package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index fe0b86aaa07..34e43412396 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a generic package to th
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index cfda35c0968..32270cd0e3b 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Go module to the regi
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
index fabc6d05016..9b838d2ff36 100644
--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Maven package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
index f48c0a9a506..e8c047d80d6 100644
--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published an npm package to the r
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
index bd4b8b006ec..900dbcbaa39 100644
--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a NuGet package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
index 5c52ee9137d..36959afc983 100644
--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a Python package to the
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index b934af222a8..6ab0f4f992e 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -6,7 +6,6 @@ description: A weekly count of users that have published a package with a tag to
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: removed
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index d5576772b91..f22a975b1ae 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -5,7 +5,6 @@ description: A weekly count of users that have published a package to the regist
 product_section: ops
 product_stage: package
 product_group: package
-product_category: package registry
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
index 4601cfb0860..453ed4a0a7a 100644
--- a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
+++ b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
index 8b2c8de3e40..f01d96f1292 100644
--- a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
+++ b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
index 3f10b6c28ef..d82b85be2a3 100644
--- a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
+++ b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
index 70f7ac7f736..3b25a67cf83 100644
--- a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
+++ b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
index 26d3d7780f4..6f58352d03e 100644
--- a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
+++ b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
index 5d22da58b33..bb12ebf8378 100644
--- a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
+++ b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
index f0bf840127f..be1e433ea87 100644
--- a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
+++ b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
index e191ce5b162..203d04e7c80 100644
--- a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
+++ b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
index 1659cb016ab..1206ac024d7 100644
--- a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
+++ b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
index 438f0eb337a..09cabad7dbb 100644
--- a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
+++ b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
index 33a4ec10464..f0363fa7f4e 100644
--- a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
index ca61949b607..407ab183d3c 100644
--- a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
index 1d4f411e4fa..5341e78877b 100644
--- a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
+++ b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
index 97cd0ecd07d..53104524987 100644
--- a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
index 0fb29c0c686..8b75aa27857 100644
--- a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
+++ b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
index 424aaebc483..b87657c5af2 100644
--- a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
index f6c5386cc45..46c8613b2ba 100644
--- a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
+++ b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
index 2947546da57..db6898b684d 100644
--- a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
index bfe8a69c98b..dceffd56578 100644
--- a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
index 589f51e1582..d542b08ce0a 100644
--- a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
index 89edc13d128..e9c424fe1c3 100644
--- a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
index b6925668794..21fe8bab6b4 100644
--- a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
index dbf739de6e3..c4491d08304 100644
--- a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
index 4718fe841d1..92c796ecadd 100644
--- a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
index 84f33f2548c..c69df0778d8 100644
--- a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
index 38c0485f8e1..c79d88ecd5f 100644
--- a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
index f4954107d43..70ba9d17d4f 100644
--- a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
index 8998597261b..59b0eeb67d8 100644
--- a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
index 6216a39d9f7..84a41a66490 100644
--- a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
index b7fd799f8a6..bfccf092dbd 100644
--- a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone_removed: '15.0'
diff --git a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
index 0ff048bd50a..a7d65bf5c9e 100644
--- a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
index 91f7fd8a29f..91d5e7c871f 100644
--- a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
index 7e1a97b3d78..c4506a4c6c5 100644
--- a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
+++ b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
index 3a739ac16eb..29a7f26c3b4 100644
--- a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
+++ b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
index 12b2d3445e3..12724c83211 100644
--- a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
index 5161260f733..6a38808ac08 100644
--- a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
+++ b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
index 6771363d4f0..300e49eb20f 100644
--- a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
+++ b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
index f0597215cdb..378ab408e35 100644
--- a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
+++ b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
index e5ee6349a68..03f5b0e89e2 100644
--- a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
index c36507c86c1..bf2c2adb645 100644
--- a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
index 4f994b3b21e..b937905a07f 100644
--- a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
+++ b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
index b93751d3c30..df1e2f09f10 100644
--- a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
+++ b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
index b1dbd64ae25..efc6d93fbec 100644
--- a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
+++ b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
index 7b813f3c1c8..3b6a20534ff 100644
--- a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
index 833a103b424..fcb52d878fe 100644
--- a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
+++ b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
index 5ca5b632ed7..1842d0679e7 100644
--- a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
+++ b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
index 060893ca349..83929a5ff83 100644
--- a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
+++ b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
index b297836dbf5..292a5d6a0e0 100644
--- a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
+++ b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
index bdc019f53bc..5b81fbf7911 100644
--- a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
+++ b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
index 5eeb0b587f7..d43e4dabf23 100644
--- a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
+++ b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
index be803873da2..536ac4f3215 100644
--- a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
+++ b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
index 02848df7032..cb492c65d2f 100644
--- a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
+++ b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
index 31f8f31344f..f79d5d9ae90 100644
--- a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
index 1df7de7867f..ae5529149a4 100644
--- a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
index ffee4a62bef..c264b754d40 100644
--- a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
+++ b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
index b9601085fe1..f347141b4b5 100644
--- a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
+++ b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
index 3efb9e7e435..b2449cc62f3 100644
--- a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
index efdab0f1c35..df2b7395e18 100644
--- a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
index 878e5d1f08b..f2e7c316e21 100644
--- a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
index bc7c9914c31..18a68f4c026 100644
--- a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
index c627098b569..e4eddb4e80e 100644
--- a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
index 9997a733c84..7b1a3cf87fb 100644
--- a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
index 6286fb00725..ef42b0eeddc 100644
--- a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
index abe645e059a..9df544de7e7 100644
--- a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
index 3f3c491acf5..462ea74bde4 100644
--- a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
index f5036c5bd7c..9484d64ca90 100644
--- a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
index 80dfa5e52ee..e5f9d461145 100644
--- a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
index a0b5145dc32..e4896130935 100644
--- a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
index ffbac5590cc..2a4d00c417a 100644
--- a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
index c076bfed8f0..52782941af4 100644
--- a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
index 97d8bb1f7a8..020e9eebb38 100644
--- a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
index f14bd662bb4..93eb40f17bf 100644
--- a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
index 91e8e6d7126..694ba39e864 100644
--- a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
index 98d7cae5c2f..aa51bb8357e 100644
--- a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
index 8b2fb8cd127..bc2d67b0e66 100644
--- a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
+++ b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
index e641f623c60..7a5246477bd 100644
--- a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
+++ b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
index 1419e5894bb..97209c562ba 100644
--- a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
+++ b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
index d7d7e62b256..47baf8aa169 100644
--- a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
+++ b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
index 9a521247591..e5218cce3f6 100644
--- a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
+++ b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
index caca2d80d85..3271fbf5afa 100644
--- a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
+++ b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
index f87d5663cd0..ecdb7d8080f 100644
--- a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
+++ b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
index e5a5664aee3..7146f5fd802 100644
--- a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
+++ b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
index fa44a295b65..b0712342a6f 100644
--- a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
+++ b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
index 2adf9a396ef..dd0d9aabb5e 100644
--- a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
index a920ff72b7b..494714f0e7d 100644
--- a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
+++ b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
index 10183e79f80..b17e4e0a9a2 100644
--- a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
index 0d2e5ca9122..a000917f003 100644
--- a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
+++ b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
index 5cad30c5f0c..8eaf3968953 100644
--- a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
+++ b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
index 5fcd652a26a..188f8e0d48d 100644
--- a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
+++ b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
index f0f2afd434e..5b56c6d332a 100644
--- a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
+++ b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
index 3ca7a23618b..6a065c4c78b 100644
--- a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
+++ b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
index 6c8db9b7058..dcbc5f7d222 100644
--- a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
index 4a7c592cd09..42ce483cd1b 100644
--- a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
+++ b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
index d2942ef6f6b..b4c256d7642 100644
--- a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
+++ b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
index 307df73a622..c8428c46d2c 100644
--- a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
+++ b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
index 6624697c56c..3c9206498aa 100644
--- a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
+++ b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
index 97de705a4de..03d885facf3 100644
--- a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
+++ b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
index b89ef58fbc1..9497aaff0c4 100644
--- a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
+++ b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
index ee6c2eaa60b..eee672af685 100644
--- a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
index 414eb9bc7ff..9e2fc0a599f 100644
--- a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
index 982257506b1..16f237b436c 100644
--- a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
index 41743fd820c..18376dbde05 100644
--- a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
index 4e2dfe4e7e7..d755076586a 100644
--- a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
index 13a7628fd56..73c08f38416 100644
--- a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
index 59bae76f3e5..ab071726082 100644
--- a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
index 0237f2914ae..f8c91d74954 100644
--- a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
index 05e1a9ab017..20d0506589b 100644
--- a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
index 88c9db04884..d6ef6ee1593 100644
--- a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
index 060f5b70ca8..7b2b26914bf 100644
--- a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
index 67d2a02358a..77875093c00 100644
--- a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
index f5ceb651ef1..3ac1980db0c 100644
--- a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
index 9fe2fcedc8f..b485355d040 100644
--- a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
index 4bbe644cf05..87c43f783b6 100644
--- a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
index 8b997583966..c409047d921 100644
--- a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
index 2b9e53aec36..6a760e2a7e3 100644
--- a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
index d45893a2022..8dcb1af53db 100644
--- a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
index 9655f006c44..d026fb769ff 100644
--- a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
index 952afc72aec..28e5c92b6e3 100644
--- a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
index e08cb7f719f..14da0dacab4 100644
--- a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
index 5b2d521fb07..09c37602d26 100644
--- a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
index b10780260cd..a50e3b025b2 100644
--- a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
index 5e40e73ec83..94e7d93ee91 100644
--- a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
index 37d4e3760d0..bc594a534c4 100644
--- a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
index 777413e4f5f..cbeb90bd7ad 100644
--- a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
index 450574ee2ef..fb4ec2a4f3e 100644
--- a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
index 2ba2a04de1c..0a84eb4f2c5 100644
--- a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: '14.3'
diff --git a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
index 04ba99db306..34b6c010b66 100644
--- a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone_removed: '15.0'
diff --git a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
index 6fcf7df4c9b..b3b3f4edfe6 100644
--- a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
index f13174a4af6..a80d43b4d0f 100644
--- a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
index 5f107f95479..3278ecdd07a 100644
--- a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: removed
 milestone: '14.4'
diff --git a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
index 964b57c65be..ed38ecd50d5 100644
--- a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.4"
diff --git a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
index e5003f969eb..b0e65aff36b 100644
--- a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
+++ b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.7"
diff --git a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
index e533d2a309e..8a0200f6bf3 100644
--- a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
+++ b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_title_weekly
 description: Unique users updating a work item's title
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
index fbc8e23b018..d5c0eb786a5 100644
--- a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
+++ b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
@@ -1,7 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_creating_work_items_weekly
 description: Unique users creating work items
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index 4520652ddf1..4443e46fb8d 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.xmau_plan
 description: Unique users interacting with Plan features
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 59543e71dcb..3064b209b7a 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.xmau_project_management
 description: Unique users interacting with Project Management features
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: project_management
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index 6dc426231e9..9ddca3845cd 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -1,7 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.users_work_items
 description: Unique users interacting with work items
-product_category: team planning
 product_section: dev
 product_stage: plan
 product_group: product_planning
diff --git a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
index c47c1fb51d5..b00923c21ea 100644
--- a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
+++ b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.9"
diff --git a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
index 0642003f672..7f6c1d24617 100644
--- a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
+++ b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
@@ -4,7 +4,6 @@ description: ""
 product_section: ""
 product_stage: ""
 product_group: ""
-product_category: ""
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
index e464f1ee198..a13c9d88d28 100644
--- a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
+++ b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
@@ -4,7 +4,6 @@ description: ''
 product_section: ''
 product_stage: ''
 product_group: ''
-product_category: ''
 value_type: number
 status: active
 milestone: "14.10"
diff --git a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
index f668646eacb..7a58d4a00dd 100644
--- a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
+++ b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
@@ -4,7 +4,6 @@ description: 'Weekly counts of times users have executed katalon_tests jobs'
 product_section: 'ops'
 product_stage: 'analytics'
 product_group: 'pipeline_authoring'
-product_category: 'pipeline_authoring'
 value_type: number
 status: active
 milestone: "15.4"