Merge remote-tracking branch 'upstream/master' into route-refactoring

Author: joegallo

buildSrc/build.gradle

@@ -77,7 +77,8 @@ tasks.withType(JavaCompile).configureEach {
  *****************************************************************************/
 
 repositories {
-  jcenter()
+  mavenCentral()
+  gradlePluginPortal()
 }
 
 dependencies {

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchTestBasePluginFuncTest.groovy

@@ -32,7 +32,7 @@ class ElasticsearchTestBasePluginFuncTest extends AbstractGradleFuncTest {
             }
 
             repositories {
-                jcenter()
+                mavenCentral()
             }
 
             dependencies {

buildSrc/src/main/java/org/elasticsearch/gradle/RepositoriesSetupPlugin.java

@@ -58,7 +58,7 @@ public static void configureRepositories(Project project) {
             // such that we don't have to pass hardcoded files to gradle
             repos.mavenLocal();
         }
-        repos.jcenter();
+        repos.mavenCentral();
 
         String luceneVersion = VersionProperties.getLucene();
         if (luceneVersion.contains("-snapshot")) {

buildSrc/src/testKit/elasticsearch.build/build.gradle

@@ -32,7 +32,7 @@ repositories {
       artifact()
     }
   }
-  jcenter()
+  mavenCentral()
 }
 
 repositories {
@@ -46,7 +46,7 @@ repositories {
       artifact()
     }
   }
-  jcenter()
+  mavenCentral()
 }
 
 // todo remove offending rules

buildSrc/src/testKit/testingConventions/build.gradle

@@ -7,7 +7,7 @@ allprojects {
   apply plugin: org.elasticsearch.gradle.internal.precommit.TestingConventionsPrecommitPlugin
 
   repositories {
-    jcenter()
+    mavenCentral()
   }
   dependencies {
     testImplementation "junit:junit:4.12"

buildSrc/src/testKit/thirdPartyAudit/build.gradle

@@ -25,7 +25,7 @@ repositories {
       artifact()
     }
   }
-  jcenter()
+  mavenCentral()
 }
 
 dependencies {

distribution/docker/build.gradle

@@ -233,7 +233,7 @@ elasticsearch_distributions {
 }
 
 tasks.named("preProcessFixture").configure {
-  dependsOn elasticsearch_distributions.docker_default, elasticsearch_distributions.docker_oss
+  dependsOn elasticsearch_distributions.matching { it.architecture == Architecture.current() }
   dependsOn "copyNodeKeyMaterial"
   doLast {
     // tests expect to have an empty repo

distribution/docker/transform-log4j-config/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'elasticsearch.build'
 
 repositories {
-  jcenter()
+  mavenCentral()
 }
 
 dependencies {

docs/reference/aggregations/pipeline/inference-bucket-aggregation.asciidoc

@@ -12,7 +12,7 @@ A parent pipeline aggregation which loads a pre-trained model and performs
 {infer} on the collated result fields from the parent bucket aggregation.
 
 To use the {infer} bucket aggregation, you need to have the same security
-privileges that are required for using the <<get-trained-models>>.
+privileges that are required for using the <<get-trained-models,get trained models API>>.
 
 [[inference-bucket-agg-syntax]]
 ==== Syntax
@@ -37,7 +37,7 @@ A `inference` aggregation looks like this in isolation:
 }
 --------------------------------------------------
 // NOTCONSOLE
-<1> The ID of model to use.
+<1> The unique identifier or alias for the trained model.
 <2> The optional inference config which overrides the model's default settings
 <3> Map the value of `avg_agg` to the model's input field `avg_cost`
 
@@ -47,7 +47,7 @@ A `inference` aggregation looks like this in isolation:
 [options="header"]
 |===
 |Parameter Name |Description |Required |Default Value
-| `model_id`         | The ID of the model to load and infer against       | Required  | -
+| `model_id`         | The ID or alias for the trained model.      | Required  | -
 | `inference_config` | Contains the inference type and its options. There are two types: <<inference-agg-regression-opt,`regression`>> and <<inference-agg-classification-opt,`classification`>>  | Optional | -
 | `buckets_path`     | Defines the paths to the input aggregations and maps the aggregation names to the field names expected by the model.
 See <<buckets-path-syntax>> for more details | Required       | -
@@ -181,5 +181,5 @@ GET kibana_sample_data_logs/_search
 
 <1> A composite bucket aggregation that aggregates the data by `client_ip`.
 <2> A series of metrics and bucket sub-aggregations.
-<3> {infer-cap} bucket aggregation that contains the model ID and maps the
+<3> {infer-cap} bucket aggregation that specifies the trained model and maps the
 aggregation names to the model's input fields.

docs/reference/ilm/actions/ilm-rollup.asciidoc

@@ -8,7 +8,7 @@ Aggregates an index's time series data and stores the results in a new read-only
 index. For example, you can roll up hourly data into daily or weekly summaries.
 
 This action corresponds to the <<rollup-api,rollup API>>. The name of the
-resulting rollup index is `rollup-<original-index-name>`. If {ilm-init} performs
+resulting rollup index is `rollup-<original-index-name>-<random-uuid>`. If {ilm-init} performs
 the `rollup` action on a backing index for a data stream, the rollup index is a
 backing index for the same stream.