Merge branch '321786-update-usage-ping-metrics-definitions-for-group-apm' into 'master'

Remove projects_with_prometheus_alerts and pod_logs_usages_total metrics

See merge request gitlab-org/gitlab!62962

config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml

@@ -6,7 +6,8 @@ product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: '14.0'
 time_frame: 28d
 data_source: database
 distribution:

config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml

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

config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml

@@ -6,7 +6,8 @@ product_stage: monitor
 product_group: group::monitor
 product_category: logging
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: '14.0'
 time_frame: all
 data_source: database
 distribution:

config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml

@@ -6,7 +6,8 @@ product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: '14.0'
 time_frame: all
 data_source:
 distribution:

doc/development/usage_ping/dictionary.md

@@ -4122,7 +4122,7 @@ Count the total number of log views
 
 Group: `group::monitor`
 
-Status: `deprecated`
+Status: `removed`
 
 Tiers: `free`
 
@@ -5502,7 +5502,7 @@ Projects with Prometheus alerting enabled
 
 Group: `group::monitor`
 
-Status: `deprecated`
+Status: `removed`
 
 Tiers: `free`
 
@@ -15896,7 +15896,7 @@ Projects with Prometheus alerting enabled
 
 Group: `group::configure`
 
-Status: `deprecated`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -17758,7 +17758,7 @@ Projects with Prometheus alerting enabled
 
 Group: `group::monitor`
 
-Status: `deprecated`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 

ee/lib/ee/gitlab/usage_data.rb

@@ -201,7 +201,6 @@ module EE
                 issues_with_health_status: count(::Issue.with_health_status, start: minimum_id(::Issue), finish: maximum_id(::Issue)),
                 ldap_keys: count(::LDAPKey),
                 ldap_users: count(::User.ldap, 'users.id'),
-                pod_logs_usages_total: ::Gitlab::UsageData::DEPRECATED_VALUE,
                 merged_merge_requests_using_approval_rules: count(::MergeRequest.merged.joins(:approval_rules), # rubocop: disable CodeReuse/ActiveRecord
                                                                   start: minimum_id(::MergeRequest),
                                                                   finish: maximum_id(::MergeRequest)),
@@ -233,8 +232,7 @@ module EE
         def usage_activity_by_stage_configure(time_period)
           super.merge({
             projects_slack_notifications_active: distinct_count(::Project.with_slack_service.where(time_period), :creator_id),
-            projects_slack_slash_active: distinct_count(::Project.with_slack_slash_commands_service.where(time_period), :creator_id),
-            projects_with_prometheus_alerts: ::Gitlab::UsageData::DEPRECATED_VALUE
+            projects_slack_slash_active: distinct_count(::Project.with_slack_slash_commands_service.where(time_period), :creator_id)
           })
         end
 

ee/spec/lib/ee/gitlab/usage_data_spec.rb

@@ -107,11 +107,9 @@ RSpec.describe Gitlab::UsageData do
         licenses_list_views
         operations_dashboard_default_dashboard
         operations_dashboard_users_with_projects_added
-        pod_logs_usages_total
         projects_jira_issuelist_active
         projects_mirrored_with_pipelines_enabled
         projects_reporting_ci_cd_back_to_github
-        projects_with_prometheus_alerts
         sast_jobs
         secret_detection_jobs
         status_page_incident_publishes
@@ -125,7 +123,6 @@ RSpec.describe Gitlab::UsageData do
         network_policy_drops
       ))
 
-      expect(count_data[:projects_with_prometheus_alerts]).to eq(Gitlab::UsageData::DEPRECATED_VALUE)
       expect(count_data[:feature_flags]).to eq(1)
       expect(count_data[:status_page_projects]).to eq(1)
       expect(count_data[:status_page_issues]).to eq(1)
@@ -267,13 +264,11 @@ RSpec.describe Gitlab::UsageData do
 
       expect(described_class.usage_activity_by_stage_configure({})).to include(
         projects_slack_notifications_active: 2,
-        projects_slack_slash_active: 2,
-        projects_with_prometheus_alerts: Gitlab::UsageData::DEPRECATED_VALUE
+        projects_slack_slash_active: 2
       )
       expect(described_class.usage_activity_by_stage_configure(described_class.monthly_time_range_db_params)).to include(
         projects_slack_notifications_active: 1,
-        projects_slack_slash_active: 1,
-        projects_with_prometheus_alerts: Gitlab::UsageData::DEPRECATED_VALUE
+        projects_slack_slash_active: 1
       )
     end
   end

lib/gitlab/usage_data.rb

@@ -166,7 +166,6 @@ module Gitlab
             projects_with_error_tracking_enabled: count(::ErrorTracking::ProjectErrorTrackingSetting.where(enabled: true)),
             projects_with_alerts_created: distinct_count(::AlertManagement::Alert, :project_id),
             projects_with_enabled_alert_integrations: distinct_count(::AlertManagement::HttpIntegration.active, :project_id),
-            projects_with_prometheus_alerts: DEPRECATED_VALUE,
             projects_with_terraform_reports: distinct_count(::Ci::JobArtifact.terraform_reports, :project_id),
             projects_with_terraform_states: distinct_count(::Terraform::State, :project_id),
             protected_branches: count(ProtectedBranch),

spec/lib/gitlab/usage_data_spec.rb

@@ -576,7 +576,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       expect(count_data[:projects_with_error_tracking_enabled]).to eq(1)
       expect(count_data[:projects_with_tracing_enabled]).to eq(1)
       expect(count_data[:projects_with_enabled_alert_integrations]).to eq(1)
-      expect(count_data[:projects_with_prometheus_alerts]).to eq(Gitlab::UsageData::DEPRECATED_VALUE)
       expect(count_data[:projects_with_terraform_reports]).to eq(2)
       expect(count_data[:projects_with_terraform_states]).to eq(2)
       expect(count_data[:projects_with_alerts_created]).to eq(1)

spec/support/helpers/usage_data_helpers.rb

@@ -99,7 +99,6 @@ module UsageDataHelpers
       projects_with_repositories_enabled
       projects_with_error_tracking_enabled
       projects_with_enabled_alert_integrations
-      projects_with_prometheus_alerts
       projects_with_tracing_enabled
       projects_with_expiration_policy_enabled
       projects_with_expiration_policy_disabled