Add latest changes from gitlab-org/gitlab@master

90 files changed, 281 insertions, 209 deletions

diff --git a/config/feature_flags/development/ci_skip_before_parsing_yaml.yml b/config/feature_flags/development/ci_skip_before_parsing_yaml.yml
index aad84f0e55b..c7f94c19122 100644
--- a/config/feature_flags/development/ci_skip_before_parsing_yaml.yml
+++ b/config/feature_flags/development/ci_skip_before_parsing_yaml.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337167
 milestone: '14.2'
 type: development
 group: group::pipeline execution
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
index b81b6b25473..50c22b52d11 100644
--- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml
+++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
@@ -1,7 +1,7 @@
 ---
 name: display_merge_conflicts_in_diff
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276918
 milestone: '13.5'
 type: development
 group: group::code review
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 2f53170bd15..df6ff762df8 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -14,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_title_changed
+  - g_project_management_issue_title_changed
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
index 4a069e68145..18926bd6332 100644
--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/usage_trends by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier: []
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 1a5886b8d49..362816dfbca 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -5,7 +5,7 @@ description: The number of unique users who visited any analytics feature by wee
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier: []
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
index 351b5772fda..eeb808f1cdf 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - merge_request_action
+  - merge_request_action
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
index 2259495aa6e..6cd8b60d104 100644
--- a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_source_code_code_intelligence
+  - i_source_code_code_intelligence
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
index 7a87182fa5f..c4804375634 100644
--- a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
index 026ab2eb697..0f90cef09b2 100644
--- a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
index 143c6b09c08..98c9fb7af11 100644
--- a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -1,8 +1,7 @@
 ---
 data_category: Optional
 key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_weekly
-description: Count of unique merge requests per week with diffs viewed file
-  by file
+description: Count of unique merge requests per week with diffs viewed file by file
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -19,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index 26feb3b4d28..ba77134b83f 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
index 98b7ffb4e4f..868b7780aad 100644
--- a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
index ce1eaa87953..9803777d3e1 100644
--- a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
index eb8ff54c98b..a190639a060 100644
--- a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
index f6aa64f7077..2f7199e1c13 100644
--- a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -22,6 +22,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
index bd89cf0b717..11ad934989b 100644
--- a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
index 098b4ba24db..96a7db25394 100644
--- a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -18,6 +18,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index ab988480aa6..985c20899f1 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_edit_by_web_ide
+  - g_edit_by_web_ide
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index 3988ff6aeb8..ffab5422fd5 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_edit_by_sfe
+  - g_edit_by_sfe
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index 37dc9c4ee4e..d96b178173c 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_edit_by_snippet_ide
+  - g_edit_by_snippet_ide
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 2a03ebe5189..8ca9395075f 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -13,10 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_edit_by_web_ide
-    - g_edit_by_sfe
-    - g_edit_by_snippet_ide
-    - g_edit_by_sse
+  - g_edit_by_web_ide
+  - g_edit_by_sfe
+  - g_edit_by_snippet_ide
+  - g_edit_by_sse
 distribution:
 - ce
 - ee
@@ -24,3 +24,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index c88b9ad8bb8..6002b7c1bfa 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_search_total
+  - i_search_total
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index 440e99d642c..e9184ffdb3a 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -13,9 +13,9 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_search_total
-    - i_search_advanced
-    - i_search_paid
+  - i_search_total
+  - i_search_advanced
+  - i_search_paid
 distribution:
 - ee
 - ce
@@ -23,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
index 61e5b315ff9..db4f6bba6eb 100644
--- a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing alert's status per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_status_changed
+  - incident_management_alert_status_changed
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
index 80bf84c984b..a18b40a2e12 100644
--- a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assigning an alert per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_assigned
+  - incident_management_alert_assigned
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
index d1b753e88be..47e80be1834 100644
--- a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding alerts to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_todo
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
index 53981e48121..da9cc8e95ba 100644
--- a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating incidents  per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_created
+  - incident_management_incident_created
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
index 9cda0d9b839..c5d0f53f455 100644
--- a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users reopening incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_reopened
+  - incident_management_incident_reopened
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
index 6149665d4e2..f8e1bca3b59 100644
--- a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
@@ -5,7 +5,7 @@ description: Count of users closing incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_closed
+  - incident_management_incident_closed
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
index b6951b13460..455bcbfb41c 100644
--- a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assiging incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_assigned
+  - incident_management_incident_assigned
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
index d67f6fda6c3..76a29bb330f 100644
--- a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding incidents to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_todo
+  - incident_management_incident_todo
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
index 1eb198a3fb2..fbb1cc1bc3e 100644
--- a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding comments on incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_comment
+  - incident_management_incident_comment
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
index da6a6ff99a0..3a15dcc4272 100644
--- a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
+++ b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating Zoom meetings about incidents per we
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_zoom_meeting
+  - incident_management_incident_zoom_meeting
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
index 3ba46ae8f70..038b8773648 100644
--- a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding issues per that are related to an inci
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_relate
+  - incident_management_incident_relate
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
index 3d874b4b926..e0fa9aa6b88 100644
--- a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users removing issue that are related to an inciden
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_unrelate
+  - incident_management_incident_unrelate
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
index 1b5eece740c..a792ccb17f5 100644
--- a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing incidents to confidential per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_change_confidential
+  - incident_management_incident_change_confidential
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index 11658f7e769..a90ec06dd33 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users performing events related to the incident man
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_created
-    - incident_management_incident_reopened
-    - incident_management_incident_closed
-    - incident_management_incident_assigned
-    - incident_management_incident_todo
-    - incident_management_incident_comment
-    - incident_management_incident_zoom_meeting
-    - incident_management_incident_published
-    - incident_management_incident_relate
-    - incident_management_incident_unrelate
-    - incident_management_incident_change_confidential
-    - incident_management_alert_status_changed
-    - incident_management_alert_assigned
-    - incident_management_alert_todo
+  - incident_management_incident_created
+  - incident_management_incident_reopened
+  - incident_management_incident_closed
+  - incident_management_incident_assigned
+  - incident_management_incident_todo
+  - incident_management_incident_comment
+  - incident_management_incident_zoom_meeting
+  - incident_management_incident_published
+  - incident_management_incident_relate
+  - incident_management_incident_unrelate
+  - incident_management_incident_change_confidential
+  - incident_management_alert_status_changed
+  - incident_management_alert_assigned
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -34,3 +34,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
index 90236fd9e61..4c72cd8d82c 100644
--- a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
+++ b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
@@ -14,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_create_incident
+  - incident_management_alert_create_incident
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index 235410930cd..c9584047b15 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_description_changed
+  - g_project_management_issue_description_changed
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index 1d9c7ba07c1..e2bf888b376 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_assignee_changed
+  - g_project_management_issue_assignee_changed
 distribution:
 - ce
 - ee
 tier:
-- free 
-- premium 
-- ultimate 
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index 4ff7397f5e6..559d5d1e171 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_made_confidential
+  - g_project_management_issue_made_confidential
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
-
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index d3f31f1f493..2a8d3cd48c9 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_made_visible
+  - g_project_management_issue_made_visible
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
-
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 0cebbe8bd7d..d515230b080 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_created
+  - g_project_management_issue_created
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index 525e80c6d43..51c8db351bf 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_closed
+  - g_project_management_issue_closed
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 28ed3b7ecbb..8432562b1bb 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_reopened
+  - g_project_management_issue_reopened
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 45975bdd24c..e31f46e7291 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_label_changed
+  - g_project_management_issue_label_changed
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 7a36d179dd2..20a0d39d460 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_milestone_changed
+  - g_project_management_issue_milestone_changed
 distribution:
 - ce
 - ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 56d7a62b08d..a4d478aa0e9 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_cross_referenced
+  - g_project_management_issue_cross_referenced
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 7496c57b838..221766645b3 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_moved
+  - g_project_management_issue_moved
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 5c9279469e3..d4320262313 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_related
+  - g_project_management_issue_related
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index 16ab218e5f5..342ec66a8ba 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_unrelated
+  - g_project_management_issue_unrelated
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 32133c3a4b3..7abbbbc888e 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_marked_as_duplicate
+  - g_project_management_issue_marked_as_duplicate
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 9556cc2f2db..369b71980ca 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_locked
+  - g_project_management_issue_locked
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index 5397b1c1e83..d9750e399d6 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_unlocked
+  - g_project_management_issue_unlocked
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index cd53d00cdf0..fbdc9d21804 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_added
+  - g_project_management_issue_designs_added
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index afae03b98ab..34db2d39dd6 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_modified
+  - g_project_management_issue_designs_modified
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index c70f7419852..380c3fdeb55 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_removed
+  - g_project_management_issue_designs_removed
 distribution:
 - ce
 - ee
@@ -21,5 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index 972840daecd..a8fcc825648 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_due_date_changed
+  - g_project_management_issue_due_date_changed
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index 94a3c6d7000..fa5f73bd415 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_time_estimate_changed
+  - g_project_management_issue_time_estimate_changed
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index 693d5f243fb..d45a9d5390d 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_time_spent_changed
+  - g_project_management_issue_time_spent_changed
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index fca44db1d25..cbfea8cb910 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_added
+  - g_project_management_issue_comment_added
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index 7168f88c08b..9a902037ecb 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_edited
+  - g_project_management_issue_comment_edited
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index 8a0f9e65833..cb790a7a27e 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_removed
+  - g_project_management_issue_comment_removed
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index f6f7b4277a5..43a4e1b1c84 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_cloned
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index 53923a6147c..c77d02eab46 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -13,39 +13,39 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_title_changed
-    - g_project_management_issue_description_changed
-    - g_project_management_issue_assignee_changed
-    - g_project_management_issue_made_confidential
-    - g_project_management_issue_made_visible
-    - g_project_management_issue_created
-    - g_project_management_issue_closed
-    - g_project_management_issue_reopened
-    - g_project_management_issue_label_changed
-    - g_project_management_issue_milestone_changed
-    - g_project_management_issue_iteration_changed
-    - g_project_management_issue_weight_changed
-    - g_project_management_issue_cross_referenced
-    - g_project_management_issue_moved
-    - g_project_management_issue_related
-    - g_project_management_issue_unrelated
-    - g_project_management_issue_marked_as_duplicate
-    - g_project_management_issue_locked
-    - g_project_management_issue_unlocked
-    - g_project_management_issue_added_to_epic
-    - g_project_management_issue_removed_from_epic
-    - g_project_management_issue_changed_epic
-    - g_project_management_issue_designs_added
-    - g_project_management_issue_designs_modified
-    - g_project_management_issue_designs_removed
-    - g_project_management_issue_due_date_changed
-    - g_project_management_issue_time_estimate_changed
-    - g_project_management_issue_time_spent_changed
-    - g_project_management_issue_comment_added
-    - g_project_management_issue_comment_edited
-    - g_project_management_issue_comment_removed
-    - g_project_management_issue_health_status_changed
-    - g_project_management_issue_cloned
+  - g_project_management_issue_title_changed
+  - g_project_management_issue_description_changed
+  - g_project_management_issue_assignee_changed
+  - g_project_management_issue_made_confidential
+  - g_project_management_issue_made_visible
+  - g_project_management_issue_created
+  - g_project_management_issue_closed
+  - g_project_management_issue_reopened
+  - g_project_management_issue_label_changed
+  - g_project_management_issue_milestone_changed
+  - g_project_management_issue_iteration_changed
+  - g_project_management_issue_weight_changed
+  - g_project_management_issue_cross_referenced
+  - g_project_management_issue_moved
+  - g_project_management_issue_related
+  - g_project_management_issue_unrelated
+  - g_project_management_issue_marked_as_duplicate
+  - g_project_management_issue_locked
+  - g_project_management_issue_unlocked
+  - g_project_management_issue_added_to_epic
+  - g_project_management_issue_removed_from_epic
+  - g_project_management_issue_changed_epic
+  - g_project_management_issue_designs_added
+  - g_project_management_issue_designs_modified
+  - g_project_management_issue_designs_removed
+  - g_project_management_issue_due_date_changed
+  - g_project_management_issue_time_estimate_changed
+  - g_project_management_issue_time_spent_changed
+  - g_project_management_issue_comment_added
+  - g_project_management_issue_comment_edited
+  - g_project_management_issue_comment_removed
+  - g_project_management_issue_health_status_changed
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -53,3 +53,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index 1e11f69d057..4b26158640b 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - wiki_action
+  - wiki_action
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index 5598225e534..fac16272d7c 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - design_action
+  - design_action
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index be0e472797a..8b10e1e06ce 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - project_action
+  - project_action
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index 6764ce3be94..e3e826ad618 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -14,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_testing_test_case_parsed
+  - i_testing_test_case_parsed
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index 0da3936c50d..5b971cee7be 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_edit_by_sse
+  - g_edit_by_sse
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index ec5e1984451..1c006679c2b 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - git_write_action
+  - git_write_action
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
index 21cbad1ae90..7cff2e21c0c 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index 4efcaf846fa..b7cb438efb6 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -17,6 +17,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index b2e4b0a3189..921ccf65d92 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -17,6 +17,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index 33f63ad867d..f7ec69b4deb 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -17,6 +17,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index 7fc94261026..0c179754e0f 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -17,6 +17,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index b452879a59d..f20b311bc57 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -72,6 +72,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 2025f9fa64c..0d4b6998951 100644
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -18,4 +18,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
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 cf195eee842..f2124562c27 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 cbe8915fd43..256a767760b 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 f0e19bd65a7..941080f14dd 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 ec2383abcec..8a35ec09135 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 b0ae90703c1..10c2a3a26ea 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 b5462f5afa4..073b38b0e2c 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 625f0ee8839..22b3d3d764b 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 f14ac4a7acf..8c48ba8551d 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 d98430a800e..b6769fc0e9e 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 2170cc9c973..f9178500bf6 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 91a23455379..ac35d2908fe 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
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 86a165f9d30..bd3e1837b77 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
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []