diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-07 16:56:29 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-02-07 16:56:29 +0000 |
| commit | 1b748440c25619a2aaedef085e6f0aca26ef0d94 (patch) | |
| tree | ad343ebaec9bc236254fc7df2951670c69dc3f2c /spec/factories | |
| parent | bb6895ec6cb60b8db6a615b12628685a088d1f1d (diff) | |
| parent | 0e90284c11815f84c804e7e922e709b31ca6d029 (diff) | |
| download | gitlab-ce-1b748440c25619a2aaedef085e6f0aca26ef0d94.tar.gz | |
Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'
Deploy prometheus through kubernetes and autoconnect to cluster
Closes #30480 and #28916
See merge request gitlab-org/gitlab-ce!16182
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/projects.rb | 3 | ||||
| -rw-r--r-- | spec/factories/services.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index 20976977f21..f92b307fee4 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -249,7 +249,8 @@ FactoryBot.define do project.create_prometheus_service( active: true, properties: { - api_url: 'https://prometheus.example.com' + api_url: 'https://prometheus.example.com/', + manual_configuration: true } ) end diff --git a/spec/factories/services.rb b/spec/factories/services.rb index 110ef33c6f7..0d4fd49bf3a 100644 --- a/spec/factories/services.rb +++ b/spec/factories/services.rb @@ -30,7 +30,8 @@ FactoryBot.define do project active true properties({ - api_url: 'https://prometheus.example.com/' + api_url: 'https://prometheus.example.com/', + manual_configuration: true }) end |