diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-16 08:12:46 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-16 08:12:46 +0000 |
| commit | 076231798dd9716479d8eef118678eeb7c2c7b11 (patch) | |
| tree | e127bc6c18512bde7882363a4c23061e2d6fad0e /app | |
| parent | 7a8b97e10854f3e2f6e51a2f45bcf80cfdb9926a (diff) | |
| parent | a6b2387d3fa270e6c6069c1b7c52d01f2eb820d3 (diff) | |
| download | gitlab-ce-076231798dd9716479d8eef118678eeb7c2c7b11.tar.gz | |
Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master'
Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`
Closes #38960
See merge request gitlab-org/gitlab-ce!14807
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/gcp/cluster.rb | 3 |
1 files changed, 3 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' |