diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 11:43:12 +0200 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 11:43:12 +0200 |
commit | bafe3a6d6a12c5407993e338b89ebd2b4b76b03a (patch) | |
tree | 9062e032995bb9ded0ec317d192ac6f90a490084 | |
parent | 1d0f0cc0ceb2872f23db37ad396ba2d386c91a7b (diff) | |
download | gitlab-ce-bafe3a6d6a12c5407993e338b89ebd2b4b76b03a.tar.gz |
Fix common_metrics.yml
-rw-r--r-- | config/prometheus/common_metrics.yml | 1 | ||||
-rw-r--r-- | spec/db/importers/common_metrics_importer_spec.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/prometheus/common_metrics.yml b/config/prometheus/common_metrics.yml index ca359d344cd..52023a2e3cb 100644 --- a/config/prometheus/common_metrics.yml +++ b/config/prometheus/common_metrics.yml @@ -207,6 +207,7 @@ required_metrics: - container_cpu_usage_seconds_total weight: 1 + queries: - id: system_metrics_kubernetes_container_core_usage_canary query_range: 'avg(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (job)) without (job) / count(sum(rate(container_cpu_usage_seconds_total{container_name!="POD",pod_name=~"^%{ci_environment_slug}-canary-(.*)",namespace="%{kube_namespace}"}[15m])) by (pod_name))' label: Pod average diff --git a/spec/db/importers/common_metrics_importer_spec.rb b/spec/db/importers/common_metrics_importer_spec.rb index 30945f3ba51..16b59e1dfe8 100644 --- a/spec/db/importers/common_metrics_importer_spec.rb +++ b/spec/db/importers/common_metrics_importer_spec.rb @@ -43,7 +43,7 @@ describe Importers::CommonMetricsImporter do end it "imports all IDs" do - expect(PrometheusMetric.common.pluck(:identifier)).to eq(query_ids) + expect(PrometheusMetric.common.pluck(:identifier)).to contain_exactly(*query_ids) end end |