kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use deployment platform to find cluster with prometheus application

Browse source
This commit is contained in:
Pawel Chojnacki 2018-02-24 00:56:50 +01:00
parent 57de968a92
commit 22e2cad910
2 changed files with 12 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/environment.rb
View file

@ -233,12 +233,10 @@ class Environment < ActiveRecord::Base
end
def cluster_prometheus_adapter
# sort results by descending order based on environment_scope being longer
# thus more closely matching environment slug
clusters = project.clusters.enabled.for_environment(self).sort_by { |c| c.environment_scope&.length }.reverse!
cluster = project.deployment_platform&.cluster
return unless cluster&.application_prometheus&.installed?
cluster = clusters&.detect { |cluster| cluster.application_prometheus&.installed? }
cluster&.application_prometheus
cluster.application_prometheus
end
private

51
spec/models/environment_spec.rb
View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe Environment do
set(:project) { create(:project) }
let(:project) { create(:project) }
subject(:environment) { create(:environment, project: project) }
it { is_expected.to belong_to(:project) }
@ -623,10 +623,7 @@ describe Environment do
end
describe '#prometheus_adapter' do
let!(:cluster_for_all) { create(:cluster, environment_scope: '*', projects: [project]) }
let!(:cluster_for_dev) { create(:cluster, environment_scope: 'dev', projects: [project]) }
let!(:prometheus_for_dev) { create(:clusters_applications_prometheus, :installed, cluster: cluster_for_dev) }
let(:cluster) { create(:cluster, :provided_by_user, environment_scope: '*', projects: [project]) }
context 'prometheus service can execute queries' do
let(:prometheus_service) { double(:prometheus_service, can_query?: true) }
@ -643,55 +640,19 @@ describe Environment do
context "prometheus service can't execute queries" do
let(:prometheus_service) { double(:prometheus_service, can_query?: false) }
context 'with cluster for all environments with prometheus installed' do
let!(:prometheus_for_all) { create(:clusters_applications_prometheus, :installed, cluster: cluster_for_all) }
context 'without environment supplied' do
it 'returns application handling all environments' do
expect(environment.prometheus_adapter).to eq(prometheus_for_all)
end
end
context 'with dev environment supplied' do
let!(:environment) { create(:environment, project: project, name: 'dev') }
it 'returns dev cluster prometheus application' do
expect(environment.prometheus_adapter).to eq(prometheus_for_dev)
end
end
context 'with prod environment supplied' do
let!(:environment) { create(:environment, project: project, name: 'prod') }
context 'with cluster with prometheus installed' do
let!(:prometheus) { create(:clusters_applications_prometheus, :installed, cluster: cluster) }
it 'returns application handling all environments' do
expect(environment.prometheus_adapter).to eq(prometheus_for_all)
end
expect(environment.prometheus_adapter).to eq(prometheus)
end
end
context 'with cluster for all environments without prometheus installed' do
context 'without environment supplied' do
context 'with cluster without prometheus installed' do
it 'returns nil' do
expect(environment.prometheus_adapter).to be_nil
end
end
context 'with dev environment supplied' do
let!(:environment) { create(:environment, project: project, name: 'dev') }
it 'returns dev cluster prometheus application' do
expect(environment.prometheus_adapter).to eq(prometheus_for_dev)
end
end
context 'with prod environment supplied' do
let!(:environment) { create(:environment, project: project, name: 'prod') }
it 'returns nil' do
expect(environment.prometheus_adapter).to be_nil
end
end
end
end
end
end