From 1b2381d3553fa72ed6f775dc0ac89c891d4f0a11 Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Wed, 8 Feb 2017 16:58:55 +0000 Subject: [PATCH] Migrates Elasticsearch files Original commit: elastic/x-pack-elasticsearch@370af88d148c5ff7fdfcdb4679dfc53743dae9ca --- elasticsearch/.gitignore | 44 ---- elasticsearch/README.asciidoc | 3 - elasticsearch/build.gradle | 44 ---- elasticsearch/gradle.properties | 2 - .../licenses/super-csv-2.4.0.jar.sha1 | 1 - elasticsearch/licenses/super-csv-LICENSE.txt | 203 ------------------ elasticsearch/licenses/super-csv-NOTICE.txt | 0 .../org/elasticsearch/xpack/ml/MlPlugin.java | 2 +- .../plugin-metadata/plugin-security.policy | 4 - .../src/main/resources/log4j2.properties | 9 - .../ml/integration/MlYamlTestSuiteIT.java | 31 --- .../test/{ => ml}/custom_all_field.yaml | 0 .../test/{ => ml}/datafeeds_crud.yaml | 0 .../test/{ => ml}/delete_model_snapshot.yaml | 0 .../test/{ => ml}/filter_crud.yaml | 0 .../test/{ => ml}/get_datafeed_stats.yaml | 0 .../test/{ => ml}/get_datafeeds.yaml | 0 .../test/{ => ml}/get_filters.yaml | 0 .../test/{ => ml}/get_model_snapshots.yaml | 0 .../test/{ => ml}/jobs_crud.yaml | 0 .../rest-api-spec/test/{ => ml}/jobs_get.yaml | 0 .../{ => ml}/jobs_get_result_buckets.yaml | 0 .../{ => ml}/jobs_get_result_categories.yaml | 0 .../{ => ml}/jobs_get_result_influencers.yaml | 0 .../{ => ml}/jobs_get_result_records.yaml | 0 .../test/{ => ml}/jobs_get_stats.yaml | 0 .../test/{ => ml}/post_data.yaml | 0 .../test/{ => ml}/revert_model_snapshot.yaml | 0 .../test/{ => ml}/start_stop_datafeed.yaml | 0 .../test/{ => ml}/update_model_snapshot.yaml | 0 .../rest-api-spec/test/{ => ml}/validate.yaml | 0 .../test/{ => ml}/validate_detector.yaml | 0 32 files changed, 1 insertion(+), 342 deletions(-) delete mode 100644 elasticsearch/.gitignore delete mode 100644 elasticsearch/README.asciidoc delete mode 100644 elasticsearch/build.gradle delete mode 100644 elasticsearch/gradle.properties delete mode 100644 elasticsearch/licenses/super-csv-2.4.0.jar.sha1 delete mode 100644 elasticsearch/licenses/super-csv-LICENSE.txt delete mode 100644 elasticsearch/licenses/super-csv-NOTICE.txt delete mode 100644 elasticsearch/src/main/plugin-metadata/plugin-security.policy delete mode 100644 elasticsearch/src/main/resources/log4j2.properties delete mode 100644 elasticsearch/src/test/java/org/elasticsearch/xpack/ml/integration/MlYamlTestSuiteIT.java rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/custom_all_field.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/datafeeds_crud.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/delete_model_snapshot.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/filter_crud.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/get_datafeed_stats.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/get_datafeeds.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/get_filters.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/get_model_snapshots.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/jobs_crud.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/jobs_get.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/jobs_get_result_buckets.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/jobs_get_result_categories.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/jobs_get_result_influencers.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/jobs_get_result_records.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/jobs_get_stats.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/post_data.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/revert_model_snapshot.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/start_stop_datafeed.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/update_model_snapshot.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/validate.yaml (100%) rename elasticsearch/src/test/resources/rest-api-spec/test/{ => ml}/validate_detector.yaml (100%) diff --git a/elasticsearch/.gitignore b/elasticsearch/.gitignore deleted file mode 100644 index 12ec3667692..00000000000 --- a/elasticsearch/.gitignore +++ /dev/null @@ -1,44 +0,0 @@ -# intellij files -.idea/ -*.iml -*.ipr -*.iws -build-idea/ - -# eclipse files -.project -.classpath -.settings -build-eclipse/ - -# netbeans files -nb-configuration.xml -nbactions.xml - -# gradle stuff -.gradle/ -build/ - -# gradle wrapper -/gradle/ -gradlew -gradlew.bat - -# maven stuff (to be removed when trunk becomes 4.x) -*-execution-hints.log -target/ -dependency-reduced-pom.xml - -# testing stuff -**/.local* -.vagrant/ - -# osx stuff -.DS_Store - -# needed in case docs build is run...maybe we can configure doc build to generate files under build? -html_docs - -# random old stuff that we should look at the necessity of... -/tmp/ -backwards/ \ No newline at end of file diff --git a/elasticsearch/README.asciidoc b/elasticsearch/README.asciidoc deleted file mode 100644 index b41f5e7bfbf..00000000000 --- a/elasticsearch/README.asciidoc +++ /dev/null @@ -1,3 +0,0 @@ -= Elasticsearch Ml Plugin - -Behavioral Analytics for Elasticsearch diff --git a/elasticsearch/build.gradle b/elasticsearch/build.gradle deleted file mode 100644 index a1fb8490ed0..00000000000 --- a/elasticsearch/build.gradle +++ /dev/null @@ -1,44 +0,0 @@ -import org.elasticsearch.gradle.precommit.PrecommitTasks - -apply plugin: 'elasticsearch.esplugin' - -esplugin { - name 'ml' - description 'Machine Learning Plugin' - classname 'org.elasticsearch.xpack.ml.MlPlugin' -} - -if (findProject(':machine-learning-cpp') != null) { - configurations.archives { - resolutionStrategy.dependencySubstitution { - substitute module("org.elasticsearch.ml:ml-cpp") with project(":machine-learning-cpp") - } - } - bundlePlugin.dependsOn ':machine-learning-cpp:buildUberZip' -} - - -configurations { - archives -} - -dependencies { - compile group: 'net.sf.supercsv', name: 'super-csv', version:"${supercsvVersion}" - archives group: "${project.group}", name: 'ml-cpp', version:"${project.version}", ext: 'zip' - testCompile group: 'org.ini4j', name: 'ini4j', version:"${ini4jVersion}" -} - -integTest { - cluster { - //setting 'useNativeProcess', 'true' - distribution = 'zip' - } -} - -bundlePlugin { - for (outputFile in configurations.archives) { - from(zipTree(outputFile)) { - duplicatesStrategy 'exclude' - } - } -} diff --git a/elasticsearch/gradle.properties b/elasticsearch/gradle.properties deleted file mode 100644 index 4683431396a..00000000000 --- a/elasticsearch/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -supercsvVersion=2.4.0 -ini4jVersion=0.5.2 diff --git a/elasticsearch/licenses/super-csv-2.4.0.jar.sha1 b/elasticsearch/licenses/super-csv-2.4.0.jar.sha1 deleted file mode 100644 index a0b40213309..00000000000 --- a/elasticsearch/licenses/super-csv-2.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -017f8708c929029dde48bc298deaf3c7ae2452d3 \ No newline at end of file diff --git a/elasticsearch/licenses/super-csv-LICENSE.txt b/elasticsearch/licenses/super-csv-LICENSE.txt deleted file mode 100644 index 9e0ad072b25..00000000000 --- a/elasticsearch/licenses/super-csv-LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Apache License - * Version 2.0, January 2004 - * http://www.apache.org/licenses/ - * - * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - * - * 1. Definitions. - * - * "License" shall mean the terms and conditions for use, reproduction, - * and distribution as defined by Sections 1 through 9 of this document. - * - * "Licensor" shall mean the copyright owner or entity authorized by - * the copyright owner that is granting the License. - * - * "Legal Entity" shall mean the union of the acting entity and all - * other entities that control, are controlled by, or are under common - * control with that entity. For the purposes of this definition, - * "control" means (i) the power, direct or indirect, to cause the - * direction or management of such entity, whether by contract or - * otherwise, or (ii) ownership of fifty percent (50%) or more of the - * outstanding shares, or (iii) beneficial ownership of such entity. - * - * "You" (or "Your") shall mean an individual or Legal Entity - * exercising permissions granted by this License. - * - * "Source" form shall mean the preferred form for making modifications, - * including but not limited to software source code, documentation - * source, and configuration files. - * - * "Object" form shall mean any form resulting from mechanical - * transformation or translation of a Source form, including but - * not limited to compiled object code, generated documentation, - * and conversions to other media types. - * - * "Work" shall mean the work of authorship, whether in Source or - * Object form, made available under the License, as indicated by a - * copyright notice that is included in or attached to the work - * (an example is provided in the Appendix below). - * - * "Derivative Works" shall mean any work, whether in Source or Object - * form, that is based on (or derived from) the Work and for which the - * editorial revisions, annotations, elaborations, or other modifications - * represent, as a whole, an original work of authorship. For the purposes - * of this License, Derivative Works shall not include works that remain - * separable from, or merely link (or bind by name) to the interfaces of, - * the Work and Derivative Works thereof. - * - * "Contribution" shall mean any work of authorship, including - * the original version of the Work and any modifications or additions - * to that Work or Derivative Works thereof, that is intentionally - * submitted to Licensor for inclusion in the Work by the copyright owner - * or by an individual or Legal Entity authorized to submit on behalf of - * the copyright owner. For the purposes of this definition, "submitted" - * means any form of electronic, verbal, or written communication sent - * to the Licensor or its representatives, including but not limited to - * communication on electronic mailing lists, source code control systems, - * and issue tracking systems that are managed by, or on behalf of, the - * Licensor for the purpose of discussing and improving the Work, but - * excluding communication that is conspicuously marked or otherwise - * designated in writing by the copyright owner as "Not a Contribution." - * - * "Contributor" shall mean Licensor and any individual or Legal Entity - * on behalf of whom a Contribution has been received by Licensor and - * subsequently incorporated within the Work. - * - * 2. Grant of Copyright License. Subject to the terms and conditions of - * this License, each Contributor hereby grants to You a perpetual, - * worldwide, non-exclusive, no-charge, royalty-free, irrevocable - * copyright license to reproduce, prepare Derivative Works of, - * publicly display, publicly perform, sublicense, and distribute the - * Work and such Derivative Works in Source or Object form. - * - * 3. Grant of Patent License. Subject to the terms and conditions of - * this License, each Contributor hereby grants to You a perpetual, - * worldwide, non-exclusive, no-charge, royalty-free, irrevocable - * (except as stated in this section) patent license to make, have made, - * use, offer to sell, sell, import, and otherwise transfer the Work, - * where such license applies only to those patent claims licensable - * by such Contributor that are necessarily infringed by their - * Contribution(s) alone or by combination of their Contribution(s) - * with the Work to which such Contribution(s) was submitted. If You - * institute patent litigation against any entity (including a - * cross-claim or counterclaim in a lawsuit) alleging that the Work - * or a Contribution incorporated within the Work constitutes direct - * or contributory patent infringement, then any patent licenses - * granted to You under this License for that Work shall terminate - * as of the date such litigation is filed. - * - * 4. Redistribution. You may reproduce and distribute copies of the - * Work or Derivative Works thereof in any medium, with or without - * modifications, and in Source or Object form, provided that You - * meet the following conditions: - * - * (a) You must give any other recipients of the Work or - * Derivative Works a copy of this License; and - * - * (b) You must cause any modified files to carry prominent notices - * stating that You changed the files; and - * - * (c) You must retain, in the Source form of any Derivative Works - * that You distribute, all copyright, patent, trademark, and - * attribution notices from the Source form of the Work, - * excluding those notices that do not pertain to any part of - * the Derivative Works; and - * - * (d) If the Work includes a "NOTICE" text file as part of its - * distribution, then any Derivative Works that You distribute must - * include a readable copy of the attribution notices contained - * within such NOTICE file, excluding those notices that do not - * pertain to any part of the Derivative Works, in at least one - * of the following places: within a NOTICE text file distributed - * as part of the Derivative Works; within the Source form or - * documentation, if provided along with the Derivative Works; or, - * within a display generated by the Derivative Works, if and - * wherever such third-party notices normally appear. The contents - * of the NOTICE file are for informational purposes only and - * do not modify the License. You may add Your own attribution - * notices within Derivative Works that You distribute, alongside - * or as an addendum to the NOTICE text from the Work, provided - * that such additional attribution notices cannot be construed - * as modifying the License. - * - * You may add Your own copyright statement to Your modifications and - * may provide additional or different license terms and conditions - * for use, reproduction, or distribution of Your modifications, or - * for any such Derivative Works as a whole, provided Your use, - * reproduction, and distribution of the Work otherwise complies with - * the conditions stated in this License. - * - * 5. Submission of Contributions. Unless You explicitly state otherwise, - * any Contribution intentionally submitted for inclusion in the Work - * by You to the Licensor shall be under the terms and conditions of - * this License, without any additional terms or conditions. - * Notwithstanding the above, nothing herein shall supersede or modify - * the terms of any separate license agreement you may have executed - * with Licensor regarding such Contributions. - * - * 6. Trademarks. This License does not grant permission to use the trade - * names, trademarks, service marks, or product names of the Licensor, - * except as required for reasonable and customary use in describing the - * origin of the Work and reproducing the content of the NOTICE file. - * - * 7. Disclaimer of Warranty. Unless required by applicable law or - * agreed to in writing, Licensor provides the Work (and each - * Contributor provides its Contributions) on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied, including, without limitation, any warranties or conditions - * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - * PARTICULAR PURPOSE. You are solely responsible for determining the - * appropriateness of using or redistributing the Work and assume any - * risks associated with Your exercise of permissions under this License. - * - * 8. Limitation of Liability. In no event and under no legal theory, - * whether in tort (including negligence), contract, or otherwise, - * unless required by applicable law (such as deliberate and grossly - * negligent acts) or agreed to in writing, shall any Contributor be - * liable to You for damages, including any direct, indirect, special, - * incidental, or consequential damages of any character arising as a - * result of this License or out of the use or inability to use the - * Work (including but not limited to damages for loss of goodwill, - * work stoppage, computer failure or malfunction, or any and all - * other commercial damages or losses), even if such Contributor - * has been advised of the possibility of such damages. - * - * 9. Accepting Warranty or Additional Liability. While redistributing - * the Work or Derivative Works thereof, You may choose to offer, - * and charge a fee for, acceptance of support, warranty, indemnity, - * or other liability obligations and/or rights consistent with this - * License. However, in accepting such obligations, You may act only - * on Your own behalf and on Your sole responsibility, not on behalf - * of any other Contributor, and only if You agree to indemnify, - * defend, and hold each Contributor harmless for any liability - * incurred by, or claims asserted against, such Contributor by reason - * of your accepting any such warranty or additional liability. - * - * END OF TERMS AND CONDITIONS - * - * APPENDIX: How to apply the Apache License to your work. - * - * To apply the Apache License to your work, attach the following - * boilerplate notice, with the fields enclosed by brackets "[]" - * replaced with your own identifying information. (Don't include - * the brackets!) The text should be enclosed in the appropriate - * comment syntax for the file format. We also recommend that a - * file or class name and description of purpose be included on the - * same "printed page" as the copyright notice for easier - * identification within third-party archives. - * - * Copyright 2007 Kasper B. Graversen - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ diff --git a/elasticsearch/licenses/super-csv-NOTICE.txt b/elasticsearch/licenses/super-csv-NOTICE.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/MlPlugin.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/MlPlugin.java index d8c9908318e..da054d4206b 100644 --- a/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/MlPlugin.java +++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/ml/MlPlugin.java @@ -146,7 +146,7 @@ public class MlPlugin extends Plugin implements ActionPlugin { Property.Deprecated); /** Setting for enabling or disabling machine learning. Defaults to true. */ - public static final Setting ML_ENABLED = Setting.boolSetting("xpack.ml.enabled", true, Setting.Property.NodeScope); + public static final Setting ML_ENABLED = Setting.boolSetting("xpack.ml.enabled", false, Setting.Property.NodeScope); private final Settings settings; private final Environment env; diff --git a/elasticsearch/src/main/plugin-metadata/plugin-security.policy b/elasticsearch/src/main/plugin-metadata/plugin-security.policy deleted file mode 100644 index e3d950a5ac2..00000000000 --- a/elasticsearch/src/main/plugin-metadata/plugin-security.policy +++ /dev/null @@ -1,4 +0,0 @@ -grant { - // needed for Windows named pipes - permission java.io.FilePermission "\\\\.\\pipe\\*", "read,write"; -}; diff --git a/elasticsearch/src/main/resources/log4j2.properties b/elasticsearch/src/main/resources/log4j2.properties deleted file mode 100644 index 46877d0de32..00000000000 --- a/elasticsearch/src/main/resources/log4j2.properties +++ /dev/null @@ -1,9 +0,0 @@ -status = error - -appender.console.type = Console -appender.console.name = console -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n - -rootLogger.level = info -rootLogger.appenderRef.console.ref = console diff --git a/elasticsearch/src/test/java/org/elasticsearch/xpack/ml/integration/MlYamlTestSuiteIT.java b/elasticsearch/src/test/java/org/elasticsearch/xpack/ml/integration/MlYamlTestSuiteIT.java deleted file mode 100644 index 8b2953724ba..00000000000 --- a/elasticsearch/src/test/java/org/elasticsearch/xpack/ml/integration/MlYamlTestSuiteIT.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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.xpack.ml.integration; - -import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; -import org.junit.After; - -import java.io.IOException; - -/** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ -public class MlYamlTestSuiteIT extends ESClientYamlSuiteTestCase { - - public MlYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) { - super(testCandidate); - } - - @ParametersFactory - public static Iterable parameters() throws IOException { - return createParameters(); - } - - @After - public void clearMlState() throws IOException { - new MlRestTestStateCleaner(client(), this).clearMlMetadata(); - } -} diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/custom_all_field.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/custom_all_field.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/custom_all_field.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/custom_all_field.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/datafeeds_crud.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/datafeeds_crud.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/datafeeds_crud.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/delete_model_snapshot.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/delete_model_snapshot.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/delete_model_snapshot.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/delete_model_snapshot.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/filter_crud.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/filter_crud.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/filter_crud.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/filter_crud.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/get_datafeed_stats.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/get_datafeed_stats.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/get_datafeed_stats.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/get_datafeed_stats.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/get_datafeeds.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/get_datafeeds.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/get_datafeeds.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/get_datafeeds.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/get_filters.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/get_filters.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/get_filters.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/get_filters.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/get_model_snapshots.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/get_model_snapshots.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/get_model_snapshots.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/get_model_snapshots.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/jobs_crud.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_crud.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/jobs_crud.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_crud.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/jobs_get.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/jobs_get.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_buckets.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_buckets.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_buckets.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_buckets.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_categories.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_categories.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_categories.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_categories.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_influencers.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_influencers.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_influencers.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_influencers.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_records.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_records.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_result_records.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_result_records.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_stats.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_stats.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/jobs_get_stats.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/jobs_get_stats.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/post_data.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/post_data.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/post_data.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/post_data.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/revert_model_snapshot.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/revert_model_snapshot.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/revert_model_snapshot.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/revert_model_snapshot.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/start_stop_datafeed.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/start_stop_datafeed.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/start_stop_datafeed.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/start_stop_datafeed.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/update_model_snapshot.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/update_model_snapshot.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/update_model_snapshot.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/update_model_snapshot.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/validate.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/validate.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/validate.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/validate.yaml diff --git a/elasticsearch/src/test/resources/rest-api-spec/test/validate_detector.yaml b/elasticsearch/src/test/resources/rest-api-spec/test/ml/validate_detector.yaml similarity index 100% rename from elasticsearch/src/test/resources/rest-api-spec/test/validate_detector.yaml rename to elasticsearch/src/test/resources/rest-api-spec/test/ml/validate_detector.yaml