Update prometheus expected query

a2dd4592 · Ash McKenzie · Dylan Griffith · 89ff97b1 · a2dd4592
Commit a2dd4592 authored Jul 16, 2020 by Ash McKenzie Committed by Dylan Griffith Jul 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb ...e_variable_interpolation_format_in_common_metrics_spec.rb +8 -3

No files found.
--- a/spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb
+++ b/spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb
@@ -23,9 +23,14 @@ RSpec.describe ChangeVariableInterpolationFormatInCommonMetrics, :migration do
  end

  it 'updates query to use {{}}' do
-    expected_query = 'avg(sum(container_memory_usage_bytes{container_name!="POD",' \
-    'pod_name=~"^{{ci_environment_slug}}-(.*)",namespace="{{kube_namespace}}"})' \
-    ' by (job)) without (job)  /1024/1024/1024'
+    expected_query = <<~EOS.chomp
+    avg(sum(container_memory_usage_bytes{container!="POD",\
+    pod=~"^{{ci_environment_slug}}-(.*)",namespace="{{kube_namespace}}"}) \
+    by (job)) without (job)  /1024/1024/1024     OR      \
+    avg(sum(container_memory_usage_bytes{container_name!="POD",\
+    pod_name=~"^{{ci_environment_slug}}-(.*)",namespace="{{kube_namespace}}"}) \
+    by (job)) without (job)  /1024/1024/1024
+    EOS

    migrate!