Merge branch '329094-Deprecate-and-remove-service-template-metrics' into 'master'

Remove service template metrics

See merge request gitlab-org/gitlab!71286

config/metrics/counts_all/20210216175627_templates_asana_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175638_templates_assembla_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175649_templates_bamboo_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175712_templates_buildkite_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175723_templates_campfire_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175734_templates_confluence_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175756_templates_discord_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175840_templates_flowdock_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175924_templates_irker_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175935_templates_jenkins_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175946_templates_jira_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175957_templates_mattermost_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180030_templates_packagist_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180104_templates_pushover_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180115_templates_redmine_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180126_templates_slack_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180148_templates_teamcity_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180221_templates_youtrack_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216180934_templates_prometheus_active.yml

@@ -7,7 +7,8 @@ product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216182551_templates_datadog_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216182618_templates_ewm_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

ee/config/metrics/counts_all/20210216175851_templates_github_active.yml

@@ -7,7 +7,8 @@ product_stage: ecosystem
 product_group: group::integrations
 product_category: integrations
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.4'
 time_frame: all
 data_source: database
 distribution:

lib/gitlab/usage_data.rb

@@ -404,7 +404,6 @@ module Gitlab
 
           response[:"projects_#{name}_active"] = count(Integration.active.where.not(project: nil).where(type: type))
           response[:"groups_#{name}_active"] = count(Integration.active.where.not(group: nil).where(type: type))
-          response[:"templates_#{name}_active"] = count(Integration.active.where(template: true, type: type))
           response[:"instances_#{name}_active"] = count(Integration.active.where(instance: true, type: type))
           response[:"projects_inheriting_#{name}_active"] = count(Integration.active.where.not(project: nil).where.not(inherit_from_id: nil).where(type: type))
           response[:"groups_inheriting_#{name}_active"] = count(Integration.active.where.not(group: nil).where.not(inherit_from_id: nil).where(type: type))