Unmute 'Test url escaping with url mustache function' webhook watcher test (#50439)

Some changes had to be made in order to make the test pass due to the removal or types.
Added some more assertions. The failure description in this comment [0] indicates that the rest handler couldn't be found. The test passes now.
I plan to merge this into master and see how CI reacts, if it handles this change well then I will also unmute this test in 7 dot x branch.

Also check watch count after stopping watcher in test teardown and
disabled slm in smoke test watcher qa test.

Relates to #41172

0: #41172 (comment)

Author: martijnvg

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

@@ -8,6 +8,7 @@ dependencies {
 
 testClusters.integTest {
   testDistribution = 'DEFAULT'
+  setting 'xpack.slm.enabled', 'false'
   setting 'xpack.ilm.enabled', 'false'
   setting 'xpack.security.enabled', 'false'
   setting 'xpack.monitoring.enabled', 'false'

x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherRestIT.java

@@ -7,6 +7,7 @@
 
 import com.carrotsearch.randomizedtesting.annotations.Name;
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+import org.elasticsearch.client.Request;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse;
 import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
@@ -19,6 +20,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 
 /** Runs rest tests against external cluster */
@@ -70,13 +72,19 @@ public void startWatcher() throws Exception {
 
     @After
     public void stopWatcher() throws Exception {
+        Request deleteWatchesIndexRequest = new Request("DELETE", "/.watches");
+        deleteWatchesIndexRequest.addParameter("ignore_unavailable", "true");
+        adminClient().performRequest(deleteWatchesIndexRequest);
+
         assertBusy(() -> {
             ClientYamlTestResponse response =
                 getAdminExecutionContext().callApi("watcher.stats", emptyMap(), emptyList(), emptyMap());
             String state = (String) response.evaluate("stats.0.watcher_state");
 
             switch (state) {
                 case "stopped":
+                    int watcherCount = (int) response.evaluate("stats.0.watch_count");
+                    assertThat(watcherCount, equalTo(0));
                     // all good here, we are done
                     break;
                 case "stopping":

x-pack/qa/smoke-test-watcher/src/test/resources/rest-api-spec/test/mustache/50_webhook_url_escaping.yml

@@ -1,24 +1,12 @@
 ---
 "Test url escaping with url mustache function":
-  - skip:
-        version: "all"
-        reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/41172"
-  - do:
-      cluster.health:
-          wait_for_status: yellow
-
   - do:
       index:
         index:   <date-index-{now/d}>
-        type:    log
         id:      1
         refresh: true
         body:    { foo: bar }
 
-  - do: {watcher.stats:{}}
-  - match: { "stats.0.watcher_state": "started" }
-  - match: { "stats.0.watch_count": 0 }
-
   # extract http host and port from master node
   - do:
       cluster.state: {}
@@ -36,10 +24,15 @@
           pipeline:
             description: _description
             processors: [ grok: { field: host, patterns : ["%{IPORHOST:hostname}:%{NUMBER:port:int}"] } ]
-          docs: [ { _index: index, _type: type, _id: id, _source: { host: $host } } ]
+          docs: [ { _index: index, _id: id, _source: { host: $host } } ]
   - set: { docs.0.doc._source.hostname: hostname }
   - set: { docs.0.doc._source.port: port }
 
+  - do:
+      count:
+        index: <date-index-{now/d}>
+  - match: {count: 1}
+
   - do:
       watcher.put_watch:
           id: "test_watch"
@@ -67,7 +60,7 @@
                   method: PUT
                   host: $hostname
                   port: $port
-                  path: "/{{#url}}{{ctx.metadata.index}}{{/url}}/log/2"
+                  path: "/{{#url}}{{ctx.metadata.index}}{{/url}}/_doc/2"
                   params:
                     refresh: "true"
                   body: "{ \"foo\": \"bar\" }"
@@ -78,11 +71,11 @@
   - do:
       watcher.execute_watch:
           id: "test_watch"
+  - match: {watch_record.result.condition.met: true}
+  - match: {watch_record.result.actions.0.status: 'success'}
 
   - do:
       count:
           index: <date-index-{now/d}>
-          type: log
 
   - match: {count : 2}
-