Merge branch '333117-migrate-incident-management-events-redishll' into 'master'

Add instrumentation_class to incident_management event metrics

See merge request gitlab-org/gitlab!67215

config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml

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

config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml

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

config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml

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

config/metrics/counts_28d/20210216180541_incident_management_incident_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:
+    - incident_management_incident_created
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml

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

config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml

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

config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml

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

config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml

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

config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml

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

config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml

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

config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml

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

config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml

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

config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml

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

config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml

@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_created
+    - incident_management_incident_reopened
+    - incident_management_incident_closed
+    - incident_management_incident_assigned
+    - incident_management_incident_todo
+    - incident_management_incident_comment
+    - incident_management_incident_zoom_meeting
+    - incident_management_incident_published
+    - incident_management_incident_relate
+    - incident_management_incident_unrelate
+    - incident_management_incident_change_confidential
+    - incident_management_alert_status_changed
+    - incident_management_alert_assigned
+    - incident_management_alert_todo
 distribution:
 - ce
 - ee

config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml

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

config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml

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

config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml

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

config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml

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

config/metrics/counts_7d/20210216180539_incident_management_incident_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:
+    - incident_management_incident_created
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml

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

config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml

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

config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml

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

config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml

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

config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml

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

config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml

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

config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml

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

config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml

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

config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml

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

config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml

@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_created
+    - incident_management_incident_reopened
+    - incident_management_incident_closed
+    - incident_management_incident_assigned
+    - incident_management_incident_todo
+    - incident_management_incident_comment
+    - incident_management_incident_zoom_meeting
+    - incident_management_incident_published
+    - incident_management_incident_relate
+    - incident_management_incident_unrelate
+    - incident_management_incident_change_confidential
+    - incident_management_alert_status_changed
+    - incident_management_alert_assigned
+    - incident_management_alert_todo
 distribution:
 - ce
 - ee

config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml

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

ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml

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

ee/config/metrics/counts_28d/20210405222005_i_incident_management_oncall_notification_sent_monthly.yml

@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58606
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_incident_management_oncall_notification_sent
 distribution:
 - ee
 tier:

ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml

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

ee/config/metrics/counts_7d/20210405220139_i_incident_management_oncall_notification_sent_weekly.yml

@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58606
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_incident_management_oncall_notification_sent
 distribution:
 - ee
 tier:

ee/spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -22,6 +22,18 @@ RSpec.describe Gitlab::UsageDataMetrics do
         expect(subject).to include(:license_subscription_id)
       end
 
+      it 'includes incident_management_incident_published monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:incident_management]).to include(
+          :incident_management_incident_published_monthly, :incident_management_incident_published_weekly
+        )
+      end
+
+      it 'includes incident_management_oncall monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:incident_management_oncall].keys).to contain_exactly(*[
+          :i_incident_management_oncall_notification_sent_monthly, :i_incident_management_oncall_notification_sent_weekly
+        ])
+      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,

spec/lib/gitlab/usage_data_metrics_spec.rb

@@ -41,6 +41,31 @@ RSpec.describe Gitlab::UsageDataMetrics do
         ])
       end
 
+      it 'includes incident_management_alerts monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:incident_management_alerts].keys).to contain_exactly(*[
+          :incident_management_alert_create_incident_monthly, :incident_management_alert_create_incident_weekly
+      ])
+      end
+
+      it 'includes incident_management monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:incident_management]).to include(
+          :incident_management_incident_created_monthly, :incident_management_incident_created_weekly,
+          :incident_management_incident_reopened_monthly, :incident_management_incident_reopened_weekly,
+          :incident_management_incident_closed_monthly, :incident_management_incident_closed_weekly,
+          :incident_management_incident_assigned_monthly, :incident_management_incident_assigned_weekly,
+          :incident_management_incident_todo_monthly, :incident_management_incident_todo_weekly,
+          :incident_management_incident_comment_monthly, :incident_management_incident_comment_weekly,
+          :incident_management_incident_zoom_meeting_monthly, :incident_management_incident_zoom_meeting_weekly,
+          :incident_management_incident_relate_monthly, :incident_management_incident_relate_weekly,
+          :incident_management_incident_unrelate_monthly, :incident_management_incident_unrelate_weekly,
+          :incident_management_incident_change_confidential_monthly, :incident_management_incident_change_confidential_weekly,
+          :incident_management_alert_status_changed_monthly, :incident_management_alert_status_changed_weekly,
+          :incident_management_alert_assigned_monthly, :incident_management_alert_assigned_weekly,
+          :incident_management_alert_todo_monthly, :incident_management_alert_todo_weekly,
+          :incident_management_total_unique_counts_monthly, :incident_management_total_unique_counts_weekly
+        )
+      end
+
       it 'includes source_code monthly and weekly keys' do
         expect(subject[:redis_hll_counters][:source_code].keys).to contain_exactly(*[
           :wiki_action_monthly, :wiki_action_weekly,