Remove id_field_data from our docker compose file (#25239)

* Remove id_field_data from our docker compose file The `id_field_data` was added in #14850 From Elasticsearch's team recommendation this should not be used. * Changelog (cherry picked from commit 2ccf3d7) # Conflicts: # testing/environments/snapshot.yml
elastic · Apr 26, 2021 · 305af93 · 305af93
1 parent 2c7c216
commit 305af93
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -22,6 +22,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Use alias to report container image in k8s metadata. {pull}24380[24380]
 - Set `cleanup_timeout` to zero by default in docker and kubernetes autodiscover in all beats except Filebeat where it is kept to 60 seconds. {pull}24681[24681]
 - Update to ECS 1.9.0. {pull}24909[24909]
+- Remove id_field_data {pull}25239[25239]
 
 *Auditbeat*
 

diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
@@ -14,6 +14,14 @@ services:
     - "transport.host=127.0.0.1"
     - "http.host=0.0.0.0"
     - "xpack.security.enabled=false"
+<<<<<<< HEAD
+=======
+    - "script.context.template.max_compilations_rate=unlimited"
+    - "script.context.ingest.cache_max_size=2000"
+    - "script.context.processor_conditional.cache_max_size=2000"
+    - "script.context.template.cache_max_size=2000"
+    - "action.destructive_requires_name=false"
+>>>>>>> 2ccf3d7e6b... Remove id_field_data from our docker compose file (#25239)
     # Disable geoip updates to prevent golden file test failures when the database
     # changes and prevent race conditions between tests and database updates.
     - "ingest.geoip.downloader.enabled=false"