Add latest changes from gitlab-org/gitlab@master

16 files changed, 48 insertions, 48 deletions

diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index f0d1bdc5382..4c79c9e6268 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.groups
 description: Number of users who are group members for last 28 days
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index a99129a6a10..e19048661a2 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.users_created
 description: Number of users created in the month
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index e7764661dad..983dfc8a132 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.omniauth_providers
 description: List of unique OmniAuth providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: object
 status: active
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index 791d4896e86..2c2cd670a80 100644
--- a/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider
 description: Number of unique user logins using two factor authentication for available providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: object
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_28d/20220825232557_count_user_auth.yml b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
index f704340e439..7fd9a845130 100644
--- a/config/metrics/counts_28d/20220825232557_count_user_auth.yml
+++ b/config/metrics/counts_28d/20220825232557_count_user_auth.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage_monthly.manage.count_user_auth
 description: Number of unique user logins
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index 329af5bf53c..908bff6ea1c 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -2,9 +2,9 @@
 data_category: operational
 key_path: counts.groups
 description: Total count of groups as of usage ping snapshot
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index 1471e2ab302..ad34973acd7 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: counts.keys
 description: Number of keys.
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 1764e203258..3da0b931cf9 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage.manage.groups
 description: Number of users who are group members.
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index cc885359d58..01e1f20a78d 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage.manage.users_created
 description: Number of users
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index 22ff6084082..facf989686e 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: usage_activity_by_stage.manage.omniauth_providers
 description: List of unique OmniAuth providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: object
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
index 21cbb828118..2c990d82154 100644
--- a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage.manage.user_auth_by_provider
 description: Number of unique user logins using two factor authentication for available providers
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: object
 status: active
 milestone: "14.3"
diff --git a/config/metrics/counts_all/20220825232556_count_user_auth.yml b/config/metrics/counts_all/20220825232556_count_user_auth.yml
index 32cccc5ddcf..e520fd6bd9a 100644
--- a/config/metrics/counts_all/20220825232556_count_user_auth.yml
+++ b/config/metrics/counts_all/20220825232556_count_user_auth.yml
@@ -1,9 +1,9 @@
 ---
 key_path: usage_activity_by_stage.manage.count_user_auth
 description: Number of unique user logins
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: number
 status: active
 milestone: "15.4"
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 932151ca37a..0364fb9f6ac 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: gravatar_enabled
 description: Whether gravatar is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index 3a5d6335693..d5f682912f5 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: ldap_enabled
 description: Whether LDAP is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 810ded396ca..811202f8515 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: omniauth_enabled
 description: Whether OmniAuth is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: boolean
 status: active
 time_frame: none
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 0fc1e768de1..f9e47064771 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -2,9 +2,9 @@
 data_category: optional
 key_path: signup_enabled
 description: Whether public signup is enabled
-product_section: dev
-product_stage: manage
-product_group: authentication_and_authorization
+product_section: sec
+product_stage: govern
+product_group: authentication
 value_type: boolean
 status: active
 time_frame: none