1 files changed, 66 insertions, 17 deletions

diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 38dc82493cf..37d3512990e 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -1,7 +1,5 @@
 module Gitlab
   class UsageData
-    include Gitlab::CurrentSettings
-
     class << self
       def data(force_refresh: false)
         Rails.cache.fetch('usage_data', force: force_refresh, expires_in: 2.weeks) { uncached_data }
@@ -9,25 +7,50 @@ module Gitlab
 
       def uncached_data
         license_usage_data.merge(system_usage_data)
+                          .merge(features_usage_data)
+                          .merge(components_usage_data)
+                          .merge(cycle_analytics_usage_data)
       end
 
       def to_json(force_refresh: false)
         data(force_refresh: force_refresh).to_json
       end
 
+      def license_usage_data
+        usage_data = {
+          uuid: Gitlab::CurrentSettings.uuid,
+          hostname: Gitlab.config.gitlab.host,
+          version: Gitlab::VERSION,
+          active_user_count: User.active.count,
+          recorded_at: Time.now,
+          mattermost_enabled: Gitlab.config.mattermost.enabled,
+          edition: 'CE'
+        }
+
+        usage_data
+      end
+
       def system_usage_data
         {
           counts: {
             boards: Board.count,
             ci_builds: ::Ci::Build.count,
-            ci_pipelines: ::Ci::Pipeline.count,
+            ci_internal_pipelines: ::Ci::Pipeline.internal.count,
+            ci_external_pipelines: ::Ci::Pipeline.external.count,
+            ci_pipeline_config_auto_devops: ::Ci::Pipeline.auto_devops_source.count,
+            ci_pipeline_config_repository: ::Ci::Pipeline.repository_source.count,
             ci_runners: ::Ci::Runner.count,
             ci_triggers: ::Ci::Trigger.count,
             ci_pipeline_schedules: ::Ci::PipelineSchedule.count,
+            auto_devops_enabled: ::ProjectAutoDevops.enabled.count,
+            auto_devops_disabled: ::ProjectAutoDevops.disabled.count,
             deploy_keys: DeployKey.count,
             deployments: Deployment.count,
-            environments: Environment.count,
-            in_review_folder: Environment.in_review_folder.count,
+            environments: ::Environment.count,
+            clusters: ::Clusters::Cluster.count,
+            clusters_enabled: ::Clusters::Cluster.enabled.count,
+            clusters_disabled: ::Clusters::Cluster.disabled.count,
+            in_review_folder: ::Environment.in_review_folder.count,
             groups: Group.count,
             issues: Issue.count,
             keys: Key.count,
@@ -38,29 +61,55 @@ module Gitlab
             notes: Note.count,
             pages_domains: PagesDomain.count,
             projects: Project.count,
-            projects_prometheus_active: PrometheusService.active.count,
+            projects_imported_from_github: Project.where(import_type: 'github').count,
             protected_branches: ProtectedBranch.count,
             releases: Release.count,
             snippets: Snippet.count,
             todos: Todo.count,
             uploads: Upload.count,
             web_hooks: WebHook.count
-          }
+          }.merge(services_usage)
         }
       end
 
-      def license_usage_data
-        usage_data = {
-          uuid: current_application_settings.uuid,
-          hostname: Gitlab.config.gitlab.host,
-          version: Gitlab::VERSION,
-          active_user_count: User.active.count,
-          recorded_at: Time.now,
-          mattermost_enabled: Gitlab.config.mattermost.enabled,
-          edition: 'CE'
+      def cycle_analytics_usage_data
+        Gitlab::CycleAnalytics::UsageData.new.to_json
+      end
+
+      def features_usage_data
+        features_usage_data_ce
+      end
+
+      def features_usage_data_ce
+        {
+          signup: Gitlab::CurrentSettings.allow_signup?,
+          ldap: Gitlab.config.ldap.enabled,
+          gravatar: Gitlab::CurrentSettings.gravatar_enabled?,
+          omniauth: Gitlab.config.omniauth.enabled,
+          reply_by_email: Gitlab::IncomingEmail.enabled?,
+          container_registry: Gitlab.config.registry.enabled,
+          gitlab_shared_runners: Gitlab.config.gitlab_ci.shared_runners_enabled
         }
+      end
 
-        usage_data
+      def components_usage_data
+        {
+          gitlab_pages: { enabled: Gitlab.config.pages.enabled, version: Gitlab::Pages::VERSION },
+          git: { version: Gitlab::Git.version },
+          database: { adapter: Gitlab::Database.adapter_name, version: Gitlab::Database.version }
+        }
+      end
+
+      def services_usage
+        types = {
+          JiraService: :projects_jira_active,
+          SlackService: :projects_slack_notifications_active,
+          SlackSlashCommandsService: :projects_slack_slash_active,
+          PrometheusService: :projects_prometheus_active
+        }
+
+        results = Service.unscoped.where(type: types.keys, active: true).group(:type).count
+        results.each_with_object({}) { |(key, value), response| response[types[key.to_sym]] = value  }
       end
     end
   end