Skip to content

Commit

Permalink
Merge pull request openshift#24138 from enxebre/machine-approver-alert
Browse files Browse the repository at this point in the history
Stop excluding ClusterMachineApproverDown from firing check
  • Loading branch information
openshift-merge-robot authored Nov 20, 2019
2 parents ff958ca + b34aece commit c6489fd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/extended/prometheus/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ var _ = g.Describe("[Feature:Prometheus][Conformance] Prometheus", func() {

tests := map[string]bool{
// Checking Watchdog alert state is done in "should have a Watchdog alert in firing state".
// FIXME(paulfantom): ClusterMachineApproverDown and UsingDeprecatedAPIExtensionsV1Beta1 shouldn't be firing!
`ALERTS{alertname!~"Watchdog|ClusterMachineApproverDown|UsingDeprecatedAPIExtensionsV1Beta1",alertstate="firing"} >= 1`: false,
// FIXME(paulfantom): UsingDeprecatedAPIExtensionsV1Beta1 shouldn't be firing!
`ALERTS{alertname!~"Watchdog|UsingDeprecatedAPIExtensionsV1Beta1",alertstate="firing"} >= 1`: false,
}
runQueries(tests, oc, ns, execPod.Name, url, bearerToken)
})
Expand Down

0 comments on commit c6489fd

Please sign in to comment.