Watcher: Fix certain chained input usages not written to history

If a chained input was used, and inside of this a search input was
used, that hat dots in its field names somewhere (like when sorting
or using a compare condition), then storing this in the history failed.

The reason for this was the broken watch history template, that did not take
nested requests bodies into account and thus tried to create an index mapping
for requests that were inside of a chained input.

This commit fixes the watch history index template.

Closes elastic/elasticsearch#2338

Original commit: elastic/x-pack-elasticsearch@d9f48234d3

elasticsearch/x-pack/watcher/src/main/resources/watch_history.json

@@ -22,7 +22,7 @@
         },
         {
           "disabled_search_request_body_fields": {
-            "path_match": "result\\.(input|(transform(\\..+)*)|(actions\\.transform(\\..+)*))\\.search\\.request\\.(body|template)",
+            "path_match": "result\\.(input(\\..+)|(transform(\\..+)*)|(actions\\.transform(\\..+)*))\\.search\\.request\\.(body|template)",
             "match_pattern": "regex",
             "mapping": {
               "type": "object",

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/watcher/test/integration/HistoryIntegrationTests.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.watcher.test.integration;
+
+import org.elasticsearch.action.search.SearchRequestBuilder;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.search.sort.SortBuilders;
+import org.elasticsearch.search.sort.SortOrder;
+import org.elasticsearch.xpack.watcher.actions.ActionBuilders;
+import org.elasticsearch.xpack.watcher.client.WatchSourceBuilder;
+import org.elasticsearch.xpack.watcher.client.WatchSourceBuilders;
+import org.elasticsearch.xpack.watcher.input.InputBuilders;
+import org.elasticsearch.xpack.watcher.test.AbstractWatcherIntegrationTestCase;
+import org.elasticsearch.xpack.watcher.transport.actions.put.PutWatchResponse;
+import org.elasticsearch.xpack.watcher.trigger.TriggerBuilders;
+import org.elasticsearch.xpack.watcher.trigger.schedule.Schedules;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
+import static org.hamcrest.Matchers.is;
+
+public class HistoryIntegrationTests extends AbstractWatcherIntegrationTestCase {
+
+    // issue: https://github.com/elastic/x-plugins/issues/2338
+    public void testThatHistoryIsWrittenWithChainedInput() throws Exception {
+        XContentBuilder xContentBuilder = jsonBuilder().startObject().startObject("inner").field("date", "2015-06-06").endObject()
+                .endObject();
+        index("foo", "bar", "1", xContentBuilder);
+        refresh();
+
+        WatchSourceBuilder builder = WatchSourceBuilders.watchBuilder()
+                .trigger(TriggerBuilders.schedule(Schedules.interval("10s")))
+                .addAction("logging", ActionBuilders.loggingAction("foo"));
+
+        SearchRequestBuilder searchRequestBuilder = client().prepareSearch("foo").addSort(SortBuilders.fieldSort("inner.date").order
+                (SortOrder.DESC));
+        builder.input(InputBuilders.chainInput().add("first", InputBuilders.searchInput(searchRequestBuilder)));
+
+        PutWatchResponse response = watcherClient().preparePutWatch("test_watch").setSource(builder).get();
+        assertThat(response.isCreated(), is(true));
+
+        watcherClient().prepareExecuteWatch("test_watch").setRecordExecution(true).get();
+
+        flushAndRefresh(".watcher-history-*");
+        SearchResponse searchResponse = client().prepareSearch(".watcher-history-*").get();
+        assertHitCount(searchResponse, 1);
+    }
+}