Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

20 files changed, 198 insertions, 8 deletions

diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index bd756b8bcef..7e5f41d54f5 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -9,7 +9,7 @@ product_category: gitaly
 value_type: number
 status: active
 time_frame: all
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 6f7524c8765..0e37a6c19b5 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -9,7 +9,7 @@ product_category: gitaly
 value_type: number
 status: active
 time_frame: all
-data_source: database
+data_source: system
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index 46db9f97e85..b88351eb4dc 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -7,7 +7,9 @@ product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
+milestone_removed: '15.7'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index d5da36978b6..f77fe5ec728 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -7,7 +7,9 @@ product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
+milestone_removed: '15.7'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index 198af43a99d..f22e6e6bc77 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -7,7 +7,9 @@ product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
+milestone_removed: '15.7'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index f094f894ded..a291191eaeb 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -7,7 +7,9 @@ product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
+milestone_removed: '15.7'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index fb7931ddf09..c3c4a01a809 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -7,7 +7,9 @@ product_stage: manage
 product_group: integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
+milestone_removed: '15.7'
 time_frame: all
 data_source: database
 distribution:
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index bf1a98fd290..22c6c6b7833 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -11,6 +11,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  older_than: 7d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index 31f7f6562e4..e4094c25594 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -11,6 +11,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  older_than: 14d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index 577e9e60d56..11e7b1ebef5 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -11,6 +11,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  older_than: 30d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 3ef97b5a6f8..987bffdcef8 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -11,6 +11,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  older_than: 90d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index d2be783a12a..a4cfecc228b 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -11,6 +11,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  older_than: null
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index 3ea154f5877..ecc9cf97b4d 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -10,7 +10,7 @@ product_category: container registry
 value_type: number
 status: active
 time_frame: all
-data_source: database
+data_source: system
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
index 276b1c97e0c..bd00db71abb 100644
--- a/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
+++ b/config/metrics/counts_all/20210915082040_projects_with_expiration_policy_enabled_with_older_than_set_to_60d.yml
@@ -11,6 +11,10 @@ value_type: number
 status: active
 time_frame: all
 data_source: database
+instrumentation_class: DistinctCountProjectsWithExpirationPolicyMetric
+options:
+  enabled: true
+  older_than: 60d
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
new file mode 100644
index 00000000000..4c17bd746b3
--- /dev/null
+++ b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
@@ -0,0 +1,26 @@
+---
+key_path: counts.i_code_review_merge_request_widget_security_reports_count_view
+description: Total number of times the Security Reports widget extension was viewed (rendered to the screen)
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
+performance_indicator_type: []
+options:
+  event: view
+  widget: security_reports
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
new file mode 100644
index 00000000000..60b6b75d064
--- /dev/null
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
@@ -0,0 +1,26 @@
+---
+key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand
+description: Total number of times the Security Reports widget extension was expanded (in any state)
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
+performance_indicator_type: []
+options:
+  event: expand
+  widget: security_reports
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
new file mode 100644
index 00000000000..f5fef7e7cbe
--- /dev/null
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
@@ -0,0 +1,26 @@
+---
+key_path: counts.i_code_review_merge_request_widget_security_reports_count_full_report_clicked
+description: Total number of times the Security Reports widget extension Full Report button was clicked
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
+performance_indicator_type: []
+options:
+  event: full_report_clicked
+  widget: security_reports
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
new file mode 100644
index 00000000000..fa0b573be84
--- /dev/null
+++ b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
@@ -0,0 +1,26 @@
+---
+key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_success
+description: Total number of times the Security Reports widget extension was expanded (while in its Success state)
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
+performance_indicator_type: []
+options:
+  event: expand_success
+  widget: security_reports
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
new file mode 100644
index 00000000000..20e21862a9a
--- /dev/null
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
@@ -0,0 +1,26 @@
+---
+key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_failed
+description: Total number of times the Security Reports widget extension was expanded (while in its Failed state)
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
+performance_indicator_type: []
+options:
+  event: expand_failed
+  widget: security_reports
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
new file mode 100644
index 00000000000..7a917d85b9c
--- /dev/null
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
@@ -0,0 +1,26 @@
+---
+key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_warning
+description: Total number of times the Security Reports widget extension was expanded (while in its Warning state)
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: all
+data_source: redis
+data_category: optional
+instrumentation_class: MergeRequestWidgetExtensionMetric
+performance_indicator_type: []
+options:
+  event: expand_warning
+  widget: security_reports
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate