Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count

4 files changed, 31 insertions, 0 deletions

diff --git a/app/models/gcp/cluster.rb b/app/models/gcp/cluster.rb
index 18bd6a6dcb4..162a690c0e3 100644
--- a/app/models/gcp/cluster.rb
+++ b/app/models/gcp/cluster.rb
@@ -7,6 +7,9 @@ module Gcp
     belongs_to :user
     belongs_to :service
 
+    scope :enabled, -> { where(enabled: true) }
+    scope :disabled, -> { where(enabled: false) }
+
     default_value_for :gcp_cluster_zone, 'us-central1-a'
     default_value_for :gcp_cluster_size, 3
     default_value_for :gcp_machine_type, 'n1-standard-4'
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 3f3ba77d47f..70a403652e7 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -49,6 +49,8 @@ module Gitlab
             deployments: Deployment.count,
             environments: ::Environment.count,
             gcp_clusters: ::Gcp::Cluster.count,
+            gcp_clusters_enabled: ::Gcp::Cluster.enabled.count,
+            gcp_clusters_disabled: ::Gcp::Cluster.disabled.count,
             in_review_folder: ::Environment.in_review_folder.count,
             groups: Group.count,
             issues: Issue.count,
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 777e9c8e21d..a7b65e94706 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -61,6 +61,8 @@ describe Gitlab::UsageData do
         deployments
         environments
         gcp_clusters
+        gcp_clusters_enabled
+        gcp_clusters_disabled
         in_review_folder
         groups
         issues
diff --git a/spec/models/gcp/cluster_spec.rb b/spec/models/gcp/cluster_spec.rb
index 350fbc257d9..8f39fff6394 100644
--- a/spec/models/gcp/cluster_spec.rb
+++ b/spec/models/gcp/cluster_spec.rb
@@ -7,6 +7,30 @@ describe Gcp::Cluster do
 
   it { is_expected.to validate_presence_of(:gcp_cluster_zone) }
 
+  describe '.enabled' do
+    subject { described_class.enabled }
+
+    let!(:cluster) { create(:gcp_cluster, enabled: true) }
+
+    before do
+      create(:gcp_cluster, enabled: false)
+    end
+
+    it { is_expected.to contain_exactly(cluster) }
+  end
+
+  describe '.disabled' do
+    subject { described_class.disabled }
+
+    let!(:cluster) { create(:gcp_cluster, enabled: false) }
+
+    before do
+      create(:gcp_cluster, enabled: true)
+    end
+
+    it { is_expected.to contain_exactly(cluster) }
+  end
+
   describe '#default_value_for' do
     let(:cluster) { described_class.new }