Rebase

.editorconfig

@@ -23,7 +23,10 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
-[Makefile]
+[Makefile*]
+indent_style = tab
+
+[*.mk]
 indent_style = tab
 
 [Vagrantfile]

.gitattributes

@@ -1,5 +1,5 @@
-CHANGELOG.md merge=union
-CHANGELOG.asciidoc merge=union
+CHANGELOG.next.asciidoc merge=union
+CHANGELOG-developer.next.asciidoc merge=union
 
 # Keep these file types as CRLF (Windows).
 *.bat text eol=crlf

.github/CODEOWNERS

@@ -0,0 +1,39 @@
+# GitHub CODEOWNERS definition
+# See: https://help.github.com/articles/about-codeowners/
+
+# * @elastic/beats
+
+# libbeat
+/libbeat/ @elastic/beats
+/auditbeat/ @elastic/beats
+/packetbeat/ @elastic/beats
+/filebeat/ @elastic/beats
+/metricbeat/ @elastic/beats
+/journalbeat/ @elastic/beats
+/winlogbeat/ @elastic/beats
+
+# Auditbeat
+/auditbeat/module/ @elastic/secops
+/x-pack/auditbeat/ @elastic/secops
+
+# Packetbeat
+/packetbeat/protos/ @elastic/secops
+/x-pack/packetbeat/ @elastic/secops
+
+# Filebeat
+/filebeat/module/ @elastic/infrastructure
+/filebeat/module/elasticsearch/ @elastic/stack-monitoring
+/filebeat/module/kibana/ @elastic/stack-monitoring
+/filebeat/module/logstash/ @elastic/stack-monitoring
+/x-pack/filebeat/module/ @elastic/infrastructure
+/x-pack/filebeat/module/suricata/ @elastic/secops
+
+# Metricbeat
+/metricbeat/module/ @elastic/infrastructure
+/metricbeat/module/elasticsearch/ @elastic/stack-monitoring
+/metricbeat/module/kibana/ @elastic/stack-monitoring
+/metricbeat/module/logstash/ @elastic/stack-monitoring
+/x-pack/metricbeat/module/ @elastic/infrastructure
+
+# Heartbeat
+/heartbeat/ @elastic/uptime

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,18 @@
+---
+name: Bug
+about: "Report confirmed bugs. For unconfirmed bugs please visit https://discuss.elastic.co/c/beats"
+
+---
+
 Please post all questions and issues on https://discuss.elastic.co/c/beats
 before opening a Github Issue. Your questions will reach a wider audience there,
 and if we confirm that there is a bug, then you can open a new issue.
 
 For security vulnerabilities please only send reports to security@elastic.co.
 See https://www.elastic.co/community/security for more information.
 
+Please include configurations and logs if available.
+
 For confirmed bugs, please report:
 - Version: 
 - Operating System: 

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,20 @@
+---
+name: Bug
+about: "Report confirmed bugs. For unconfirmed bugs please visit https://discuss.elastic.co/c/beats"
+
+---
+
+Please post all questions and issues on https://discuss.elastic.co/c/beats
+before opening a Github Issue. Your questions will reach a wider audience there,
+and if we confirm that there is a bug, then you can open a new issue.
+
+For security vulnerabilities please only send reports to security@elastic.co.
+See https://www.elastic.co/community/security for more information.
+
+Please include configurations and logs if available.
+
+For confirmed bugs, please report:
+- Version: 
+- Operating System: 
+- Discuss Forum URL:
+- Steps to Reproduce: 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,10 @@
+---
+name: Enhancement request
+about: Beats can't do all the things, but maybe it can do your things.
+
+---
+
+**Describe the enhancement:**
+
+**Describe a specific use case for the enhancement or feature:**
+

.github/ISSUE_TEMPLATE/flaky-test.md

@@ -0,0 +1,19 @@
+---
+name: Flaky Test
+about: Report a flaky test (one that doesn't pass consistently)
+
+---
+
+## Flaky Test
+
+* **Test Name:** Name of the failing test.
+* **Link:** Link to file/line number in github.
+* **Branch:** Git branch the test was seen in. If a PR, the branch the PR was based off.
+* **Artifact Link:** If available, attach the generated zip artifact associated with the stack trace for this failure.
+* **Notes:** Additional details about the test. e.g. theory as to failure cause
+
+### Stack Trace
+
+```
+paste stack trace here
+```

.github/ISSUE_TEMPLATE/module-checklist.md

@@ -0,0 +1,36 @@
+---
+name: New Module / Dataset
+about: "Meta issue to track the creation, updating of a new module or dataset."
+
+---
+
+# Metricbeat Module / Dataset release checklist
+
+This checklist is intended for Devs which create or update a module to make sure modules are consistent.
+
+## Modules
+
+For a metricset to go GA, the following criterias should be met:
+
+* [ ] Supported versions are documented
+* [ ] Supported operating systems are documented (if applicable)
+* [ ] Integration tests exist
+* [ ] System tests exist
+* [ ] Automated checks that all fields are documented
+* [ ] Documentation
+* [ ] Fields follow [ECS](https://github.com/elastic/ecs) and [naming conventions](https://www.elastic.co/guide/en/beats/devguide/master/event-conventions.html)
+* [ ] Dashboards exists (if applicable)
+* [ ] Kibana Home Tutorial (if applicable)
+ * [ ] Open issue in [EUI repo](https://github.com/elastic/eui) to add [icon for module](https://elastic.github.io/eui/#/display/icons) if not already exists.
+ * [ ] Open PR against Kibana repo with tutorial. Examples can be found [here](https://github.com/elastic/kibana/tree/master/src/legacy/core_plugins/kibana/server/tutorials).
+
+## Filebeat module
+
+* [ ] Test log files exist for the grok patterns
+* [ ] Generated output for at least 1 log file exists
+
+
+## Metricbeat module
+
+* [ ] Example `data.json` exists and an automated way to generate it exists (`go test -data`)
+* [ ] Test environment in Docker exist for integration tests

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,18 @@
+---
+name: Question
+about: Who, what, when, where, and how?
+
+---
+
+Hey, stop right there!
+
+We use GitHub to track feature requests and bug reports. Please do not submit issues for questions about how to use features of Beat, how to set Beats up, best practices, or development related help.
+
+However, we do want to help! Head on over to our official Beats forums and ask
+your questions there. In additional to awesome, knowledgeable community
+contributors, core Beats developers are on the forums every single day to help
+you out.
+
+The forums are here: https://discuss.elastic.co/c/beats
+
+We can't stop you from opening an issue here, but it will likely linger without a response for days or weeks before it is closed and we ask you to join us on the forums instead. Save yourself the time, and ask on the forums today.

.go-version

@@ -1 +1 @@
-1.10.3
+1.12.4

.travis.yml

@@ -12,8 +12,8 @@ env:
  global:
  # Cross-compile for amd64 only to speed up testing.
  - GOX_FLAGS="-arch amd64"
- - DOCKER_COMPOSE_VERSION=1.11.1
- - GO_VERSION="$(cat .go-version)"
+ - DOCKER_COMPOSE_VERSION=1.21.0
+ - 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,113 +22,138 @@ jobs:
  # General checks
  - os: linux
  env: TARGETS="check"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: check
 
  # Filebeat
  - os: linux
  env: TARGETS="-C filebeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: osx
  env: TARGETS="TEST_ENVIRONMENT=0 -C filebeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
+ stage: test
+ - os: linux
+ env: TARGETS="-C x-pack/filebeat testsuite"
+ go: $(GO_VERSION)
  stage: test
 
  # Heartbeat
  - os: linux
  env: TARGETS="-C heartbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: osx
  env: TARGETS="TEST_ENVIRONMENT=0 -C heartbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Auditbeat
  - os: linux
  env: TARGETS="-C auditbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: osx
  env: TARGETS="TEST_ENVIRONMENT=0 -C auditbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: linux
  env: TARGETS="-C auditbeat crosscompile"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
+ stage: test
+ - os: linux
+ env: TARGETS="-C x-pack/auditbeat testsuite"
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Libbeat
  - os: linux
  env: TARGETS="-C libbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: linux
  env: TARGETS="-C libbeat crosscompile"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: linux
  env: STRESS_TEST_OPTIONS="-timeout=20m -race -v -parallel 1" TARGETS="-C libbeat stress-tests"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
+ stage: test
+ - os: linux
+ env: TARGETS="-C x-pack/libbeat testsuite"
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Metricbeat
  - os: linux
- env: TARGETS="-C metricbeat testsuite"
- go: $GO_VERSION
+ 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: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: linux
  env: TARGETS="-C metricbeat crosscompile"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
+ stage: test
+ - os: linux
+ env: TARGETS="-C x-pack/metricbeat testsuite"
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Packetbeat
  - os: linux
  env: TARGETS="-C packetbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Winlogbeat
  - os: linux
  env: TARGETS="-C winlogbeat crosscompile"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Functionbeat
  - os: linux
  env: TARGETS="-C x-pack/functionbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: osx
  env: TARGETS="TEST_ENVIRONMENT=0 -C x-pack/functionbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Journalbeat
  - os: linux
  env: TARGETS="-C journalbeat testsuite"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Generators
  - os: linux
  env: TARGETS="-C generator/metricbeat test"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
  - os: linux
  env: TARGETS="-C generator/beat test"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Docs
  - os: linux
  env: TARGETS="docs"
- go: $GO_VERSION
+ go: $TRAVIS_GO_VERSION
  stage: test
 
  # Kubernetes
@@ -167,6 +192,7 @@ addons:
  - xsltproc
  - libxml2-utils
  - libsystemd-journal-dev
+ - librpm-dev
 
 before_install:
  - python --version