Merge branch '333117-migrate-redishll-common-events' into 'master'

Add instrumentation_class to common event and epic_boards_usage metrics

See merge request gitlab-org/gitlab!67711

config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_terraform_state_api_unique_users
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce

config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml

@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml

@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_secure_security_report
 distribution:
   - ce
   - ee

config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml

@@ -12,7 +12,12 @@ status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
-data_source:
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce

config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml

@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml

@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_secure_security_report
 distribution:
   - ce
   - ee

config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml

@@ -12,7 +12,12 @@ status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
-data_source:
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee

ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ci_secrets_management_vault_build_created
 distribution:
 - ee
 tier:

ee/config/metrics/counts_28d/20210428072511_g_project_management_users_creating_epic_boards_monthly.yml

@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_creating_epic_boards
 distribution:
 - ee
 tier:

ee/config/metrics/counts_28d/20210428073329_g_project_management_users_viewing_epic_boards_monthly.yml

@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_viewing_epic_boards
 distribution:
 - ee
 tier:

ee/config/metrics/counts_28d/20210428073607_g_project_management_users_updating_epic_board_names_monthly.yml

@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_board_names
 distribution:
 - ee
 tier:

ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml

@@ -12,7 +12,13 @@ status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
-data_source:
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_creating_epic_boards
+    - g_project_management_users_viewing_epic_boards
+    - g_project_management_users_updating_epic_board_names
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ci_secrets_management_vault_build_created
 distribution:
 - ee
 tier: []

ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml

@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_terraform_state_api_unique_users
 distribution:
 - ee
 tier: []

ee/config/metrics/counts_7d/20210428072508_g_project_management_users_creating_epic_boards_weekly.yml

@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_creating_epic_boards
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210428073327_g_project_management_users_viewing_epic_boards_weekly.yml

@@ -14,6 +14,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_viewing_epic_boards
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210428073604_g_project_management_users_updating_epic_board_names_weekly.yml

@@ -14,6 +14,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60357
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_board_names
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml

@@ -12,7 +12,13 @@ status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
-data_source:
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_creating_epic_boards
+    - g_project_management_users_viewing_epic_boards
+    - g_project_management_users_updating_epic_board_names
 distribution:
 - ee
 tier:

ee/spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -54,6 +54,25 @@ RSpec.describe Gitlab::UsageDataMetrics do
         ])
       end
 
+      it 'includes i_ci_secrets_management_vault_build_created monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:ci_secrets_management].keys).to contain_exactly(*[
+          :i_ci_secrets_management_vault_build_created_monthly, :i_ci_secrets_management_vault_build_created_weekly
+        ])
+      end
+
+      it 'includes epic_boards_usage monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:epic_boards_usage].keys).to contain_exactly(*[
+          :g_project_management_users_creating_epic_boards_monthly, :g_project_management_users_creating_epic_boards_weekly,
+          :g_project_management_users_viewing_epic_boards_monthly, :g_project_management_users_viewing_epic_boards_weekly,
+          :g_project_management_users_updating_epic_board_names_monthly, :g_project_management_users_updating_epic_board_names_weekly,
+          :epic_boards_usage_total_unique_counts_monthly, :epic_boards_usage_total_unique_counts_weekly
+        ])
+      end
+
+      it 'includes terraform weekly key' do
+        expect(subject[:redis_hll_counters][:terraform].keys).to include(:p_terraform_state_api_unique_users_weekly)
+      end
+
       it 'includes issues_edit monthly and weekly keys' do
         expect(subject[:redis_hll_counters][:issues_edit].keys).to include(
           :g_project_management_issue_iteration_changed_monthly, :g_project_management_issue_iteration_changed_weekly,

spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -87,6 +87,24 @@ RSpec.describe Gitlab::UsageDataMetrics do
         ])
       end
 
+      it 'includes terraform monthly key' do
+        expect(subject[:redis_hll_counters][:terraform].keys).to include(:p_terraform_state_api_unique_users_monthly)
+      end
+
+      it 'includes terraform monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:pipeline_authoring].keys).to contain_exactly(*[
+          :o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly, :o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly,
+          :o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly, :o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly,
+          :pipeline_authoring_total_unique_counts_monthly, :pipeline_authoring_total_unique_counts_weekly
+        ])
+      end
+
+      it 'includes users_expanding_secure_security_report monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:secure].keys).to contain_exactly(*[
+          :users_expanding_secure_security_report_monthly, :users_expanding_secure_security_report_weekly
+        ])
+      end
+
       it 'includes issues_edit monthly and weekly keys' do
         expect(subject[:redis_hll_counters][:issues_edit].keys).to include(
           :g_project_management_issue_title_changed_monthly, :g_project_management_issue_title_changed_weekly,