Add index and report aproximate grafana embeds

app/models/issue.rb

@@ -62,10 +62,10 @@ class Issue < ApplicationRecord
   scope :order_relative_position_asc, -> { reorder(::Gitlab::Database.nulls_last_order('relative_position', 'ASC')) }
 
   scope :preload_associated_models, -> { preload(:labels, project: :namespace) }
-  scope :with_project_grafana_integration, -> { includes(project: :grafana_integration).where(projects: { grafana_integrations: { enabled: true } } ) }
+  scope :with_project_grafana_integration, -> { joins(project: :grafana_integration).where(projects: { grafana_integrations: { enabled: true } } ) }
   scope :with_api_entity_associations, -> { preload(:timelogs, :assignees, :author, :notes, :labels, project: [:route, { namespace: :route }] ) }
 
-  scope :grafana_embedded, -> { where('"issues"."description_html" LIKE \'%data-dashboard-url%\'').where('"issues"."description" ~* "grafana_integrations"."grafana_url"') }
+  scope :grafana_embedded_aprox, -> { where('"issues"."description" ILIKE \'%\' || "grafana_integrations"."grafana_url" || \'%\'') }
 
   scope :public_only, -> { where(confidential: false) }
   scope :confidential_only, -> { where(confidential: true) }

db/migrate/20191120200015_add_index_to_grafana_integrations.rb

+class AddIndexToGrafanaIntegrations < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :grafana_integrations, :enabled, where: 'enabled IS TRUE'
+  end
+
+  def down
+    remove_concurrent_index :grafana_integrations, :enabled
+  end
+end

db/schema.rb

@@ -1888,6 +1888,7 @@ ActiveRecord::Schema.define(version: 2019_11_25_140458) do
     t.string "encrypted_token_iv", limit: 255, null: false
     t.string "grafana_url", limit: 1024, null: false
     t.boolean "enabled", default: false, null: false
+    t.index ["enabled"], name: "index_grafana_integrations_on_enabled", where: "(enabled IS TRUE)"
     t.index ["project_id"], name: "index_grafana_integrations_on_project_id"
   end
 

lib/gitlab/grafana_embed_usage_data.rb

@@ -4,12 +4,12 @@ module Gitlab
   class GrafanaEmbedUsageData
     class << self
       def issue_count
-        count = 0
-        Issue.select(:id).with_project_grafana_integration.grafana_embedded.each_batch do |issue_batch|
-          count += issue_batch.count
-        end
-
-        count
+        # rubocop:disable CodeReuse/ActiveRecord
+        Issue.joins(project: :grafana_integration)
+          .merge(Project.with_grafana_integration_enabled)
+          .where("issues.description LIKE '%' || grafana_integrations.grafana_url || '%'")
+          .count
+        # rubocop:enable CodeReuse/ActiveRecord
       end
     end
   end

lib/gitlab/usage_data.rb

@@ -84,7 +84,7 @@ module Gitlab
             issues: count(Issue),
             issues_with_associated_zoom_link: count(ZoomMeeting.added_to_issue),
             issues_using_zoom_quick_actions: count(ZoomMeeting.select(:issue_id).distinct),
-            issues_with_embeded_grafana_charts: ::Gitlab::GrafanaEmbedUsageData.issue_count,
+            issues_with_embeded_grafana_charts_aprox: ::Gitlab::GrafanaEmbedUsageData.issue_count,
             keys: count(Key),
             label_lists: count(List.label),
             lfs_objects: count(LfsObject),

spec/lib/gitlab/usage_data_spec.rb

@@ -154,7 +154,7 @@ describe Gitlab::UsageData do
         issues
         issues_with_associated_zoom_link
         issues_using_zoom_quick_actions
-        issues_with_embeded_grafana_charts
+        issues_with_embeded_grafana_charts_aprox
         keys
         label_lists
         labels
@@ -214,7 +214,7 @@ describe Gitlab::UsageData do
       expect(count_data[:projects_with_error_tracking_enabled]).to eq(1)
       expect(count_data[:issues_with_associated_zoom_link]).to eq(2)
       expect(count_data[:issues_using_zoom_quick_actions]).to eq(3)
-      expect(count_data[:issues_with_embeded_grafana_charts]).to eq(2)
+      expect(count_data[:issues_with_embeded_grafana_charts_aprox]).to eq(2)
 
       expect(count_data[:clusters_enabled]).to eq(4)
       expect(count_data[:project_clusters_enabled]).to eq(3)