Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

7 files changed, 159 insertions, 0 deletions

diff --git a/config/metrics/counts_28d/deployments.yml b/config/metrics/counts_28d/deployments.yml
new file mode 100644
index 00000000000..dabd50ef5be
--- /dev/null
+++ b/config/metrics/counts_28d/deployments.yml
@@ -0,0 +1,15 @@
+name: deployments
+description: Total deployments count for recent 28 days
+value_type: integer
+stage: release
+status: data_available
+default_generation: generation_1
+full_path:
+  generation_1: counts_monthy.deployments
+milestone: 13.2
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
+group: 'group::ops release'
+time_frame: 28d
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
new file mode 100644
index 00000000000..997263f9e30
--- /dev/null
+++ b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
@@ -0,0 +1,16 @@
+name: g_project_management_issue_title_changed_weekly
+description: Distinct users count that changed issue title in a group for last recent week
+value_type: integer
+product_category: issue_tracking
+stage: plan
+status: data_available
+default_generation: generation_1
+full_path:
+  generation_1: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
+milestone: 13.6
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+group: 'group::project management'
+time_frame: 7d
+data_source: redis_hll
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/counts_all/deployments.yml b/config/metrics/counts_all/deployments.yml
new file mode 100644
index 00000000000..bb78e8d6144
--- /dev/null
+++ b/config/metrics/counts_all/deployments.yml
@@ -0,0 +1,15 @@
+name: deployments
+description: Total deployments count
+value_type: integer
+stage: release
+status: data_available
+default_generation: generation_1
+full_path:
+  generation_1: counts.deployments
+milestone: 8.12
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
+group: 'group::ops release'
+time_frame: all
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/license/recorded_at.yml b/config/metrics/license/recorded_at.yml
new file mode 100644
index 00000000000..5b2b3b37290
--- /dev/null
+++ b/config/metrics/license/recorded_at.yml
@@ -0,0 +1,16 @@
+name: recorded_at
+description: When the Usage Ping computation was started
+value_type: string
+product_category: collection
+stage: growth
+status: data_available
+default_generation: generation_1
+full_path:
+  generation_1: recorded_at
+milestone: 8.10
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
+group: group::product analytics
+time_frame: none
+data_source: ruby
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/license/uuid.yml b/config/metrics/license/uuid.yml
new file mode 100644
index 00000000000..38e0d74fc22
--- /dev/null
+++ b/config/metrics/license/uuid.yml
@@ -0,0 +1,17 @@
+name: uuid
+description: GitLab instance unique identifier
+value_type: string
+product_category: collection
+stage: growth
+status: data_available
+default_generation: generation_1
+full_path:
+  generation_1: uuid
+  generation_2: license.uuid
+milestone: 9.1
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
+group: group::product analytics
+time_frame: none
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
new file mode 100644
index 00000000000..4d1120a7d8d
--- /dev/null
+++ b/config/metrics/schema.json
@@ -0,0 +1,66 @@
+{
+  "type": "object",
+  "required": ["name", "description", "value_type", "status", "default_generation", "full_path", "group", "time_frame", "data_source", "distribution", "tier"],
+  "properties": {
+    "name": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "value_type": {
+      "type": "string",
+      "enum": ["integer", "string", "number", "boolean"]
+    },
+    "product_category": {
+      "type": ["string", "null"]
+    },
+    "stage": {
+      "type": ["string", "null"]
+    },
+    "status": {
+      "type": ["string"],
+      "enum": ["data_available", "planned", "in_progress", "implmented"]
+    },
+    "default_generation": {
+      "type": "string"
+    },
+    "full_path": {
+      "type": "object"
+    },
+    "milestone": {
+      "type": ["number", "null"]
+    },
+    "milestone_removed": {
+      "type": ["number", "null"]
+    },
+    "introduced_by_url": {
+      "type": ["string", "null"]
+    },
+    "group": {
+      "type": "string"
+    },
+    "time_frame": {
+      "type": "string",
+      "enum": ["7d", "28d", "all", "none"]
+    },
+    "data_source": {
+      "type": "string",
+      "enum": ["database", "redis", "redis_hll", "prometheus", "ruby"]
+    },
+    "distribution": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": ["ee", "ce"]
+      }
+    },
+    "tier": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": ["free", "starter", "premium", "ultimate", "bronze", "silver", "gold"]
+      }
+    }
+  }
+}
diff --git a/config/metrics/settings/database_adapter.yml b/config/metrics/settings/database_adapter.yml
new file mode 100644
index 00000000000..b24fc933a08
--- /dev/null
+++ b/config/metrics/settings/database_adapter.yml
@@ -0,0 +1,14 @@
+name: adapter
+description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
+value_type: string
+product_category: collection
+stage: growth
+status: data_available
+default_generation: generation_1
+full_path:
+  generation_1: database.adapter
+group: group::enablement distribution
+time_frame: none
+data_source: database
+distribution: [ee, ce]
+tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']