Merge from master to 7.x (elastic#11168)

There were no significant conflicts.
exekias · Mar 12, 2019 · 06d6add · 06d6add
1 parent 9e01d75
commit 06d6add
Show file tree

Hide file tree

Showing 672 changed files with 45,320 additions and 10,332 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ env:
     # Cross-compile for amd64 only to speed up testing.
     - GOX_FLAGS="-arch amd64"
     - DOCKER_COMPOSE_VERSION=1.21.0
-    - GO_VERSION="1.11.5"
+    - TRAVIS_GO_VERSION=$(cat .go-version)
     # Newer versions of minikube fail on travis, see: https://github.com/kubernetes/minikube/issues/2704
     - TRAVIS_MINIKUBE_VERSION=v0.25.2
 
@@ -22,129 +22,138 @@ jobs:
     # General checks
     - os: linux
       env: TARGETS="check"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: check
 
     # Filebeat
     - os: linux
       env: TARGETS="-C filebeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: osx
       env: TARGETS="TEST_ENVIRONMENT=0 -C filebeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C x-pack/filebeat testsuite"
-      go: 1.11.5
+      go: $(GO_VERSION)
       stage: test
 
     # Heartbeat
     - os: linux
       env: TARGETS="-C heartbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: osx
       env: TARGETS="TEST_ENVIRONMENT=0 -C heartbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Auditbeat
     - os: linux
       env: TARGETS="-C auditbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: osx
       env: TARGETS="TEST_ENVIRONMENT=0 -C auditbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C auditbeat crosscompile"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C x-pack/auditbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Libbeat
     - os: linux
       env: TARGETS="-C libbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C libbeat crosscompile"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: STRESS_TEST_OPTIONS="-timeout=20m -race -v -parallel 1" TARGETS="-C libbeat stress-tests"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C x-pack/libbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Metricbeat
     - os: linux
-      env: TARGETS="-C metricbeat testsuite"
-      go: 1.11.5
+      env: TARGETS="-C metricbeat unit-tests coverage-report"
+      go: $TRAVIS_GO_VERSION
       stage: test
+    - os: linux
+      env: TARGETS="-C metricbeat integration-tests-environment coverage-report"
+      go: $TRAVIS_GO_VERSION
+      stage: test
+    - os: linux
+      env: TARGETS="-C metricbeat update system-tests-environment coverage-report"
+      go: $TRAVIS_GO_VERSION
+      stage: test
+
     - os: osx
       env: TARGETS="TEST_ENVIRONMENT=0 -C metricbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C metricbeat crosscompile"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C x-pack/metricbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Packetbeat
     - os: linux
       env: TARGETS="-C packetbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Winlogbeat
     - os: linux
       env: TARGETS="-C winlogbeat crosscompile"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Functionbeat
     - os: linux
       env: TARGETS="-C x-pack/functionbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: osx
       env: TARGETS="TEST_ENVIRONMENT=0 -C x-pack/functionbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Journalbeat
     - os: linux
       env: TARGETS="-C journalbeat testsuite"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Generators
     - os: linux
       env: TARGETS="-C generator/metricbeat test"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
     - os: linux
       env: TARGETS="-C generator/beat test"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Docs
     - os: linux
       env: TARGETS="docs"
-      go: 1.11.5
+      go: $TRAVIS_GO_VERSION
       stage: test
 
     # Kubernetes

diff --git a/CHANGELOG-developer.asciidoc b/CHANGELOG-developer.asciidoc
@@ -12,7 +12,23 @@ other Beats should be migrated.
 
 Note: This changelog was only started after the 6.3 release.
 
-=== Beats version HEAD
+=== Beats version 7.0.0-beta1
+https://github.com/elastic/beats/compare/v7.0.0-alpha2..v7.0.0-beta1[Check the HEAD diff]
+
+==== Breaking changes
+- Outputs receive Index Manager as additional parameter. The index manager can
+  be used to create an index selector. {pull}10347[10347]
+- Remove support for loading dashboards to Elasticsearch 5. {pull}10451[10451]
+
+==== Added
+
+- Allow multiple object type configurations per field. {pull}9772[9772]
+- Move agent metadata addition to a processor. {pull}9952[9952]
+- Add (*common.Config).Has and (*common.Config).Remove. {pull}10363[10363]
+- Introduce ILM and IndexManagement support to beat.Settings. {pull}10347[10347]
+- Generating index pattern on demand instead of shipping them in the packages. {pull}10478[10478]
+
+=== Beats version 7.0.0-alpha2
 https://github.com/elastic/beats/compare/v6.3.0..v7.0.0-alpha2[Check the HEAD diff]
 
 The list below covers the major changes between 6.3.0 and 7.0.0-alpha2 only.
@@ -73,3 +89,4 @@ The list below covers the major changes between 6.3.0 and 7.0.0-alpha2 only.
 - Update Beats to use go 1.11.2 {pull}8746[8746]
 - Allow/Merge fields.yml overrides {pull}9188[9188]
 - Filesets can now define multiple ingest pipelines, with the first one considered as the entry point pipeline. {pull}8914[8914]
+- Add `group_measurements_by_instance` option to windows perfmon metricset. {pull}8688[8688]
diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc
@@ -14,22 +14,24 @@ Note: This changelog documents the current changes which are not yet present in
 an actual release.
 
 === Beats version HEAD
-https://github.com/elastic/beats/compare/v7.0.0-alpha2..master[Check the HEAD diff]
+https://github.com/elastic/beats/compare/v7.0.0-beta1..master[Check the HEAD diff]
 
-The list below covers the major changes between 7.0.0-alpha2 and master only.
+The list below covers the major changes between 7.0.0-beta1 and master only.
 
 ==== Breaking changes
-- Outputs receive Index Manager as additional parameter. The index manager can
-  be used to create an index selector. {pull}10347[10347]
-- Remove support for loading dashboards to Elasticsearch 5. {pull}10451[10451]
+
+- Remove support for deprecated `GenRootCmd` methods. {pull}10721[10721]
+- Remove SkipNormalization, SkipAgentMetadata, SkipAddHostName. {pull}10801[10801] {pull}10769[10769]
 
 ==== Bugfixes
 
+- Align default index between elasticsearch and logstash and kafka output. {pull}10841[10841]
+- Fix duplication check for `append_fields` option. {pull}10959[10959]
+
 ==== Added
 
-- Allow multiple object type configurations per field. {pull}9772[9772]
-- Move agent metadata addition to a processor. {pull}9952[9952]
-- Add (*common.Config).Has and (*common.Config).Remove. {pull}10363[10363]
-- Introduce ILM and IndexManagment support to beat.Settings. {pull}10347[10347]
-- Introduce ILM and IndexManagement support to beat.Settings. {pull}10347[10347]
-- Generating index pattern on demand instead of shipping them in the packages. {pull}10478[10478]
+- Metricset generator generates beta modules by default now. {pull}10657[10657]
+- The `beat.Event` accessor methods now support `@metadata` keys. {pull}10761[10761]
+- Assertion for documented fields in tests fails if any of the fields in the tested event is documented as an alias. {pull}10921[10921]
+- Support for Logger in the Metricset base instance. {pull}11106[11106]
+- Introduce processing.Support to instance.Setting. This allows Beats to fully modify the event processing. {pull}10801[10801]