Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

54 files changed, 215 insertions, 84 deletions

diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index d7b16d01d8b..8f3749cc481 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: cycle_analytics
+  event: views
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 2c060e57c49..3713aafe259 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: note
+  event: create_mergerequest
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index fb8c3b61355..7e82df12c95 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -4,9 +4,9 @@ key_path: counts.ingress_modsecurity_packets_processed
 description: Cumulative count of packets processed by ModSecurity since Usage Ping
   was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index ba3575f8b0b..c034d791224 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -4,9 +4,9 @@ key_path: counts.ingress_modsecurity_packets_anomalous
 description: Cumulative count of packets identified as anomalous by ModSecurity since
   Usage Ping was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index 92774a9aa54..cbdd3ce0261 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -4,9 +4,9 @@ key_path: counts.network_policy_forwards
 description: Cumulative count of packets forwarded by Cilium (Container Network Security)
   since Usage Ping was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: container_network_security
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: container_network_security_category_was_removed
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 10b6a79205b..2b1dc57255d 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -4,9 +4,9 @@ key_path: counts.network_policy_drops
 description: Cumulative count of packets dropped by Cilium (Container Network Security)
   since Usage Ping was last reported
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: container_network_security
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: container_network_security_category_was_removed
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86351
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 3255aa90e63..1dce2aa9922 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_logging
 description: Whether or not ModSecurity is set to logging mode
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index 4589c483ae2..2b1a487838e 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_blocking
 description: Whether or not ModSecurity is set to blocking mode
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 9213bbcefb7..8794bfec930 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_disabled
 description: Whether or not ModSecurity is disabled within Ingress
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 659a3b66a8b..9781fa90536 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -3,9 +3,9 @@ data_category: operational
 key_path: counts.ingress_modsecurity_not_installed
 description: Whether or not ModSecurity has not been installed into the cluster
 product_section: sec
-product_stage: protect
-product_group: container_security
-product_category: web_firewall
+product_stage: protect_stage_was_removed
+product_group: container_security_group_was_removed
+product_category: web_firewall_category_was_removed
 value_type: number
 status: removed
 milestone_removed: 14.0
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index f01f62f361d..03e45717517 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: note
+  event: create_snippet
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 7cea58039e1..9c69c99d694 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: snippet
+  event: create
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index 5cb80f5e830..d8fee7daa90 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: snippet
+  event: update
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index 2f45e0c6e20..abd2e31b8d8 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -11,6 +11,11 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: null
+  event: all_searches_count
+  include_usage_prefix: false
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index b2af79bb43c..9ba086ed271 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -11,6 +11,11 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: null
+  event: navbar_searches_count
+  include_usage_prefix: false
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index 675a9db7a7b..08121468e38 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: create
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index c985d876c96..ffb2ed4227c 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: update
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 6ac0825996c..75c2d13d744 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: delete
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 1d71cc632c4..c2294650494 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -10,6 +10,7 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyDisabledMetric
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 7755fec3a2c..6de9b8476d4 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -10,6 +10,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: note
+  event: create_commit
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 059087a406d..278524f6d79 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -12,6 +12,10 @@ milestone: "13.3"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38784"
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: wiki_pages
+  event: view
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
index 185e8a199b6..fcb2be99fab 100644
--- a/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
+++ b/config/metrics/counts_all/20210505015532_kubernetes_agent_k8s_api_proxy_request.yml
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url:
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  prefix: kubernetes_agent
+  event: k8s_api_proxy_request
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
index 79d9f062999..e84cad9b9a9 100644
--- a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
+++ b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_view
+  event: view
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
index b4887bbe219..92c5605f5fa 100644
--- a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_full_report_clicked
+  event: full_report_clicked
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
index 1898fa971fa..6501152e564 100644
--- a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
+++ b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand
+  event: expand
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
index 91cd4d7a232..4be50d63e30 100644
--- a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
+++ b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand_success
+  event: expand_success
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
index 970d843c58e..d5e36376b4a 100644
--- a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand_warning
+  event: expand_warning
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
index 9b7c5c61602..fbb2684fa11 100644
--- a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91831"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_test_summary_count_expand_failed
+  event: expand_failed
+  widget: test_summary
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
index 215bf8f0a1b..235b5ed838a 100644
--- a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
+++ b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_view
+  event: view
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
index a8792444287..25f62dd0184 100644
--- a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_full_report_clicked
+  event: full_report_clicked
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
index d5679b65533..a747a6252e9 100644
--- a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
+++ b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand
+  event: expand
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
index 25ef6ab85ca..9d1b51a2bce 100644
--- a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
+++ b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand_success
+  event: expand_success
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
index 7939fb8ac7f..3d98561d8eb 100644
--- a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand_warning
+  event: expand_warning
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
index 9e348eb8e27..b3312480433 100644
--- a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93232"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_accessibility_count_expand_failed
+  event: expand_failed
+  widget: accessibility
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
index 1687d346e34..918ff9b362c 100644
--- a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
+++ b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_view
+  event: view
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
index 21ff87b8e39..1fb7bbc070b 100644
--- a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_full_report_clicked
+  event: full_report_clicked
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
index 49123b462d9..65315c78f2b 100644
--- a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
+++ b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand
+  event: expand
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
index 8b349e04d21..a32d388e58d 100644
--- a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand_success
+  event: expand_success
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
index e94c6999711..7287000128e 100644
--- a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand_warning
+  event: expand_warning
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
index 5e49393afff..1e4d668ba98 100644
--- a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93333"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_code_quality_count_expand_failed
+  event: expand_failed
+  widget: code_quality
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
index f523b91b5d9..4f3c66162c3 100644
--- a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
+++ b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_view
+  event: view
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
index 53eb5770ed5..f98b80e3741 100644
--- a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_full_report_clicked
+  event: full_report_clicked
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
index 0406b84d457..9d4d25d5514 100644
--- a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
+++ b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand
+  event: expand
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
index c497758b543..92f9e149377 100644
--- a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand_success
+  event: expand_success
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
index 1a0a112dc89..aaece878b05 100644
--- a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand_warning
+  event: expand_warning
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
index 3e1ac7db1d5..1a382cc30ac 100644
--- a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/93340"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_terraform_count_expand_failed
+  event: expand_failed
+  widget: terraform
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
index 3542f4fd8ac..39d1bea3536 100644
--- a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
+++ b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_view
+  event: view
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
index 580d0d4dff3..1258a40add0 100644
--- a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_full_report_clicked
+  event: full_report_clicked
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
index 1829e1c87c0..07a8ac69ae1 100644
--- a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
+++ b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand
+  event: expand
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
index 4a8f35a7c5b..2785964ed25 100644
--- a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
+++ b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand_success
+  event: expand_success
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
index 1ebc20fca26..eabef1927c6 100644
--- a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand_warning
+  event: expand_warning
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
index 7fe8263a53e..39d252fa1b3 100644
--- a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
@@ -12,9 +12,10 @@ introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
 time_frame: all
 data_source: redis
 data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
 options:
-  events:
-    - i_code_review_merge_request_widget_license_compliance_count_expand_failed
+  event: expand_failed
+  widget: license_compliance
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
new file mode 100644
index 00000000000..a538e097254
--- /dev/null
+++ b/config/metrics/counts_all/20220912145754_gitlab_for_jira_app_direct_installations.yml
@@ -0,0 +1,23 @@
+---
+key_path: counts.gitlab_for_jira_app_direct_installations
+description: Count active Jira Cloud direct installations
+product_section: dev
+product_stage: ecosystem
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+data_category: optional
+instrumentation_class: GitlabForJiraAppDirectInstallationsCountMetric
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97674
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
new file mode 100644
index 00000000000..fcab9fd1794
--- /dev/null
+++ b/config/metrics/counts_all/20220913083454_gitlab_for_jira_app_proxy_installations.yml
@@ -0,0 +1,23 @@
+---
+key_path: counts.gitlab_for_jira_app_proxy_installations
+description: Count active Jira Cloud installations that are using GitLab as a proxy
+product_section: dev
+product_stage: ecosystem
+product_group: integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+data_category: optional
+instrumentation_class: GitlabForJiraAppProxyInstallationsCountMetric
+milestone: "15.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97674
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate