diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-26 13:23:04 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-07-26 13:23:04 +0000 |
| commit | 995d8e6c5e52afc294573e016f86f2a429b85d8e (patch) | |
| tree | 28e8ce2609045a73cf54880da261c04d8c322ff5 /app | |
| parent | 6d830eaea38ba3b917ecad40e630afe2c0ec36c5 (diff) | |
| parent | 41f87e9e99e14f7d591f222b0246467acd040625 (diff) | |
| download | gitlab-ce-995d8e6c5e52afc294573e016f86f2a429b85d8e.tar.gz | |
Merge branch 'remove_deployment_metrics_deployment_platform_fallback' into 'master'
Remove fallback to deployment_platform_cluster in `DeploymentMetrics`
See merge request gitlab-org/gitlab-ce!31126
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/deployment_metrics.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/models/deployment_metrics.rb b/app/models/deployment_metrics.rb index cfe762ca25e..2056c8bc59c 100644 --- a/app/models/deployment_metrics.rb +++ b/app/models/deployment_metrics.rb @@ -44,18 +44,7 @@ class DeploymentMetrics end end - # TODO remove fallback case to deployment_platform_cluster. - # Otherwise we will continue to pay the performance penalty described in - # https://gitlab.com/gitlab-org/gitlab-ce/issues/63475 - # - # Removal issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/64105 def cluster_prometheus - cluster_with_fallback = cluster || deployment_platform_cluster - - cluster_with_fallback.application_prometheus if cluster_with_fallback&.application_prometheus_available? - end - - def deployment_platform_cluster - deployment.environment.deployment_platform&.cluster + cluster.application_prometheus if cluster&.application_prometheus_available? end end |