Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/beats into agent-dbus-ser…
Browse files Browse the repository at this point in the history
…vice-fix
  • Loading branch information
michalpristas committed Jan 15, 2021
2 parents 7aee726 + c1290bc commit 2f91bc9
Show file tree
Hide file tree
Showing 101 changed files with 2,047 additions and 972 deletions.
4 changes: 2 additions & 2 deletions .ci/schedule-weekly.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ pipeline {
stages {
stage('Nighly beats builds') {
steps {
build(quietPeriod: 0, job: 'Beats/beats/master', parameters: [booleanParam(name: 'awsCloudTests', value: true)])
build(quietPeriod: 1000, job: 'Beats/beats/7.x', parameters: [booleanParam(name: 'awsCloudTests', value: true)])
build(quietPeriod: 0, job: 'Beats/beats/master', parameters: [booleanParam(name: 'awsCloudTests', value: true)], wait: false, propagate: false)
build(quietPeriod: 1000, job: 'Beats/beats/7.x', parameters: [booleanParam(name: 'awsCloudTests', value: true)], wait: false, propagate: false)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/install-tools.bat
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ gcc --version
where gcc

REM Reset the USERPROFILE
SET USERPROFILE=%PREVIOUS_USERPROFILE%
SET USERPROFILE=%PREVIOUS_USERPROFILE%
16 changes: 16 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
:issue: https://github.com/elastic/beats/issues/
:pull: https://github.com/elastic/beats/pull/

[[release-notes-7.10.2]]
=== Beats version 7.10.2
https://github.com/elastic/beats/compare/v7.10.1\...v7.10.2[View commits]

==== Bugfixes

*Filebeat*

- Add JSON body check for SQS message. {pull}21727[21727]
- Fix cisco umbrella module config by adding input variable. {pull}22892[22892]
- Fix CredentialsJSON unpacking for `gcp-pubsub` and `httpjson` inputs. {pull}23277[23277]

*Metricbeat*

- Change `vsphere.datastore.capacity.used.pct` value to betweeen 0 and 1. {pull}23148[23148]

[[release-notes-7.10.1]]
=== Beats version 7.10.1
https://github.com/elastic/beats/compare/v7.10.0\...v7.10.1[View commits]
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix `nested` subfield handling in generated Elasticsearch templates. {issue}23178[23178] {pull}23183[23183]
- Fix CPU usage metrics on VMs with dynamic CPU config {pull}23154[23154]
- Fix panic due to unhandled DeletedFinalStateUnknown in k8s OnDelete {pull}23419[23419]
- Fix error loop with runaway CPU use when the Kafka output encounters some connection errors {pull}23484[23484]

*Auditbeat*

Expand Down Expand Up @@ -267,6 +268,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix integer overflow in S3 offsets when collecting very large files. {pull}22523[22523]
- Fix various processing errors in the Suricata module. {pull}23236[23236]
- Fix CredentialsJSON unpacking for `gcp-pubsub` and `httpjson` inputs. {pull}23277[23277]
- Change the `event.created` in Netflow events to be the time the event was created by Filebeat
to be consistent with ECS. {pull}23094[23094]

*Filebeat*

Expand Down Expand Up @@ -482,6 +485,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Packetbeat*

- Fix SIP parser logic related to line length check. {pull}23411[23411]


*Winlogbeat*

Expand Down
895 changes: 672 additions & 223 deletions NOTICE.txt

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions auditbeat/Jenkinsfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@ stages:
mage: "mage build test"
when: ## Override the top-level when.
not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack
branches: true ## for all the branches
tags: true ## for all the tags
crosscompile:
make: "make -C auditbeat crosscompile"
when: ## Override the top-level when.
not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack
branches: true ## for all the branches
tags: true ## for all the tags
macos:
mage: "mage build unitTest"
platforms: ## override default label in this specific stage.
Expand All @@ -61,6 +65,8 @@ stages:
#- "windows-2008-r2" https://github.com/elastic/beats/issues/19799
when: ## Override the top-level when.
not_changeset_full_match: "^x-pack/.*" ## Disable the stage if ONLY changes for the x-pack
branches: true ## for all the branches
tags: true ## for all the tags
windows-2016:
mage: "mage build unitTest"
platforms: ## override default labels in this specific stage.
Expand Down
Loading

0 comments on commit 2f91bc9

Please sign in to comment.