Merge branch '333117-migrating-compliance-events-redishll' into 'master'

Update metrics with compliance category to include instrumentation_class

See merge request gitlab-org/gitlab!66577

ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml

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

ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml

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

ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_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_compliance_audit_events
 distribution:
 - ee
 tier:

ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_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_compliance_credential_inventory
 distribution:
 - ee
 tier:

ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml

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

ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml

@@ -10,6 +10,14 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_compliance_dashboard
+    - g_compliance_audit_events
+    - i_compliance_audit_events
+    - i_compliance_credential_inventory
+    - a_compliance_audit_events_api
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml

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

ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml

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

ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_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_compliance_audit_events
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_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_compliance_credential_inventory
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml

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

ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml

@@ -10,6 +10,14 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_compliance_dashboard
+    - g_compliance_audit_events
+    - i_compliance_audit_events
+    - i_compliance_credential_inventory
+    - a_compliance_audit_events_api
 distribution:
 - ee
 tier:

ee/spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -21,6 +21,17 @@ RSpec.describe Gitlab::UsageDataMetrics do
         expect(subject).to include(:license_md5)
         expect(subject).to include(:license_subscription_id)
       end
+
+      it 'includes compliance monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:compliance].keys).to contain_exactly(*[
+          :g_compliance_dashboard_monthly, :g_compliance_dashboard_weekly,
+          :g_compliance_audit_events_monthly, :g_compliance_audit_events_weekly,
+          :i_compliance_audit_events_monthly, :i_compliance_audit_events_weekly,
+          :i_compliance_credential_inventory_monthly, :i_compliance_credential_inventory_weekly,
+          :a_compliance_audit_events_api_monthly, :a_compliance_audit_events_api_weekly,
+          :compliance_total_unique_counts_monthly, :compliance_total_unique_counts_weekly
+        ])
+      end
     end
   end
 end