Unmute smoke test monitoring with watcher. (#51490)

Author: martijnvg

x-pack/qa/smoke-test-monitoring-with-watcher/build.gradle

@@ -8,8 +8,11 @@ dependencies {
 
 testClusters.integTest {
   testDistribution = 'DEFAULT'
+  setting 'xpack.slm.enabled', 'false'
   setting 'xpack.ilm.enabled', 'false'
   setting 'xpack.monitoring.enabled', 'true'
+  setting 'xpack.monitoring.collection.enabled', 'true'
+  setting 'xpack.monitoring.collection.interval', '1s'
   setting 'xpack.watcher.enabled', 'true'
   setting 'xpack.security.enabled', 'false'
   setting 'xpack.ml.enabled', 'false'

x-pack/qa/smoke-test-monitoring-with-watcher/src/test/java/org/elasticsearch/smoketest/MonitoringWithWatcherRestIT.java

@@ -5,7 +5,6 @@
  */
 package org.elasticsearch.smoketest;
 
-import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.Response;
 import org.elasticsearch.common.Strings;
@@ -18,7 +17,6 @@
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.is;
 
-@AwaitsFix(bugUrl = "flaky tests")
 public class MonitoringWithWatcherRestIT extends ESRestTestCase {
 
     /**
@@ -79,9 +77,11 @@ public void testThatHttpExporterAddsWatches() throws Exception {
     }
 
     private void assertMonitoringWatchHasBeenOverWritten(String watchId) throws Exception {
-        ObjectPath path = ObjectPath.createFromResponse(client().performRequest(new Request("GET", "/_watcher/watch/" + watchId)));
-        String interval = path.evaluate("watch.trigger.schedule.interval");
-        assertThat(interval, is("1m"));
+        assertBusy(() -> {
+            ObjectPath path = ObjectPath.createFromResponse(client().performRequest(new Request("GET", "/_watcher/watch/" + watchId)));
+            String interval = path.evaluate("watch.trigger.schedule.interval");
+            assertThat(interval, is("1m"));
+        });
     }
 
     private void assertTotalWatchCount(int expectedWatches) throws Exception {