diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-03-29 20:57:25 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-03-29 20:57:25 +0200 |
| commit | 427eeb43bf4b382b873d3fe839029c57b117d61b (patch) | |
| tree | 2fe39a783b69251bde41c45d7121b5963ceefa48 | |
| parent | 3e3e7d54d5b4e7b917cffe36cde30474cc2937cd (diff) | |
| download | gitlab-ce-427eeb43bf4b382b873d3fe839029c57b117d61b.tar.gz | |
Query GCP provider table instead of selecting clusters
| -rw-r--r-- | lib/gitlab/usage_data.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 645dcecfe70..6335b6bc585 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -51,7 +51,7 @@ module Gitlab clusters: ::Clusters::Cluster.count, clusters_enabled: ::Clusters::Cluster.enabled.count, clusters_disabled: ::Clusters::Cluster.disabled.count, - clusters_platforms_gke: ::Clusters::Cluster.where(provider_type: ::Clusters::Cluster.provider_types[:gcp]).enabled.select { |cluster| cluster.status == ::Clusters::Providers::Gcp.state_machines[:status].states[:created].value }.count, + clusters_platforms_gke: ::Clusters::Cluster.includes(:provider_gcp).where(provider_type: ::Clusters::Cluster.provider_types[:gcp], cluster_providers_gcp: { status: ::Clusters::Providers::Gcp.state_machines[:status].states[:created].value }).enabled.count, clusters_platforms_user: ::Clusters::Cluster.where(provider_type: ::Clusters::Cluster.provider_types[:user]).enabled.count, clusters_applications_helm: ::Clusters::Applications::Helm.where(status: ::Clusters::Applications::Helm.state_machines[:status].states[:installed].value).count, clusters_applications_ingress: ::Clusters::Applications::Ingress.where(status: ::Clusters::Applications::Ingress.state_machines[:status].states[:installed].value).count, |