diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 13:38:29 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-06 13:38:29 +0000 |
| commit | 80e04c3c47ca600fa6dab31540dbe96bf423387b (patch) | |
| tree | 03f7364799ef7f98b239ff9b0ac58bcd23b8d0db /lib | |
| parent | 788941616b8f65069db0e4a2c07bbebb4739b2ee (diff) | |
| parent | 8fc9ff7f131aa850ce4b1a8cb86ab4fa9b46410d (diff) | |
| download | gitlab-ce-80e04c3c47ca600fa6dab31540dbe96bf423387b.tar.gz | |
Merge branch 'fix/gb/fix-deployment-platform-for-environment' into 'master'
Fix environment deployment platform filter method
See merge request gitlab-org/gitlab-ce!18216
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/prometheus/queries/query_additional_metrics.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb index aad76e335af..f5879de1e94 100644 --- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb +++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb @@ -79,7 +79,7 @@ module Gitlab def common_query_context(environment, timeframe_start:, timeframe_end:) base_query_context(timeframe_start, timeframe_end).merge({ ci_environment_slug: environment.slug, - kube_namespace: environment.project.deployment_platform&.actual_namespace || '', + kube_namespace: environment.deployment_platform&.actual_namespace || '', environment_filter: %{container_name!="POD",environment="#{environment.slug}"} }) end |