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

Merge master into 7.x 2019-04-03 #11633

Merged
merged 333 commits into from
Apr 4, 2019
Merged

Conversation

urso
Copy link

@urso urso commented Apr 3, 2019

Note: Didn't merge master last friday, due to conflicts on changelog and outstanding changelog updates in master.

No major issues. Just had to run make update for version+Notice file updates.

PR MUST BE MERGED, DO USE "Create a merge commit" OPTION!

kaiyan-sheng and others added 30 commits February 25, 2019 13:02
* Initial PR for adding SQS metricset

* Address comments in sqs metricset

* Remove regionName as input param

* Update docs

* Remove count from metric names

* Remove duplicate functions from rebase
…r default.disable (elastic#10911)

* Add configuration knob `default.disable` for auto-discover hints to control whether log harvesting is enabled for the pod/container. {issue}10811[10811] {pull}10911[10911]
…stic#10861)

This replaces the usage of a `rename` processor with an `append` + `remove` processor.
Then a script processor is used to deduplicate the domains.

Fixes elastic#10510
A bad processor definition in the ingest pipeline was causing the tests
to stall.
…descriptions. Add notice.log support. (elastic#10916)

* Update Zeek dashboard and README.md

* Add support for notice.log

* Update field descriptions
…ic#10936)

* When using the --password env:FOO will now return an errors if
FOO does not exist in the environment.
…0682)

* Expose the Metadata Refresh stragegy for the Kafka output.

By default the Kafka output will periodically refresh the metadata
information for all the available topics. This is the default strategy
that beat uses.

But if you have strict permissions in place for your
Kafka cluster this could lead to errors in your log while trying to get
information for a topic that you don't have permissions.

This commit keep the default behavior but allow to change the strategy
from the config file.
With the creation of aliases for ECS we have found that some features
weren't being migrated and were writing to aliases (like in elastic#10757).
Consider writing to an alias field an error.
* Add s3_request metricset for AWS module
* Add changelog
* Change metric names and add a check for timestamp
* Add ms unit to latency metrics
elastic#8688)

This flag will send all perfmon measurements with a matching instance label as part of the same event (i.e. all metrics for C:, Processor X, etc.). This addresses some of the issues raised in elastic#6584.

In most cases enabling this flag considerably reduces the number of events sent by metricbeat.
cleanup_timeout is used in kubernetes autodiscover to wait some time before the
configurations associated to stopped containers are removed. Add an equivalent
option to docker autodiscover.

Fix elastic#10374
Sometimes the httptest package when using fancy TLS options doesn't put the server up as fast as it should (at least that's the theory), and we hit before it's ready, causing a false test failure. This patch makes those tests more resilient.

It's possible there's something else at work here, but this bug is only seen on CI, and impossible to repro on my laptop.

Fixes elastic#10722
This removes the project info from the cloud.machine.type and cloud.availability_zone fields
that are added to the add_cloud_metadata processor for Google Compute Engine (GCE).

Fixes elastic#10968, elastic#10775 (docs)
elastic#11002)

This flag will send all perfmon measurements with a matching instance label as part of the same event (i.e. all metrics for C:, Processor X, etc.). This addresses some of the issues raised in elastic#6584.

In most cases enabling this flag considerably reduces the number of events sent by metricbeat.

Co-Authored-By: Josh Smith <j_smith95@live.com>
vjsamuel and others added 10 commits April 2, 2019 12:38
The changelog entry got merged into the wrong spot during the cherry-pick.
This was originally fixed in v6.2.4.

Relates elastic#6579
This PR introduces a new processor `truncate_fields`. To keep raw messages use this processor with `copy_fields`.

### `truncate_fields`

This processor truncates configured fields. Example configuration is below:

```yaml
processors:
- truncate_fields:
    fields:
      - message
    max_bytes: 1024
    fail_on_error: false
    ignore_missing: true
```

### Keep raw events

This preserves the orignal field and truncates it, if it's too long.

```yaml
processors:
- copy_fields:
    fields:
        - from: message
          to: event.original
    fail_on_error: false
    ignore_missing: true
- truncate_fields:
    fields:
      - event.original
    max_bytes: 1024
    fail_on_error: false
    ignore_missing: true
```
* Add upgrade docs

* Apply suggestions from code review

* Add more detail based on review feedback

* A few clarifications

* Remove old file

* Rename file to original name

* More changes from review

* Add changes from review before moving stuff around

* Move some content and clean it up

* Add more fixes from the review

* Add more changes based on review comments
…d fix a documentation error - issue elastic#11590. (elastic#11591)

* Add missing Kubernetes metadata fields to Filebeat CoreDNS module, and fix a documentation error.
* Add get creds script and sqs script into aws module test folder

* Add readme
@urso urso requested review from a team as code owners April 3, 2019 16:07
@urso urso added the review label Apr 3, 2019
@urso urso requested review from ph and removed request for a team April 3, 2019 16:08
return aclIDLength
}

func (u ACLIDDecoder) Decode(data []byte) (interface{}, error) {

Choose a reason for hiding this comment

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

exported method ACLIDDecoder.Decode should have comment or be unexported

return aclIDLength
}

func (u ACLIDDecoder) MaxLength() uint16 {

Choose a reason for hiding this comment

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

exported method ACLIDDecoder.MaxLength should have comment or be unexported


const aclIDLength = 12

func (u ACLIDDecoder) MinLength() uint16 {

Choose a reason for hiding this comment

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

exported method ACLIDDecoder.MinLength should have comment or be unexported

@@ -322,6 +323,34 @@ func (u UnsupportedDecoder) Decode(data []byte) (interface{}, error) {

var _ Decoder = (*UnsupportedDecoder)(nil)

type ACLIDDecoder struct{}

Choose a reason for hiding this comment

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

exported type ACLIDDecoder should have comment or be unexported

return aclIDLength
}

func (u ACLIDDecoder) Decode(data []byte) (interface{}, error) {

Choose a reason for hiding this comment

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

exported method ACLIDDecoder.Decode should have comment or be unexported

return aclIDLength
}

func (u ACLIDDecoder) MaxLength() uint16 {

Choose a reason for hiding this comment

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

exported method ACLIDDecoder.MaxLength should have comment or be unexported


const aclIDLength = 12

func (u ACLIDDecoder) MinLength() uint16 {

Choose a reason for hiding this comment

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

exported method ACLIDDecoder.MinLength should have comment or be unexported

Copy link
Contributor

Choose a reason for hiding this comment

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

@adriansr @andrewkroh I would suggest we make in most cases hound happy: #11201

@@ -322,6 +323,34 @@ func (u UnsupportedDecoder) Decode(data []byte) (interface{}, error) {

var _ Decoder = (*UnsupportedDecoder)(nil)

type ACLIDDecoder struct{}

Choose a reason for hiding this comment

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

exported type ACLIDDecoder should have comment or be unexported

@ycombinator
Copy link
Contributor

Looks pretty good from an @elastic/stack-monitoring perspective.

Two more Stack Monitoring PRs were merged into master since this backport PR was created. If you want to pull these two PRs into this backport PR as well, they are: #11616 and #9260. If you want to wait till next week for these, that's fine too!

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.

LGTM. Failing ml tests were recently skipped in master but we can do an other backport again in the near future.

@urso
Copy link
Author

urso commented Apr 4, 2019

I will do another backport tomorrow. This one only took a little longer due to changelog conflicts and me needing to cleanup changelog in different branches.

@urso urso merged commit febfccb into elastic:7.x Apr 4, 2019
@urso urso deleted the merge-master-into-7.x-2019-04-03 branch May 9, 2019 18:50
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.