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

Update search category metrics to include instrumentation_class

See merge request gitlab-org/gitlab!67184

config/metrics/counts_28d/20210216180424_i_search_total_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_search_total
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml

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

config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml

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

config/metrics/counts_7d/20210216180422_i_search_total_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_search_total
 distribution:
 - ee
 - ce

config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml

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

ee/config/metrics/counts_28d/20210216180427_i_search_advanced_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_search_advanced
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216180425_i_search_advanced_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_search_advanced
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml

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

ee/config/metrics/counts_7d/20210216184033_i_search_paid_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_search_paid
 distribution:
 - ee
 distribution:

ee/config/metrics/counts_all/20210216184035_i_search_paid_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_search_paid
 distribution:
 - ee
 tier:

ee/spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -32,6 +32,15 @@ RSpec.describe Gitlab::UsageDataMetrics do
           :compliance_total_unique_counts_monthly, :compliance_total_unique_counts_weekly
         ])
       end
+
+      it 'includes search monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:search].keys).to contain_exactly(*[
+          :i_search_total_monthly, :i_search_total_weekly,
+          :i_search_advanced_monthly, :i_search_advanced_weekly,
+          :i_search_paid_monthly, :i_search_paid_weekly,
+          :search_total_unique_counts_monthly, :search_total_unique_counts_weekly
+        ])
+      end
     end
   end
 end