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 #5067

Merged
merged 143 commits into from
Aug 31, 2017

Conversation

tsg
Copy link
Contributor

@tsg tsg commented Aug 31, 2017

There were no conflicts apart from the version files.

When merging this one, please don't squash, use a merge commit.

tsg and others added 30 commits July 24, 2017 21:15
* Restructure Filebeat and Libbeat config options

* Restructure Heartbeat config options

* Restructure Packetbeat config options

* Experiment: show packetbeat.reference.yml in the docs

* Restructure Winlogbeat config options

* Restructure Metricbeat config options

* Restructure Auditbeat config options

* Add reference configs to the docs

* Move include statement for general options for consistency
The version embedded in the file needed updating for 7.0.
* Close changelog for beta1

* Added 5.4.2, 5.5.0, and 5.5.1 releases
Docker for Windows uses URLs like `npipe://./pipe/docker_engine`. This
change makes sure they are supported by our host validators
* Implementing graphite protocol metricbeat module
The logs for Beats that are running as Windows services are currently written to `C:\Program Files\[beatname]\logs` (or the extract path which is `path.home`). Our Getting Started guides say that the logs go to `C:\ProgramData\[beatname]\Logs`. This PR sets `path.log` for the Windows service to `C:\ProgramData\[beatname]\logs`.

See elastic#4764
- remove removed settings in libbeat/filebeat docs
- add tags/fields/fields_under_root/processor settings to every beat
Change PHP-FPM to PHP_FPM when referring to the module
The beat.yml is generated and does not need to be stored in the repo.
* Fix mixed up modules configuration

Fixes elastic#4761. Due to combining pointer and reference passing we ended up with
passing the same module pointer to multiple filesets. The pointer was correct
during initialization, but wrong during run time.

Also added an Info with the enabled modules / filesets.
Fixes a `go vet` warning.

    module/audit/kernel/audit_linux_test.go:31: github.com/elastic/beats/vendor/github.com/elastic/go-libaudit.AuditClient composite literal uses unkeyed fields
before:

    $ make check
    Code differs from goimports' style
    make: *** [check] Error 1

after:

    $ make check
    ./utility/map_str_enhancer_test.go
    Code differs from goimports' style ^
    make: *** [check] Error 1
…x key (elastic#4775)

* Fixing pod name indexer to use both namespace, pod name to frame index key

* Adding field pattern matcher to support pod name indexer matching
* Rename publisher/broker package to publisher/queue
* Move global pipeline loading to the pipeline package
…4792)

* Add more info for each option under setup.template.settings

* Fix link
Modify `file.paths` to be a list instead of a dictionary.
Added `file.hash_types` config option for controlling the hash types.
Added new hash types.
Fixed `file.max_file_size` config option. It was missing the "file." prefix when reading the option.
Added the ability to specify byte unit suffixes to `file.max_file_size`.
Added documentation for the audit file metricset.
Using "-configtest" is deprecated and the "[beat] test config" subcommand should be used instead.

Fixes elastic#4600
makkes and others added 26 commits August 24, 2017 14:27
The command seems to do nothing helpful so I just removed it.
* Update saram dependency to v1.12

* Update kafka versions and add lz4 compression

* Update kafka output docs

* Update Changelog

* Fix build
* Fixes elastic#4937 by recreating the missing searches.
* Adds a `dashboards.yml` file, to simplify importing / exporting
* Does the renaming of the dashboards, requested by elastic#4984, but not the visualizations or searches
* A few more minor visual improvements
From now on it is possible to register prospectors in `init` functions, just like in Metricbeat.

Example:
```
func init() {
	err := prospectors.Register("log", NewProspector)
	if err != nil {
		panic(err)
	}
}
```
The cluster_status will collect pgmap, osdmap, throughput and iops information of ceph cluster.
…rs/" log path (elastic#4981)

* add_kubernetes_metadata processor supports '/var/log/containers/' log path

The add_kubernetes_metadata processor's LogPathMatcher could extract
a Docker container ID - and hence enrich a log document with Kubernetes
metadata - only if the log path was '/var/lib/docker/containers/'.

With this commit, the LogPathMatcher can extract the container ID also
from a '/var/log/containers/' log path (Kubernetes symlinks).
In `PdhGetFormattedCounterArray` the code was allocating memory for `bufferSize` x `sizeof(PdhCounterValueItem)`, but it only needed to allocated `bufferSize`. The buffer size is provided by Windows and already accounts for the sizeof PdhCounterValueItem.

Made an improvement to create regexp objects once at startup instead of on every use.

Moved config validation to startup for non-wildcard counter paths. This allows the check to only be performed one time and for any errors to be returned during the config test.

Fixes elastic#5035
Update the publisher pipeline to only drop events from the
queue on beat.Client close when: guaranteed mode is set and no global
ACK handler is registered.
This should be merged together with elastic#5031, so the changelog in the two
branches stays similar, which will simplify backports.
Implementation of the index template generation changed slightly in a recent PR, but the generation command was not updated accordingly.
Looks like after a refactoring, the code was changed to always return an
error.

Fixes elastic#5039.

* Fix test case: use an invalid BPF filter instead of invalid device
Use `exec` with the command to start the beat so that it replaces the shell process leaving only the beat process. This is nicer because you don't have the "beatname.sh" process showing up in `ps` output.

Change the hashbang to `#!/usr/bin/env bash` instead of `#!/bin/bash`. This is generally more portable.
This allows tests to define what services from docker-compose.yml they need.
Instead of launching all at the beginning, the new framework takes care
of start/stop the right services on demand.

Python tests can use COMPOSE_SERVICES field to define the list of needed
services. Go tests can use compose.EnsureUp to do the same.
The previous log message was too crpytic.
@tsg tsg added the review label Aug 31, 2017
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WFG

@ruflin ruflin merged commit 1ee5c98 into elastic:6.x Aug 31, 2017
@tsg tsg deleted the automatic_merge_from_master_to_6.x_branch branch September 11, 2017 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.