Merge branch '233940-product-analytics-for-group-level-integrations' into 'master'

Product analytics for group-level integrations

See merge request gitlab-org/gitlab!44726

changelogs/unreleased/233940-product-analytics-for-group-level-integrations.yml

+---
+title: Add product analytics for group-level integrations
+merge_request: 44726
+author:
+type: other

db/post_migrate/20201015154527_add_index_on_services_for_usage_data.rb

+# frozen_string_literal: true
+
+class AddIndexOnServicesForUsageData < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_services_on_type_id_when_active_and_project_id_not_null'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :services, [:type, :id], where: 'active = TRUE AND project_id IS NOT NULL', name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :services, INDEX_NAME
+  end
+end

db/schema_migrations/20201015154527

+319502924c38f5e78e40226a55ad99db53b246aa0d35eb945ac9a96f9e55f584
\ No newline at end of file

db/structure.sql

@@ -21506,6 +21506,8 @@ CREATE UNIQUE INDEX index_services_on_type_and_instance_partial ON services USIN
 
 CREATE UNIQUE INDEX index_services_on_type_and_template_partial ON services USING btree (type, template) WHERE (template = true);
 
+CREATE INDEX index_services_on_type_id_when_active_and_project_id_not_null ON services USING btree (type, id) WHERE ((active = true) AND (project_id IS NOT NULL));
+
 CREATE INDEX index_services_on_type_id_when_active_not_instance_not_template ON services USING btree (type, id) WHERE ((active = true) AND (instance = false) AND (template = false));
 
 CREATE UNIQUE INDEX index_services_on_unique_group_id_and_type ON services USING btree (group_id, type);

lib/gitlab/usage_data.rb

@@ -401,10 +401,12 @@ module Gitlab
       def services_usage
         # rubocop: disable UsageData/LargeTable:
         Service.available_services_names.each_with_object({}) do |service_name, response|
-          response["projects_#{service_name}_active".to_sym] = count(Service.active.where(template: false, instance: false, type: "#{service_name}_service".camelize))
+          response["projects_#{service_name}_active".to_sym] = count(Service.active.where.not(project: nil).where(type: "#{service_name}_service".camelize))
+          response["groups_#{service_name}_active".to_sym] = count(Service.active.where.not(group: nil).where(type: "#{service_name}_service".camelize))
           response["templates_#{service_name}_active".to_sym] = count(Service.active.where(template: true, type: "#{service_name}_service".camelize))
           response["instances_#{service_name}_active".to_sym] = count(Service.active.where(instance: true, type: "#{service_name}_service".camelize))
-          response["projects_inheriting_instance_#{service_name}_active".to_sym] = count(Service.active.where.not(inherit_from_id: nil).where(type: "#{service_name}_service".camelize))
+          response["projects_inheriting_#{service_name}_active".to_sym] = count(Service.active.where.not(project: nil).where.not(inherit_from_id: nil).where(type: "#{service_name}_service".camelize))
+          response["groups_inheriting_#{service_name}_active".to_sym] = count(Service.active.where.not(group: nil).where.not(inherit_from_id: nil).where(type: "#{service_name}_service".camelize))
         end.merge(jira_usage, jira_import_usage)
         # rubocop: enable UsageData/LargeTable:
       end

spec/factories/usage_data.rb

@@ -7,12 +7,12 @@ FactoryBot.define do
     initialize_with do
       projects = create_list(:project, 3)
       projects << create(:project, :repository)
+      group = create(:group)
       create(:board, project: projects[0])
       create(:jira_service, project: projects[0])
       create(:jira_service, :without_properties_callback, project: projects[1])
       create(:jira_service, :jira_cloud_service, project: projects[2])
-      create(:jira_service, :without_properties_callback, project: projects[3],
-             properties: { url: 'https://mysite.atlassian.net' })
+      create(:jira_service, :without_properties_callback, project: projects[3], properties: { url: 'https://mysite.atlassian.net' })
       jira_label = create(:label, project: projects[0])
       create(:jira_import_state, :finished, project: projects[0], label: jira_label, failed_to_import_count: 2, imported_issues_count: 7, total_issue_count: 9)
       create(:jira_import_state, :finished, project: projects[1], label: jira_label, imported_issues_count: 3, total_issue_count: 3)
@@ -23,9 +23,11 @@ FactoryBot.define do
       create(:service, project: projects[1], type: 'SlackService', active: true)
       create(:service, project: projects[2], type: 'SlackService', active: true)
       create(:service, project: projects[2], type: 'MattermostService', active: false)
+      create(:service, group: group, project: nil, type: 'MattermostService', active: true)
       create(:service, :template, type: 'MattermostService', active: true)
       matermost_instance = create(:service, :instance, type: 'MattermostService', active: true)
       create(:service, project: projects[1], type: 'MattermostService', active: true, inherit_from_id: matermost_instance.id)
+      create(:service, group: group, project: nil, type: 'SlackService', active: true, inherit_from_id: matermost_instance.id)
       create(:service, project: projects[2], type: 'CustomIssueTrackerService', active: true)
       create(:project_error_tracking_setting, project: projects[0])
       create(:project_error_tracking_setting, project: projects[1], enabled: false)
@@ -56,9 +58,8 @@ FactoryBot.define do
       # Incident Labeled Issues
       incident_label = create(:label, :incident, project: projects[0])
       create(:labeled_issue, project: projects[0], labels: [incident_label])
-      incident_group = create(:group)
       incident_label_scoped_to_project = create(:label, :incident, project: projects[1])
-      incident_label_scoped_to_group = create(:group_label, :incident, group: incident_group)
+      incident_label_scoped_to_group = create(:group_label, :incident, group: group)
       create(:labeled_issue, project: projects[1], labels: [incident_label_scoped_to_project])
       create(:labeled_issue, project: projects[1], labels: [incident_label_scoped_to_group])
 

spec/lib/gitlab/usage_data_spec.rb

@@ -437,9 +437,11 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       expect(count_data[:projects_slack_slash_commands_active]).to eq(1)
       expect(count_data[:projects_custom_issue_tracker_active]).to eq(1)
       expect(count_data[:projects_mattermost_active]).to eq(1)
+      expect(count_data[:groups_mattermost_active]).to eq(1)
       expect(count_data[:templates_mattermost_active]).to eq(1)
       expect(count_data[:instances_mattermost_active]).to eq(1)
-      expect(count_data[:projects_inheriting_instance_mattermost_active]).to eq(1)
+      expect(count_data[:projects_inheriting_mattermost_active]).to eq(1)
+      expect(count_data[:groups_inheriting_slack_active]).to eq(1)
       expect(count_data[:projects_with_repositories_enabled]).to eq(3)
       expect(count_data[:projects_with_error_tracking_enabled]).to eq(1)
       expect(count_data[:projects_with_tracing_enabled]).to eq(1)