Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic merge from master to 6.x branch #5452

Merged
merged 28 commits into from
Oct 26, 2017
Merged

Automatic merge from master to 6.x branch #5452

merged 28 commits into from
Oct 26, 2017

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Oct 26, 2017

Please do MERGE this PR and not squash.

kel and others added 28 commits October 12, 2017 13:23
* Fix http status phrase parsing not allow spaces (#4795)

* Update CHANGELOG
At startup the file integrity module will iterate over directories and their contents and send events if any changes have occured since the last time Auditbeat was running. State information is persisted to {path.data}. Scanning at startup is enabled by default.

Closes #5167
* Add modules.d info to metricbeat docs

* Fix issues from review
Its common to be able to define the host header in an http request,
sadly golang's standard library will clear any `Host` defined key in the
header maps with the value of the `req.Host`, which will default to host
of the current machine.

This commits allow users to set the `Host` header key and the code will
pass this values to the `req.Host` method, this will make sure that on the
other hand of the connection the value of the header will be the
expected.

If not explicit value is set we will default to the standard library
behavior.

Fixes: #4842
From the outputs package, make the following functions public:

- LoadCertificate
- LoadCertificateAuthorities
- ReadPEMFile
Update gosigar to make the code more robust when we cannot fetch all information for a MacOS X process.

Closes: #5337
This PR adds a `output.file.permissions` configuration option to
control the file mode used when created the output file.
* Modify generator to get version to generate passed

Having the version passed from external makes the generator more reusable and cleans up the internal code.

* Modify internal dashboard version to common.Version

This is a prerequisit for #5328 and will make the change less complex.
* Update generation of data.json files

In a recent change the generation of the example data.json events was changed to use the internal event json encoder. The effect of this was that the meta data was also added to the event and indentation changed which cause large diffs. I prefer to leave out the metadata out of the example events as the data should be the same as it ends up in elasticsearch and is documented in the fields.yml.

As a first step, `data.json` for the system module were updated. Quite a few modules have outdate `data.json` files. I plan to update more in follow up PR's.

* Add example from linux for diskio stats
* Support SHA3 hash algorithm family (#5345)

* Add test for new hash types

* Update CHANGELOG.asciidoc
* Added KrakenBeat

https://github.com/PPACI/krakenbeat[krakenbeat]:: Collect information on each transaction on the Kraken crypto platform.

* Update communitybeats.asciidoc

Fix for alphabetical sort
Command line flags were taken into account during module reloading which lead to the issue the modules were loaded on startup and when loading from the files.

Closes #5376
* Include selector in DEBUG log

* Fix log prefix format
* Add kubernetes manifests

Import https://github.com/elastic/beats-kubernetes, these manifests
deploy filebeat & metricbeat to Kubernetes

* Add travis tests

* Add packaging

* Add docs

* Update CHANGELOG

* Fix Makefile

* Check k8s health every second
There was a change in the release manager that changes the
format for the SHA512 files. This adapts to it.
It seems to be failing for v1.7.7, this change should fix it
* Determine log level for kafka output

* Add description to changelog

* Add pull request reference in changelog

* Fix code import style
They will be available for download from github
Mockbeat expects Beater.Stop to be called after Beater.Run has
initialized some shared state. This is a race as Stop can be called at
any moment, even before Run is ever called.

This caused race warnings and segfaults when running unit tests.

Closes #5037
Support append tags to both []string and []interface{}
* Remove tutorial

* Add more context and examples to module docs

* Add fixes from review
The MergeJSONFields was adding the parsed @timestamp key to the fields,
instead of modifying it into the Event structure. This change makes it
return the new timestamp (or the empty Timestamp if no change required),
and the caller sets it into the event.

(cherry picked from commit fa0cfc5)
Fix VSphere config yml

The metricstore needs to be array of metricstores
@roncohen
Copy link
Contributor

Need this to fix build failure in 6.0 of APM Server. Thanks!

@exekias exekias added the review label Oct 26, 2017
@tsg tsg merged commit 979358d into 6.x Oct 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.