Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 2272803fcfa..68e70ecf8e1 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -286,7 +286,7 @@ module Gitlab
         results[:projects_slack_notifications_active] = results[:projects_slack_active]
         results[:projects_slack_slash_active] = results[:projects_slack_slash_commands_active]
 
-        results.merge(jira_usage)
+        results.merge(jira_usage).merge(jira_import_usage)
       end
 
       def jira_usage
@@ -320,6 +320,16 @@ module Gitlab
       end
       # rubocop: enable CodeReuse/ActiveRecord
 
+      def jira_import_usage
+        finished_jira_imports = JiraImportState.finished
+
+        {
+          jira_imports_total_imported_count: count(finished_jira_imports),
+          jira_imports_projects_count: distinct_count(finished_jira_imports, :project_id),
+          jira_imports_total_imported_issues_count: alt_usage_data { JiraImportState.finished_imports_count }
+        }
+      end
+
       def user_preferences_usage
         {} # augmented in EE
       end