Commit 32776dac authored by Ash McKenzie's avatar Ash McKenzie

Merge branch '229548-adjust-telemetry-code-for-incidents' into 'master'

Update usage ping to use Issue incident spec

See merge request gitlab-org/gitlab!38864
parents 4e6edc82 67aa3e38
---
title: Update incident_issues usage ping to use issue type column
merge_request: 38864
author:
type: changed
...@@ -63,7 +63,6 @@ module Gitlab ...@@ -63,7 +63,6 @@ module Gitlab
# rubocop: disable Metrics/AbcSize # rubocop: disable Metrics/AbcSize
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def system_usage_data def system_usage_data
alert_bot_incident_count = count(::Issue.authored(::User.alert_bot), start: issue_minimum_id, finish: issue_maximum_id)
issues_created_manually_from_alerts = count(Issue.with_alert_management_alerts.not_authored_by(::User.alert_bot), start: issue_minimum_id, finish: issue_maximum_id) issues_created_manually_from_alerts = count(Issue.with_alert_management_alerts.not_authored_by(::User.alert_bot), start: issue_minimum_id, finish: issue_maximum_id)
{ {
...@@ -121,8 +120,8 @@ module Gitlab ...@@ -121,8 +120,8 @@ module Gitlab
issues_created_from_alerts: total_alert_issues, issues_created_from_alerts: total_alert_issues,
issues_created_gitlab_alerts: issues_created_manually_from_alerts, issues_created_gitlab_alerts: issues_created_manually_from_alerts,
issues_created_manually_from_alerts: issues_created_manually_from_alerts, issues_created_manually_from_alerts: issues_created_manually_from_alerts,
incident_issues: alert_bot_incident_count, incident_issues: count(::Issue.incident, start: issue_minimum_id, finish: issue_maximum_id),
alert_bot_incident_issues: alert_bot_incident_count, alert_bot_incident_issues: count(::Issue.authored(::User.alert_bot), start: issue_minimum_id, finish: issue_maximum_id),
incident_labeled_issues: count(::Issue.with_label_attributes(::IncidentManagement::CreateIncidentLabelService::LABEL_PROPERTIES), start: issue_minimum_id, finish: issue_maximum_id), incident_labeled_issues: count(::Issue.with_label_attributes(::IncidentManagement::CreateIncidentLabelService::LABEL_PROPERTIES), start: issue_minimum_id, finish: issue_maximum_id),
keys: count(Key), keys: count(Key),
label_lists: count(List.label), label_lists: count(List.label),
......
...@@ -31,8 +31,8 @@ FactoryBot.define do ...@@ -31,8 +31,8 @@ FactoryBot.define do
create(:project_error_tracking_setting, project: projects[1], enabled: false) create(:project_error_tracking_setting, project: projects[1], enabled: false)
create(:alerts_service, project: projects[0]) create(:alerts_service, project: projects[0])
create(:alerts_service, :inactive, project: projects[1]) create(:alerts_service, :inactive, project: projects[1])
alert_bot_issues = create_list(:issue, 2, project: projects[0], author: User.alert_bot) alert_bot_issues = create_list(:incident, 2, project: projects[0], author: User.alert_bot)
create_list(:issue, 2, project: projects[1], author: User.alert_bot) create_list(:incident, 2, project: projects[1], author: User.alert_bot)
issues = create_list(:issue, 4, project: projects[0]) issues = create_list(:issue, 4, project: projects[0])
create_list(:prometheus_alert, 2, project: projects[0]) create_list(:prometheus_alert, 2, project: projects[0])
create(:prometheus_alert, project: projects[1]) create(:prometheus_alert, project: projects[1])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment