diff --git a/integration/alertmanager_test.go b/integration/alertmanager_test.go index cbbdccdce1..2c57752d68 100644 --- a/integration/alertmanager_test.go +++ b/integration/alertmanager_test.go @@ -95,12 +95,12 @@ func TestAlertmanagerWithUserIndexUpdater(t *testing.T) { require.NoError(t, s.StartAndWaitReady(am)) // To make sure user index file is updated/scanned - require.NoError(t, am.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"}), + require.NoError(t, am.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"}, e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "alertmanager")), - ) - require.NoError(t, am.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"}), + )) + require.NoError(t, am.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"}, e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "alertmanager")), - ) + )) } func TestAlertmanagerStoreAPI(t *testing.T) { diff --git a/integration/ruler_test.go b/integration/ruler_test.go index 446f9cfade..774a3bfb6b 100644 --- a/integration/ruler_test.go +++ b/integration/ruler_test.go @@ -192,13 +192,13 @@ func TestRulerWithUserIndexUpdater(t *testing.T) { require.NoError(t, c.SetRuleGroup(ruleGroup, ns)) // To make sure user index file is updated/scanned - require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"}), + require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.Greater(float64(0)), []string{"cortex_user_index_last_successful_update_timestamp_seconds"}, e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "ruler")), - ) + )) - require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"}), + require.NoError(t, ruler.WaitSumMetricsWithOptions(e2e.GreaterOrEqual(float64(1)), []string{"cortex_user_index_scan_succeeded_total"}, e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "component", "ruler")), - ) + )) } func TestRulerAPISingleBinary(t *testing.T) { diff --git a/integration/utf8_test.go b/integration/utf8_test.go index 0863b05f03..a45af2f7fd 100644 --- a/integration/utf8_test.go +++ b/integration/utf8_test.go @@ -164,7 +164,7 @@ overrides: err = c.SetRuleGroup(ruleGroup, "namespace") require.NoError(t, err) - require.NoError(t, cortex.WaitSumMetricsWithOptions(e2e.Equals(1), []string{"cortex_ruler_managers_total"}), e2e.WithLabelMatchers(labels.MustNewMatcher(labels.MatchEqual, "user", "user-1"))) + require.NoError(t, cortex.WaitSumMetrics(e2e.Equals(1), "cortex_ruler_managers_total")) require.NoError(t, cortex.WaitSumMetricsWithOptions(e2e.Equals(1), []string{"cortex_ruler_rule_groups_in_store"}, e2e.WithLabelMatchers( labels.MustNewMatcher(labels.MatchEqual, "user", "user-1")), e2e.WaitMissingMetrics,