Merge branch 'master' into index-lifecycle

docs/reference/setup/install/windows.asciidoc

@@ -79,13 +79,13 @@ part of the installation, with the option to configure a HTTPS proxy through whi
 [[msi-installer-selected-plugins]]
 image::images/msi_installer/msi_installer_selected_plugins.png[]
 
-Upon choosing to install X-Pack plugin, an additional step allows a choice of the type of X-Pack
+Upon choosing to install {xpack} plugin, an additional step allows a choice of the type of {xpack}
-license to install, in addition to X-Pack Security configuration and built-in user configuration:
+license to install, in addition to {security} configuration and built-in user configuration:
 
 [[msi-installer-xpack]]
 image::images/msi_installer/msi_installer_xpack.png[]
 
-NOTE: X-Pack includes a choice of a Trial or Basic license for 30 days. After that, you can obtain one of the
+NOTE: {xpack} includes a choice of a Trial or Basic license for 30 days. After that, you can obtain one of the
 https://www.elastic.co/subscriptions[available subscriptions] or {ref}/security-settings.html[disable Security].
 The Basic license is free and includes the https://www.elastic.co/products/x-pack/monitoring[Monitoring] extension.
 
@@ -286,43 +286,43 @@ as _properties_ within Windows Installer documentation) that can be passed to ms
 
 `XPACKLICENSE`::
 
-  When installing X-Pack plugin, the type of license to install,
+  When installing {xpack} plugin, the type of license to install,
   either `Basic` or `Trial`. Defaults to `Basic`
 
 `XPACKSECURITYENABLED`::
 
-  When installing X-Pack plugin with a `Trial` license, whether X-Pack Security should be enabled.
+  When installing {xpack} plugin with a `Trial` license, whether {security} should be enabled.
   Defaults to `true`
 
 `BOOTSTRAPPASSWORD`::
 
-  When installing X-Pack plugin with a `Trial` license and X-Pack Security enabled, the password to
+  When installing {xpack} plugin with a `Trial` license and {security} enabled, the password to
   used to bootstrap the cluster and persisted as the `bootstrap.password` setting in the keystore.
   Defaults to a randomized value.
 
 `SKIPSETTINGPASSWORDS`::
 
-  When installing X-Pack plugin with a `Trial` license and X-Pack Security enabled, whether the
+  When installing {xpack} plugin with a `Trial` license and {security} enabled, whether the
   installation should skip setting up the built-in users `elastic`, `kibana` and `logstash_system`.
   Defaults to `false`
 
 `ELASTICUSERPASSWORD`::
 
-  When installing X-Pack plugin with a `Trial` license and X-Pack Security enabled, the password
+  When installing {xpack} plugin with a `Trial` license and {security} enabled, the password
   to use for the built-in user `elastic`. Defaults to `""`
 
 `KIBANAUSERPASSWORD`::
 
-  When installing X-Pack plugin with a `Trial` license and X-Pack Security enabled, the password
+  When installing {xpack} plugin with a `Trial` license and {security} enabled, the password
   to use for the built-in user `kibana`. Defaults to `""`
 
 `LOGSTASHSYSTEMUSERPASSWORD`::
 
-  When installing X-Pack plugin with a `Trial` license and X-Pack Security enabled, the password
+  When installing {xpack} plugin with a `Trial` license and {security} enabled, the password
   to use for the built-in user `logstash_system`. Defaults to `""`
 
 To pass a value, simply append the property name and value using the format `<PROPERTYNAME>="<VALUE>"` to
-the installation command. For example, to use a different installation directory to the default one and to install https://www.elastic.co/products/x-pack[X-Pack]:
+the installation command. For example, to use a different installation directory to the default one and to install https://www.elastic.co/products/x-pack[{xpack}]:
 
 ["source","sh",subs="attributes,callouts"]
 --------------------------------------------

modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml

@@ -2,7 +2,7 @@
 #
 setup:
   - skip:
-        version: " - 6.4.0"
+        version: " - 6.3.99"
         reason:  "moving_fn added in 6.4.0"
   - do:
       indices.create:

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/250_moving_fn.yml

@@ -1,6 +1,6 @@
 setup:
   - skip:
-        version: " - 6.4.0"
+        version: " - 6.3.99"
         reason:  "moving_fn added in 6.4.0"
 
 ---

rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml

@@ -197,7 +197,7 @@ setup:
 "Test typed keys parameter for date_histogram aggregation and max_bucket pipeline aggregation":
   - skip:
       features: warnings
-      version: " - 6.4.0"
+      version: " - 6.3.99"
       reason:  "deprecation added in 6.4.0"
   - do:
       warnings:

server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java

@@ -115,9 +115,9 @@ public class TransportClusterStateAction extends TransportMasterNodeReadAction<C
                 mdBuilder = MetaData.builder(currentState.metaData());
             }
 
-            // Filter our metadata that shouldn't be returned by API
+            // filter out metadata that shouldn't be returned by the API
-            for(ObjectObjectCursor<String, Custom> custom : currentState.metaData().customs()) {
+            for (ObjectObjectCursor<String, Custom> custom : currentState.metaData().customs()) {
-                if(!custom.value.context().contains(MetaData.XContentContext.API)) {
+                if (custom.value.context().contains(MetaData.XContentContext.API) == false) {
                     mdBuilder.removeCustom(custom.key);
                 }
             }

server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java

@@ -71,7 +71,7 @@ public class GetSettingsRequest extends MasterNodeReadRequest<GetSettingsRequest
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         names = in.readStringArray();
         humanReadable = in.readBoolean();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
             includeDefaults = in.readBoolean();
         }
     }
@@ -83,7 +83,7 @@ public class GetSettingsRequest extends MasterNodeReadRequest<GetSettingsRequest
         indicesOptions.writeIndicesOptions(out);
         out.writeStringArray(names);
         out.writeBoolean(humanReadable);
-        if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
             out.writeBoolean(includeDefaults);
         }
     }

server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java

@@ -114,7 +114,7 @@ public class GetSettingsResponse extends ActionResponse implements ToXContentObj
         }
         ImmutableOpenMap.Builder<String, Settings> defaultSettingsBuilder = ImmutableOpenMap.builder();
 
-        if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) {
+        if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_6_4_0)) {
             int defaultSettingsSize = in.readVInt();
             for (int i = 0; i < defaultSettingsSize ; i++) {
                 defaultSettingsBuilder.put(in.readString(), Settings.readSettingsFromStream(in));
@@ -132,7 +132,7 @@ public class GetSettingsResponse extends ActionResponse implements ToXContentObj
             out.writeString(cursor.key);
             Settings.writeSettingsToStream(cursor.value, out);
         }
-        if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_6_4_0)) {
             out.writeVInt(indexToDefaultSettings.size());
             for (ObjectObjectCursor<String, Settings> cursor : indexToDefaultSettings) {
                 out.writeString(cursor.key);

x-pack/docs/en/ml/index.asciidoc

@@ -17,11 +17,20 @@ from {es} for analysis and anomaly results are displayed in {kib} dashboards.
 
 --
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/ml/overview.asciidoc
 include::overview.asciidoc[]
+
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/ml/getting-started.asciidoc
 include::getting-started.asciidoc[]
+
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/ml/configuring.asciidoc
 include::configuring.asciidoc[]
+
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/ml/stopping-ml.asciidoc
 include::stopping-ml.asciidoc[]
-// include::ml-scenarios.asciidoc[]
+
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/ml/api-quickref.asciidoc
 include::api-quickref.asciidoc[]
-//include::troubleshooting.asciidoc[]  Referenced from x-pack/docs/public/xpack-troubleshooting.asciidoc
+
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/ml/functions.asciidoc
 include::functions.asciidoc[]

x-pack/docs/en/security/authentication/built-in-users.asciidoc

@@ -118,7 +118,7 @@ the `logstash.yml` configuration file:
 xpack.monitoring.elasticsearch.password: logstashpassword
 ----------------------------------------------------------
 
-If you have upgraded from an older version of elasticsearch/x-pack,
+If you have upgraded from an older version of Elasticsearch,
 the `logstash_system` user may have defaulted to _disabled_ for security reasons.
 Once the password has been changed, you can enable the user via the following API call:
 

x-pack/docs/en/security/authentication/custom-realm.asciidoc

@@ -50,7 +50,7 @@ public AuthenticationFailureHandler getAuthenticationFailureHandler() {
 ----------------------------------------------------
 +
 The `getAuthenticationFailureHandler` method is used to optionally provide a
-custom `AuthenticationFailureHandler`, which will control how X-Pack responds
+custom `AuthenticationFailureHandler`, which will control how {security} responds
 in certain authentication failure events.
 +
 [source,java]

x-pack/docs/en/security/gs-index.asciidoc

@@ -25,8 +25,8 @@ Security protects Elasticsearch clusters by:
 To prevent unauthorized access to your Elasticsearch cluster, you must have a
 way to _authenticate_ users. This simply means that you need a way to validate
 that a user is who they claim to be. For example, you have to make sure only
-the person named _Kelsey Andorra_ can sign in as the user `kandorra`. X-Pack
+the person named _Kelsey Andorra_ can sign in as the user `kandorra`. {security} 
-Security provides a standalone authentication mechanism that enables you to
+provides a standalone authentication mechanism that enables you to
 quickly password-protect your cluster. If you're already using {xpack-ref}/ldap-realm.html[LDAP],
 {xpack-ref}/active-directory-realm.html[ Active Directory], or {xpack-ref}/pki-realm.html[ PKI] to manage
 users in your organization, {security} is able to integrate with those
@@ -83,7 +83,7 @@ issues.
 
 * {xpack-ref}/ccs-clients-integrations.html[Integrations]
   shows you how to interact with an Elasticsearch cluster protected by
-  X-Pack Security.
+  {security}.
 
 * {xpack-ref}/security-reference.html[Reference]
   provides detailed information about the access privileges you can grant to

x-pack/docs/en/security/index.asciidoc

@@ -26,8 +26,8 @@ Security protects Elasticsearch clusters by:
 To prevent unauthorized access to your Elasticsearch cluster, you must have a
 way to _authenticate_ users. This simply means that you need a way to validate
 that a user is who they claim to be. For example, you have to make sure only
-the person named _Kelsey Andorra_ can sign in as the user `kandorra`. X-Pack
+the person named _Kelsey Andorra_ can sign in as the user `kandorra`. {security} 
-Security provides a standalone authentication mechanism that enables you to
+provides a standalone authentication mechanism that enables you to
 quickly password-protect your cluster. If you're already using <<ldap-realm, LDAP>>,
 <<active-directory-realm, Active Directory>>, or <<pki-realm, PKI>> to manage
 users in your organization, {security} is able to integrate with those
@@ -81,7 +81,7 @@ issues.
 
 * <<ccs-clients-integrations>>
   shows you how to interact with an Elasticsearch cluster protected by
-  X-Pack Security.
+  {security}.
 
 * <<security-reference, Reference>>
   provides detailed information about the access privileges you can grant to
@@ -95,20 +95,29 @@ Head over to our {security-forum}[Security Discussion Forum]
 to share your experience, questions, and suggestions.
 --
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/getting-started.asciidoc
 include::getting-started.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/how-security-works.asciidoc
 include::how-security-works.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/authentication/overview.asciidoc
 include::authentication/overview.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/authorization/overview.asciidoc
 include::authorization/overview.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/auditing.asciidoc
 include::auditing.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/securing-communications.asciidoc
 include::securing-communications.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/using-ip-filtering.asciidoc
 include::using-ip-filtering.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/ccs-clients-integrations.asciidoc
 include::ccs-clients-integrations.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/reference.asciidoc
 include::reference.asciidoc[]

x-pack/docs/en/watcher/index.asciidoc

@@ -65,24 +65,35 @@ from the query, whether the condition was met, and what actions were taken.
 
 --
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/getting-started.asciidoc
 include::getting-started.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/how-watcher-works.asciidoc
 include::how-watcher-works.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/encrypting-data.asciidoc
 include::encrypting-data.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/input.asciidoc
 include::input.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/trigger.asciidoc
 include::trigger.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/condition.asciidoc
 include::condition.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/actions.asciidoc
 include::actions.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/transform.asciidoc
 include::transform.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/java.asciidoc
 include::java.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/managing-watches.asciidoc
 include::managing-watches.asciidoc[]
 
+:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/example-watches.asciidoc
 include::example-watches.asciidoc[]

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java

@@ -48,7 +48,7 @@ public class ActivateWatchTests extends AbstractWatcherIntegrationTestCase {
         return false;
     }
     
-    // FIXME not to be sleep based
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/30699")
     public void testDeactivateAndActivate() throws Exception {
         PutWatchResponse putWatchResponse = watcherClient().preparePutWatch()
                 .setId("_id")