Merge branch '327656-add-group-devops-adoption-usage-ping' into 'master'

Add group DevOps adoption usage metric

See merge request gitlab-org/gitlab!59738

doc/development/usage_ping/dictionary.md

@@ -7592,6 +7592,30 @@ Status: `data_available`
 
 Tiers:
 
+### `redis_hll_counters.analytics.users_viewing_analytics_group_devops_adoption_monthly`
+
+Counts visits to DevOps Adoption page per month
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml)
+
+Group: `group::optimize`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
+### `redis_hll_counters.analytics.users_viewing_analytics_group_devops_adoption_weekly`
+
+Counts visits to DevOps Adoption page per week
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml)
+
+Group: `group::optimize`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `redis_hll_counters.ci_secrets_management.i_ci_secrets_management_vault_build_created_monthly`
 
 Missing description

ee/app/controllers/groups/analytics/devops_adoption_controller.rb

 # frozen_string_literal: true
 
 class Groups::Analytics::DevopsAdoptionController < Groups::Analytics::ApplicationController
+  include RedisTracking
+
   layout 'group'
 
   before_action :load_group
   before_action -> { authorize_view_by_action!(:view_group_devops_adoption) }
 
+  track_redis_hll_event :show, name: 'users_viewing_analytics_group_devops_adoption'
+
   def show
   end
 end

ee/changelogs/unreleased/327656-add-group-devops-adoption-usage-ping.yml

+---
+title: Add group level DevOps adoption usage ping
+merge_request: 59738
+author:
+type: added

ee/config/metrics/counts_28d/20210401092244_i_analytics_dev_ops_adoption_monthly.yml

 ---
-# See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_adoption_monthly
+name: users_viewing_analytics_instance_devops_adoption_monthly
 description: Counts visits to DevOps Adoption page per month
 product_section: dev
 product_stage: manage

ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml

+---
+key_path: redis_hll_counters.analytics.users_viewing_analytics_group_devops_adoption_monthly
+description: Counts visits to DevOps Adoption page per month
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category: devops_reports
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59738"
+time_frame: 28d
+data_source: redis_hll
+distribution:
+  - ee
+tier:
+  - premium
+  - ultimate

ee/config/metrics/counts_7d/20210401092244_i_analytics_dev_ops_adoption_weekly.yml

 ---
 # See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_adoption_weekly
+name: users_viewing_analytics_instance_devops_adoption_weekly
 description: Counts visits to DevOps Adoption page per week
 product_section: dev
 product_stage: manage

ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml

+---
+key_path: redis_hll_counters.analytics.users_viewing_analytics_group_devops_adoption_weekly
+description: Counts visits to DevOps Adoption page per week
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category: devops_reports
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59738"
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ee
+tier:
+  - premium
+  - ultimate

ee/spec/requests/groups/analytics/devops_adoption_controller_spec.rb

@@ -51,5 +51,12 @@ RSpec.describe Groups::Analytics::DevopsAdoptionController do
         expect(response).to have_gitlab_http_status(:forbidden)
       end
     end
+
+    it 'tracks devops_adoption usage event' do
+      expect(Gitlab::UsageDataCounters::HLLRedisCounter)
+        .to receive(:track_event).with('users_viewing_analytics_group_devops_adoption', values: kind_of(String))
+
+      subject
+    end
   end
 end

lib/gitlab/usage_data_counters/known_events/analytics.yml

+- name: users_viewing_analytics_group_devops_adoption
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_dev_ops_adoption
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_merge_request
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_dev_ops_score
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_merge_request
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_instance_statistics
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_contribution
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_insights
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_issues
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_productivity
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: g_analytics_valuestream
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_pipelines
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_code_reviews
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_valuestream
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_insights
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_issues
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: p_analytics_repo
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits
+- name: i_analytics_cohorts
+  category: analytics
+  redis_slot: analytics
+  aggregation: weekly
+  feature_flag: track_unique_visits

lib/gitlab/usage_data_counters/known_events/common.yml

@@ -25,92 +25,6 @@
   redis_slot: compliance
   aggregation: weekly
   feature_flag: usage_data_a_compliance_audit_events_api
-# Analytics category
-- name: g_analytics_contribution
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_insights
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_issues
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_productivity
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_valuestream
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_pipelines
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_code_reviews
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_valuestream
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_insights
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_issues
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_repo
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_cohorts
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_dev_ops_score
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_dev_ops_adoption
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: g_analytics_merge_request
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: p_analytics_merge_request
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
-- name: i_analytics_instance_statistics
-  category: analytics
-  redis_slot: analytics
-  aggregation: weekly
-  feature_flag: track_unique_visits
 - name: g_edit_by_web_ide
   category: ide_edit
   redis_slot: edit

spec/lib/gitlab/usage_data_spec.rb

@@ -1303,10 +1303,11 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
           'p_analytics_repo' => 123,
           'i_analytics_cohorts' => 123,
           'i_analytics_dev_ops_score' => 123,
-          'i_analytics_dev_ops_adoption' => 123,
           'i_analytics_instance_statistics' => 123,
           'p_analytics_merge_request' => 123,
           'g_analytics_merge_request' => 123,
+          'i_analytics_dev_ops_adoption' => 123,
+          'users_viewing_analytics_group_devops_adoption' => 123,
           'analytics_unique_visits_for_any_target' => 543,
           'analytics_unique_visits_for_any_target_monthly' => 987
         }