Add latest changes from gitlab-org/gitlab@master

12 files changed, 50 insertions, 178 deletions

diff --git a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
deleted file mode 100644
index 5d3274c6452..00000000000
--- a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-u2f-device
-description: Number of unique user logins using two factor via a U2F device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
deleted file mode 100644
index c6d88ac5928..00000000000
--- a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-webauthn-device
-description: Number of unique user logins using two factor via a WebAuthn device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
deleted file mode 100644
index 9efb95d6c49..00000000000
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.standard
-description: Number of unique user logins using password authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-performance_indicator_type: []
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
deleted file mode 100644
index ed16c7a81fa..00000000000
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.google_oauth2
-description: Number of unique user logins using Google OAuth authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-performance_indicator_type: []
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index df1e06e4d52..9a2d93e597e 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -1,19 +1,24 @@
 ---
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor
-description: Number of unique user logins using two factor authentication
+key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider
+name: count_distinct_users_using_two_factor_authentication
+description: Number of unique user logins using two factor authentication for available providers
 product_section: dev
 product_stage: manage
 product_group: group::access
 product_category: authentication_and_authorization
-value_type: number
+value_type: object
 status: active
+milestone: "14.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70061
 time_frame: 28d
 data_source: database
+data_category: optional
+performance_indicator_type: []
 distribution:
 - ce
+- ee
 tier:
 - free
 - premium
 - ultimate
-milestone: "<13.9"
+value_json_schema: "config/metrics/objects_schemas/user_auth_by_provider.json"
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
deleted file mode 100644
index 7b396fc6c73..00000000000
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor
-description: Number of unique user logins using two factor authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
deleted file mode 100644
index 0206e7c017f..00000000000
--- a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-u2f-device
-description: Number of unique user logins using two factor via a U2F device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
deleted file mode 100644
index 79e4bd71c94..00000000000
--- a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-webauthn-device
-description: Number of unique user logins using two factor via a WebAuthn device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
deleted file mode 100644
index 6c43a6cbc95..00000000000
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.standard
-description: Number of unique user logins using password authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
deleted file mode 100644
index d75fcebed09..00000000000
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.google_oauth2
-description: Number of unique user logins using Google OAuth authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
new file mode 100644
index 00000000000..610c187407b
--- /dev/null
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -0,0 +1,24 @@
+---
+key_path: usage_activity_by_stage.manage.user_auth_by_provider
+name: count_distinct_users_using_two_factor_authentication
+description: Number of unique user logins using two factor authentication for available providers
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
+value_type: object
+status: active
+milestone: "14.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70061
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+value_json_schema: "config/metrics/objects_schemas/user_auth_by_provider.json"
diff --git a/config/metrics/objects_schemas/user_auth_by_provider.json b/config/metrics/objects_schemas/user_auth_by_provider.json
new file mode 100644
index 00000000000..9cf4c1d68aa
--- /dev/null
+++ b/config/metrics/objects_schemas/user_auth_by_provider.json
@@ -0,0 +1,16 @@
+{
+  "type": "object",
+  "description": "Distinct users by provider",
+  "properties": {
+    "two-factor": {"type": "number", "description": " Number of unique user logins using two factor authentication" },
+    "two-factor-via-u2f-device": {"type": "number", "description": " Number of unique user logins using two factor authentication via U2F" },
+    "two-factor-via-webauthn-device": {"type": "number", "description": " Number of unique user logins using two factor authentication via two-factor-via-webauthn-device" },
+    "standard": {"type": "number", "description": " Number of unique user logins using password authentication" },
+    "google_oauth2": {"type": "number", "description": " Number of unique user logins using Google OAuth authentication" },
+    "twitter": {"type": "number", "description": " Number of unique user logins using Twitter authentication" },
+    "github": {"type": "number", "description": " Number of unique user logins using Github authentication" },
+    "bitbucket": {"type": "number", "description": " Number of unique user logins using Bitbucket authentication" },
+    "group_saml": {"type": "number", "description": " Number of unique user logins using group SAML authentication" },
+    "salesforce": {"type": "number", "description": " Number of unique user logins using group Salesforce authentication" }
+  }
+}