Merge branch '325545-track_compliance_frameworks' into 'master'

Add total count of compliance frameworks to usage ping

See merge request gitlab-org/gitlab!60697

doc/development/usage_ping/dictionary.md

@@ -6430,7 +6430,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 ### `database.pg_system_id`
 
-Missing description
+TBD
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216183248_pg_system_id.yml)
 
@@ -7764,7 +7764,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 Number of projects using 5 min production app CI template in last 7 days.
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml)
 
 Group: `group::5-min-app`
 
@@ -15370,6 +15370,18 @@ Status: `data_available`
 
 Tiers: `free`
 
+### `usage_activity_by_stage.manage.custom_compliance_frameworks`
+
+Total count of all custom compliance framework labels
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210430081610_custom_compliance_frameworks.yml)
+
+Group: `compliance`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `usage_activity_by_stage.manage.events`
 
 Missing description
@@ -16010,6 +16022,8 @@ Tiers: `free`
 
 Histogram (buckets 1 to 100) of projects with at least 1 enabled integration.
 
+[Object JSON schema](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json)
+
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml)
 
 Group: `group::monitor`

ee/changelogs/unreleased/325545-track_compliance_frameworks.yml

+---
+title: Add total distinct count of compliance frameworks to usage ping
+merge_request: 60697
+author:
+type: added

ee/config/metrics/counts_all/20210430081610_custom_compliance_frameworks.yml

+---
+key_path: usage_activity_by_stage.manage.custom_compliance_frameworks
+name: "count_compliance_management_frameworks"
+description: Total count of all custom compliance framework labels
+product_section: dev
+product_stage: manage
+product_group: compliance
+product_category: "Compliance management"
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325545
+time_frame: all
+data_source: database
+distribution:
+- ee
+tier:
+- premium
+- ultimate

ee/lib/ee/gitlab/usage_data.rb

@@ -313,6 +313,7 @@ module EE
             ldap_users: distinct_count(::GroupMember.of_ldap_type.where(time_period), :user_id),
             value_stream_management_customized_group_stages: count(::Analytics::CycleAnalytics::GroupStage.where(custom: true)),
             projects_with_compliance_framework: count(::ComplianceManagement::ComplianceFramework::ProjectSettings),
+            custom_compliance_frameworks: count(::ComplianceManagement::Framework),
             ldap_servers: ldap_available_servers.size,
             ldap_group_sync_enabled: ldap_config_present_for_any_provider?(:group_base),
             ldap_admin_sync_enabled: ldap_config_present_for_any_provider?(:admin_group),

ee/spec/lib/ee/gitlab/usage_data_spec.rb

@@ -420,6 +420,7 @@ RSpec.describe Gitlab::UsageData do
         create(:group_member, ldap: true, user: user)
         create(:cycle_analytics_group_stage)
         create(:compliance_framework_project_setting)
+        create(:compliance_framework)
       end
 
       expect(described_class.usage_activity_by_stage_manage({})).to include(
@@ -427,6 +428,7 @@ RSpec.describe Gitlab::UsageData do
         ldap_users: 2,
         value_stream_management_customized_group_stages: 2,
         projects_with_compliance_framework: 2,
+        custom_compliance_frameworks: 4,
         ldap_servers: 2,
         ldap_group_sync_enabled: true,
         ldap_admin_sync_enabled: true,
@@ -437,6 +439,7 @@ RSpec.describe Gitlab::UsageData do
         ldap_users: 1,
         value_stream_management_customized_group_stages: 2,
         projects_with_compliance_framework: 2,
+        custom_compliance_frameworks: 4,
         ldap_servers: 2,
         ldap_group_sync_enabled: true,
         ldap_admin_sync_enabled: true,