Skip to content

Commit d18269e

Browse files
michel-latermanmichel-laterman
committed
Merge remote-tracking branch 'origin/7.17' into agent-deprecate-password
2 parents 33ea36b + 4082af5 commit d18269e

74 files changed

Lines changed: 1489 additions & 641 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/macos-build.yml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: build
2+
3+
env:
4+
GOPATH: /home/runner/work/gotest/gotest
5+
GO111MODULE: off
6+
REPO_PATH: src/gotest
7+
MACOS_GOPATH: /Users/runner/work/gotest/gotest
8+
GITHUB_TOKEN: ${{ github.token }}
9+
10+
on:
11+
workflow_dispatch:
12+
inputs:
13+
id:
14+
description: 'Run ID'
15+
required: true
16+
runner:
17+
description: 'Github actions runner'
18+
required: false
19+
default: 'macos-latest'
20+
path:
21+
description: 'Directory where to run command'
22+
required: false
23+
default: ''
24+
pr:
25+
description: 'Pull request id'
26+
required: false
27+
default: ''
28+
go_version:
29+
description: 'Go version'
30+
required: false
31+
default: '1.17'
32+
command:
33+
description: 'Command to run'
34+
required: true
35+
default: ''
36+
jobs:
37+
build:
38+
runs-on: ${{ github.event.inputs.runner }}
39+
steps:
40+
- name: ${{ format('Run ID {0}', github.event.inputs.id) }}
41+
run: echo Run ID ${{github.event.inputs.id}}
42+
- name: Set environment for macos
43+
if: ${{ contains(github.event.inputs.runner, 'macos') }}
44+
run: |
45+
echo Changed GOPATH to ${{ env.MACOS_GOPATH }}
46+
echo "GOPATH="${{ env.MACOS_GOPATH }} >> $GITHUB_ENV
47+
- name: Set up Go
48+
uses: actions/setup-go@v2
49+
with:
50+
go-version: ${{ github.event.inputs.go_version }}
51+
- name: Install dependencies
52+
run: go get -u github.com/magefile/mage
53+
- uses: actions/checkout@v2
54+
with:
55+
fetch-depth: 0
56+
ref: ${{ env.GITHUB_REF }}
57+
path: ${{ env.REPO_PATH }}
58+
- name: Checkout and merge PR
59+
if: ${{ github.event.inputs.pr }}
60+
run: |
61+
set -x
62+
cd ${{ env.GOPATH }}/${{ env.REPO_PATH }}
63+
git config --global user.email "user@example.com"
64+
git config --global user.name "user"
65+
git fetch origin pull/${{ github.event.inputs.pr }}/head:${{ github.event.inputs.id }}
66+
git checkout ${{ github.event.inputs.id }}
67+
git checkout $GITHUB_REF_NAME
68+
git merge --no-ff ${{ github.event.inputs.id }}
69+
- name: Run command
70+
run: |
71+
set -x
72+
cd ${{ env.GOPATH }}/${{ env.REPO_PATH }}/${{ github.event.inputs.path }}
73+
${{ github.event.inputs.command }}

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.2
1+
1.17.5

‎CHANGELOG.asciidoc‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
33
:issue: https://github.com/elastic/beats/issues/
44
:pull: https://github.com/elastic/beats/pull/
55

6+
[[release-notes-7.16.2]]
7+
=== Beats version 7.16.2
8+
https://github.com/elastic/beats/compare/v7.16.1...v7.16.2[View commits]
9+
10+
==== Bugfixes
11+
12+
*Filebeat*
13+
14+
- Resolve issue with @timestamp for `defender_atp`. {pull}28272[28272]
15+
- Fix handling of escaped newlines in the `decode_cef` processor. {issue}16995[16995] {pull}29268[29268]
16+
17+
==== Added
18+
19+
*Filebeat*
20+
21+
- Update Cisco module to enable TCP input. {issue}26118[26118] {issue}28821[28821] {pull}26159[26159]
22+
23+
*Winlogbeat*
24+
25+
- Add configuration option for registry file flush timeout {issue}29001[29001] {pull}29053[29053]
26+
627
[[release-notes-7.16.1]]
728
=== Beats version 7.16.1
829
https://github.com/elastic/beats/compare/v7.16.0...v7.16.1[View commits]
@@ -74,6 +95,7 @@ https://github.com/elastic/beats/compare/v7.15.2...v7.16.0[View commits]
7495
- Fix in `aws-s3` input regarding provider discovery through endpoint. {pull}28963[28963]
7596
- Fix `threatintel.misp` filters configuration. {issue}27970[27970]
7697
- Fix opening files on Windows in filestream so open files can be deleted. {issue}29113[29113] {pull}29180[29180]
98+
- Fix `panw` module ingest errors for GLOBALPROTECT logs {pull}29154[29154]
7799

78100
*Heartbeat*
79101

‎CHANGELOG.next.asciidoc‎

Lines changed: 8 additions & 161 deletions
Large diffs are not rendered by default.

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ def e2e_with_entrypoint(Map args = [:]) {
537537
def dockerLogFile = "docker_logs_${entrypoint}.log"
538538
dir("${env.WORKSPACE}/src/github.com/elastic/e2e-testing") {
539539
// TBC with the target branch if running on a PR basis.
540-
git(branch: 'master', credentialsId: '2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken', url: 'https://github.com/elastic/e2e-testing.git')
540+
git(branch: 'main', credentialsId: '2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken', url: 'https://github.com/elastic/e2e-testing.git')
541541
if(isDockerInstalled()) {
542542
dockerLogin(secret: "${DOCKER_ELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
543543
}

0 commit comments

Comments
 (0)