Merge branch 'master' into gh-2001

Original commit: elastic/x-pack-elasticsearch@7ebbf816d5

elasticsearch/qa/messy-test-watcher-with-groovy/src/test/java/org/elasticsearch/messy/tests/MessyTestUtils.java

@@ -42,7 +42,7 @@ public final class MessyTestUtils {
         engineServiceSet.add(groovyScriptEngineService);
         ScriptEngineRegistry scriptEngineRegistry = new ScriptEngineRegistry(
                 Arrays.asList(
-                        new ScriptEngineRegistry.ScriptEngineRegistration(GroovyScriptEngineService.class, GroovyScriptEngineService.TYPES)
+                        new ScriptEngineRegistry.ScriptEngineRegistration(GroovyScriptEngineService.class, GroovyScriptEngineService.NAME)
                 )
         );
         ScriptContextRegistry scriptContextRegistry = new ScriptContextRegistry(Arrays.asList(ScriptServiceProxy.INSTANCE));

elasticsearch/qa/smoke-test-watcher-with-mustache/src/test/java/org/elasticsearch/smoketest/WatcherTemplateTests.java

@@ -56,7 +56,7 @@ public class WatcherTemplateTests extends ESTestCase {
         ScriptEngineRegistry scriptEngineRegistry = new ScriptEngineRegistry(
                 Arrays.asList(
                         new ScriptEngineRegistry.ScriptEngineRegistration(MustacheScriptEngineService.class,
-                                MustacheScriptEngineService.TYPES)
+                                MustacheScriptEngineService.NAME)
                 )
         );
         ScriptSettings scriptSettings = new ScriptSettings(scriptEngineRegistry, registry);

elasticsearch/x-pack/marvel/src/main/java/org/elasticsearch/marvel/rest/action/RestMonitoringBulkAction.java

@@ -38,8 +38,6 @@ public class RestMonitoringBulkAction extends MonitoringRestHandler {
         controller.registerHandler(PUT, URI_BASE + "/_bulk", this);
         controller.registerHandler(POST, URI_BASE + "/{type}/_bulk", this);
         controller.registerHandler(PUT, URI_BASE + "/{type}/_bulk", this);
-        controller.registerHandler(POST, URI_BASE + "/{index}/{type}/_bulk", this);
-        controller.registerHandler(PUT, URI_BASE + "/{index}/{type}/_bulk", this);
     }
 
     @Override

elasticsearch/x-pack/marvel/src/main/resources/monitoring-data.json

@@ -13,6 +13,9 @@
         "xpack.version": "${project.version}"
       }
     },
+    "kibana": {
+      "enabled": false
+    },
     "node": {
       "enabled": false
     }

elasticsearch/x-pack/marvel/src/test/resources/rest-api-spec/api/monitoring.bulk.json

@@ -4,12 +4,8 @@
     "methods": ["POST", "PUT"],
     "url": {
       "path": "/_x-pack/monitoring/_bulk",
-      "paths": ["/_x-pack/monitoring/_bulk", "/_x-pack/monitoring/{index}/_bulk", "/_x-pack/monitoring/{index}/{type}/_bulk"],
+      "paths": ["/_x-pack/monitoring/_bulk", "/_x-pack/monitoring/{type}/_bulk"],
       "parts": {
-        "index": {
-          "type" : "string",
-          "description" : "Default index for items which don't provide one"
-        },
         "type": {
           "type" : "string",
           "description" : "Default document type for items which don't provide one"

elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/transport/ShieldServerTransportService.java

@@ -107,11 +107,11 @@ public class ShieldServerTransportService extends TransportService {
 
     @Override
     public <Request extends TransportRequest> void registerRequestHandler(String action, Supplier<Request> request, String executor,
-                                                                          boolean forceExecution,
+                                                                          boolean forceExecution, boolean canTripCircuitBreaker,
                                                                           TransportRequestHandler<Request> handler) {
         TransportRequestHandler<Request> wrappedHandler = new ProfileSecuredRequestHandler<>(action, handler, profileFilters,
                 licenseState, threadPool.getThreadContext());
-        super.registerRequestHandler(action, request, executor, forceExecution, wrappedHandler);
+        super.registerRequestHandler(action, request, executor, forceExecution, canTripCircuitBreaker, wrappedHandler);
     }
 
     protected Map<String, ServerTransportFilter> initializeProfileFilters() {

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/MockMustacheScriptEngine.java

@@ -5,6 +5,7 @@
  */
 package org.elasticsearch.script;
 
+import org.elasticsearch.script.ScriptMode;
 import org.elasticsearch.xpack.common.text.DefaultTextTemplateEngine;
 
 import java.util.Collections;
@@ -29,28 +30,27 @@ public class MockMustacheScriptEngine extends MockScriptEngine {
 
         public void onModule(ScriptModule module) {
             module.addScriptEngine(new ScriptEngineRegistry.ScriptEngineRegistration(MockMustacheScriptEngine.class,
-                    Collections.singletonList(NAME)));
+                            NAME, ScriptMode.ON));
         }
 
     }
 
     @Override
-    public List<String> getTypes() {
+    public String getType() {
-        return Collections.singletonList(NAME);
+        return NAME;
     }
 
     @Override
-    public List<String> getExtensions() {
+    public String getExtension() {
-        return getTypes();
+        return NAME;
     }
 
     @Override
-    public Object compile(String script, Map<String, String> params) {
+    public Object compile(String name, String script, Map<String, String> params) {
         if (script.contains("{{") && script.contains("}}")) {
             throw new IllegalArgumentException("Fix your test to not rely on mustache");
         }
 
-        return script;
+        return super.compile(name, script, params);
     }
-
 }

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/script/SleepScriptEngine.java

@@ -7,6 +7,7 @@ package org.elasticsearch.script;
 
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.script.ScriptMode;
 import org.elasticsearch.search.lookup.SearchLookup;
 
 import java.io.IOException;
@@ -21,8 +22,6 @@ public class SleepScriptEngine implements ScriptEngineService {
 
     public static final String NAME = "sleep";
 
-    public static final List<String> TYPES = Collections.singletonList(NAME);
-
     public static class TestPlugin extends Plugin {
 
         public TestPlugin() {
@@ -39,29 +38,25 @@ public class SleepScriptEngine implements ScriptEngineService {
         }
 
         public void onModule(ScriptModule module) {
-            module.addScriptEngine(new ScriptEngineRegistry.ScriptEngineRegistration(SleepScriptEngine.class, SleepScriptEngine.TYPES));
+            module.addScriptEngine(new ScriptEngineRegistry.ScriptEngineRegistration(SleepScriptEngine.class,
+                            SleepScriptEngine.NAME, ScriptMode.ON));
         }
 
     }
 
     @Override
-    public List<String> getTypes() {
+    public String getType() {
-        return TYPES;
+        return NAME;
     }
 
     @Override
-    public List<String> getExtensions() {
+    public String getExtension() {
-        return TYPES;
+        return NAME;
     }
 
     @Override
-    public boolean isSandboxed() {
+    public Object compile(String scriptName, String scriptSource, Map<String, String> params) {
-        return true;
+        return scriptSource;
-    }
-
-    @Override
-    public Object compile(String script, Map<String, String> params) {
-        return script;
     }
 
     @Override

elasticsearch/x-pack/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java

@@ -136,6 +136,7 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase
                 .put("xpack.watcher.watch.scroll.size", randomIntBetween(1, 100))
                 .put(ShieldSettings.settings(shieldEnabled))
                 .put("xpack.watcher.trigger.schedule.engine", scheduleImplName)
+                .put("script.inline", "true")
                 .build();
     }