diff --git a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml index 54437cfbf3696387835f1d7f2dff800f87ca87a8..bbaba8463a0d3df2454d30bee26fe54b76d22b82 100644 --- a/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml +++ b/config/metrics/counts_all/20210916200931_clusters_integrations_elastic_stack.yml @@ -7,7 +7,7 @@ product_stage: configure product_group: group::configure product_category: kubernetes_management value_type: number -status: active +status: removed time_frame: all data_source: database distribution: @@ -19,3 +19,5 @@ tier: - ultimate performance_indicator_type: [] milestone: "14.4" +milestone_removed: "15.2" +removed_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/90699" diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index cb4cbc81b33c6bb5d7d37b1835fef862bb57bd24..12dae79c60e197900cee9ff864c8230f3d760c04 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -105,7 +105,6 @@ def system_usage_data clusters_platforms_gke: count(::Clusters::Cluster.gcp_installed.enabled), clusters_platforms_user: count(::Clusters::Cluster.user_provided.enabled), clusters_management_project: count(::Clusters::Cluster.with_management_project), - clusters_integrations_elastic_stack: count(::Clusters::Integrations::ElasticStack.enabled), clusters_integrations_prometheus: count(::Clusters::Integrations::Prometheus.enabled), kubernetes_agents: count(::Clusters::Agent), kubernetes_agents_with_token: distinct_count(::Clusters::AgentToken, :agent_id), diff --git a/spec/factories/usage_data.rb b/spec/factories/usage_data.rb index 8a43ea64390fb77fb58ad4d27bfd32f111eb6d5f..0e944b90d0c38300e7879ffd93f052b28a17f227 100644 --- a/spec/factories/usage_data.rb +++ b/spec/factories/usage_data.rb @@ -83,7 +83,6 @@ # Cluster Integrations create(:clusters_integrations_prometheus, cluster: gcp_cluster) - create(:clusters_integrations_elastic_stack, cluster: gcp_cluster) create(:grafana_integration, project: projects[0], enabled: true) create(:grafana_integration, project: projects[1], enabled: true) diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 3a223dfd49114f6e4af1f3b4a1683b61ab3ac6a9..77e112edacac7871a725d61c8e4b7974782eb21f 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -560,7 +560,6 @@ def omniauth_providers expect(count_data[:clusters_platforms_eks]).to eq(1) expect(count_data[:clusters_platforms_gke]).to eq(1) expect(count_data[:clusters_platforms_user]).to eq(1) - expect(count_data[:clusters_integrations_elastic_stack]).to eq(1) expect(count_data[:clusters_integrations_prometheus]).to eq(1) expect(count_data[:grafana_integrated_projects]).to eq(2) expect(count_data[:clusters_management_project]).to eq(1) diff --git a/spec/support/helpers/usage_data_helpers.rb b/spec/support/helpers/usage_data_helpers.rb index 1041350129e87a6ae4e9c1ea83dace4ad7ebb5cf..2a9144614d034a40cc19b63ee840899c6f8204ed 100644 --- a/spec/support/helpers/usage_data_helpers.rb +++ b/spec/support/helpers/usage_data_helpers.rb @@ -53,7 +53,6 @@ module UsageDataHelpers clusters_platforms_eks clusters_platforms_gke clusters_platforms_user - clusters_integrations_elastic_stack clusters_integrations_prometheus clusters_management_project in_review_folder