diff options
author | Peter Leitzen <pleitzen@gitlab.com> | 2018-11-16 17:02:43 +0300 |
---|---|---|
committer | Peter Leitzen <pleitzen@gitlab.com> | 2018-11-24 00:35:38 +0300 |
commit | b47a3a408536b0e4ae6b2dcd81863ded9f52942d (patch) | |
tree | 8f790a557f9f6e02be22d9005946448abeaa2402 /lib/gitlab/prometheus | |
parent | fbbe5ccd1be471a203185c172c51b7137b73f170 (diff) |
Extract query variables into own module
Diffstat (limited to 'lib/gitlab/prometheus')
-rw-r--r-- | lib/gitlab/prometheus/queries/query_additional_metrics.rb | 7 | ||||
-rw-r--r-- | lib/gitlab/prometheus/query_variables.rb | 15 |
2 files changed, 17 insertions, 5 deletions
diff --git a/lib/gitlab/prometheus/queries/query_additional_metrics.rb b/lib/gitlab/prometheus/queries/query_additional_metrics.rb index 43508af96a7..960d3536ec0 100644 --- a/lib/gitlab/prometheus/queries/query_additional_metrics.rb +++ b/lib/gitlab/prometheus/queries/query_additional_metrics.rb @@ -83,11 +83,8 @@ module Gitlab end 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.deployment_platform&.actual_namespace || '', - environment_filter: %{container_name!="POD",environment="#{environment.slug}"} - }) + base_query_context(timeframe_start, timeframe_end) + .merge(QueryVariables.call(environment)) end def base_query_context(timeframe_start, timeframe_end) diff --git a/lib/gitlab/prometheus/query_variables.rb b/lib/gitlab/prometheus/query_variables.rb new file mode 100644 index 00000000000..1cc85d4b4a6 --- /dev/null +++ b/lib/gitlab/prometheus/query_variables.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Gitlab + module Prometheus + module QueryVariables + def self.call(environment) + { + ci_environment_slug: environment.slug, + kube_namespace: environment.deployment_platform&.actual_namespace || '', + environment_filter: %{container_name!="POD",environment="#{environment.slug}"} + } + end + end + end +end |