Merge branch...

Merge branch 'ee-fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master'

Fix alphabetical ordering in usage data

See merge request gitlab-org/gitlab-ee!3171

lib/gitlab/usage_data.rb

@@ -64,9 +64,9 @@ module Gitlab
             deployments: Deployment.count,
             environments: ::Environment.count,
             gcp_clusters: ::Gcp::Cluster.count,
-            geo_nodes: GeoNode.count,
             gcp_clusters_enabled: ::Gcp::Cluster.enabled.count,
             gcp_clusters_disabled: ::Gcp::Cluster.disabled.count,
+            geo_nodes: GeoNode.count,
             in_review_folder: ::Environment.in_review_folder.count,
             groups: Group.count,
             issues: Issue.count,

spec/lib/gitlab/usage_data_spec.rb

@@ -72,9 +72,9 @@ describe Gitlab::UsageData do
         deployments
         environments
         gcp_clusters
-        geo_nodes
         gcp_clusters_enabled
         gcp_clusters_disabled
+        geo_nodes
         in_review_folder
         groups
         issues