Skip to content

Commit a2cb531

Browse files
michalpristasmichalpristas
committed
changelog conflicts
2 parents 3907430 + cde17b1 commit a2cb531

508 files changed

Lines changed: 40141 additions & 4408 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.

‎.ci/scripts/install-kind.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
set -exuo pipefail
3+
4+
MSG="parameter missing."
5+
DEFAULT_HOME="/usr/local"
6+
KIND_VERSION=${KIND_VERSION:?$MSG}
7+
HOME=${HOME:?$DEFAULT_HOME}
8+
KIND_CMD="${HOME}/bin/kind"
9+
10+
mkdir -p "${HOME}/bin"
11+
12+
curl -sSLo "${KIND_CMD}" "https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64"
13+
chmod +x "${KIND_CMD}"

‎.ci/scripts/install-kubectl.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
set -exuo pipefail
3+
4+
MSG="parameter missing."
5+
DEFAULT_HOME="/usr/local"
6+
K8S_VERSION=${K8S_VERSION:?$MSG}
7+
HOME=${HOME:?$DEFAULT_HOME}
8+
KUBECTL_CMD="${HOME}/bin/kubectl"
9+
10+
mkdir -p "${HOME}/bin"
11+
12+
curl -sSLo "${KUBECTL_CMD}" "https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl"
13+
chmod +x "${KUBECTL_CMD}"
14+

‎.ci/scripts/kind-setup.sh‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
#!/usr/bin/env bash
22
set -exuo pipefail
33

4-
MSG="parameter missing."
5-
K8S_VERSION=${K8S_VERSION:?$MSG}
6-
HOME=${HOME:?$MSG}
7-
KBC_CMD="${HOME}/bin/kubectl"
8-
9-
mkdir -p "${HOME}/bin"
10-
11-
curl -sSLo "${KBC_CMD}" "https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl"
12-
chmod +x "${KBC_CMD}"
13-
14-
GO111MODULE="on" go get sigs.k8s.io/kind@v0.5.1
154
kind create cluster --image kindest/node:${K8S_VERSION}
16-
17-
export KUBECONFIG="$(kind get kubeconfig-path)"
185
kubectl cluster-info

‎.travis.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,13 @@ jobs:
116116
stage: test
117117
- os: linux
118118
before_install: .ci/scripts/travis_has_changes.sh metricbeat libbeat || travis_terminate 0
119-
env: TARGETS="-C metricbeat integration-tests"
119+
install:
120+
- .ci/scripts/install-kind.sh
121+
- .ci/scripts/install-kubectl.sh
122+
env:
123+
- TARGETS="-C metricbeat integration-tests"
124+
- K8S_VERSION=v1.17.2
125+
- KIND_VERSION=v0.7.0
120126
go: $TRAVIS_GO_VERSION
121127
stage: test
122128
- os: linux

‎CHANGELOG.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ https://github.com/elastic/beats/compare/v7.5.0...v7.5.1[View commits]
3030
- Fix docker network stats when multiple interfaces are configured. {issue}14586[14586] {pull}14825[14825]
3131
- Fix ListMetrics pagination in aws module. {issue}14926[14926] {pull}14942[14942]
3232
- Fix CPU count in docker/cpu in cases where no `online_cpus` are reported {pull}15070[15070]
33+
- Add domain state to kvm module {pull}17673[17673]
3334

3435
[[release-notes-7.5.0]]
3536
=== Beats version 7.5.0

‎CHANGELOG.next.asciidoc‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
2121

2222
*Filebeat*
2323
- Improve ECS field mappings in panw module. event.outcome now only contains success/failure per ECS specification. {issue}16025[16025] {pull}17910[17910]
24+
- Improve ECS categorization field mappings for nginx module. http.request.referrer is now lowercase & http.request.referrer only populated when nginx sets a value {issue}16174[16174] {pull}17844[17844]
25+
- Improve ECS field mappings in santa module. move hash.sha256 to process.hash.sha256 & move certificate fields to santa.certificate . {issue}16180[16180] {pull}17982[17982]
2426

2527
*Heartbeat*
2628

@@ -77,6 +79,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
7779
- Do not rotate log files on startup when interval is configured and rotateonstartup is disabled. {pull}17613[17613]
7880
- Fix goroutine leak and Elasticsearch output file descriptor leak when output reloading is in use. {issue}10491[10491] {pull}17381[17381]
7981
- Fix `setup.dashboards.index` setting not working. {pull}17749[17749]
82+
- Fix Elasticsearch license endpoint URL referenced in error message. {issue}17880[17880] {pull}18030[18030]
8083

8184
*Auditbeat*
8285

@@ -114,7 +117,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
114117
- Remove migrationVersion map 7.7.0 reference from Kibana dashboard file to fix backward compatibility issues. {pull}17425[17425]
115118
- Fix issue 17734 to retry on rate-limit error in the Filebeat httpjson input. {issue}17734[17734] {pull}17735[17735]
116119
- Fixed `cloudfoundry.access` to have the correct `cloudfoundry.app.id` contents. {pull}17847[17847]
120+
- Fixing `ingress_controller.` fields to be of type keyword instead of text. {issue}17834[17834]
117121
- Fixed typo in log message. {pull}17897[17897]
122+
- Fix Cisco ASA ASA 3020** and 106023 messages {pull}17964[17964]
118123

119124
*Heartbeat*
120125

@@ -198,9 +203,12 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
198203
- Update RPM packages contained in Beat Docker images. {issue}17035[17035]
199204
- Update supported versions of `redis` output. {pull}17198[17198]
200205
- Update documentation for system.process.memory fields to include clarification on Windows os's. {pull}17268[17268]
206+
- Add `replace` processor for replacing string values of fields. {pull}17342[17342]
201207
- Add optional regex based cid extractor to `add_kubernetes_metadata` processor. {pull}17360[17360]
202208
- Add `urldecode` processor to for decoding URL-encoded fields. {pull}17505[17505]
203209
- Add support for AWS IAM `role_arn` in credentials config. {pull}17658[17658] {issue}12464[12464]
210+
- Add keystore support for autodiscover static configurations. {pull]16306[16306]
211+
- Add Kerberos support to Elasticsearch output. {pull}17927[17927]
204212

205213
*Auditbeat*
206214

@@ -270,14 +278,15 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
270278
- Enhance `elasticsearch/slowlog` fileset to handle ECS-compatible logs emitted by Elasticsearch. {issue}17715[17715] {pull}17729[17729]
271279
- Improve ECS categorization field mappings in misp module. {issue}16026[16026] {pull}17344[17344]
272280
- Added Unix stream socket support as an input source and a syslog input source. {pull}17492[17492]
273-
- Improve ECS categorization field mappings for nginx module. {issue}16174[16174] {pull}17844[17844]
274281
- Improve ECS categorization field mappings in postgresql module. {issue}16177[16177] {pull}17914[17914]
275282
- Improve ECS categorization field mappings in rabbitmq module. {issue}16178[16178] {pull}17916[17916]
283+
- Improve ECS categorization field mappings in redis module. {issue}16179[16179] {pull}17918[17918]
284+
- Improve ECS categorization field mappings for zeek module. {issue}16029[16029] {pull}17738[17738]
276285

277286
*Heartbeat*
278287

279288
- Allow a list of status codes for HTTP checks. {pull}15587[15587]
280-
289+
- Add additional ECS compatible fields for TLS information. {pull}17687[17687]
281290

282291
*Journalbeat*
283292

@@ -346,8 +355,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
346355
- Reference kubernetes manifests mount data directory from the host when running metricbeat as daemonset, so data persist between executions in the same node. {pull}17429[17429]
347356
- Add more detailed error messages, system tests and small refactoring to the service metricset in windows. {pull}17725[17725]
348357
- Stack Monitoring modules now auto-configure required metricsets when `xpack.enabled: true` is set. {issue}16471[[16471] {pull}17609[17609]
358+
- Allow partial region and zone name in googlecloud module config. {pull}17913[17913]
349359
- Add aggregation aligner as a config parameter for googlecloud stackdriver metricset. {issue}17141[[17141] {pull}17719[17719]
350360
- Move the perfmon metricset to GA. {issue}16608[16608] {pull}17879[17879]
361+
- Add static mapping for metricsets under aws module. {pull}17614[17614] {pull}17650[17650]
351362

352363
*Packetbeat*
353364

‎Jenkinsfile‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ pipeline {
4040
steps {
4141
deleteDir()
4242
gitCheckout(basedir: "${BASE_DIR}")
43+
stash allowEmpty: true, name: 'source', useDefaultExcludes: false
4344
dir("${BASE_DIR}"){
4445
loadConfigEnvVars()
4546
}
4647
whenTrue(params.debug){
4748
dumpFilteredEnvironment()
4849
}
49-
stash allowEmpty: true, name: 'source', useDefaultExcludes: false
5050
}
5151
}
5252
stage('Lint'){
@@ -587,12 +587,17 @@ pipeline {
587587
}
588588
}
589589
steps {
590-
k8sTest(["v1.16.2","v1.15.3","v1.14.6","v1.13.10","v1.12.10","v1.11.10"])
590+
k8sTest(["v1.18.2","v1.17.2","v1.16.4","v1.15.7","v1.14.10"])
591591
}
592592
}
593593
}
594594
}
595595
}
596+
post {
597+
cleanup {
598+
notifyBuildResult(prComment: true)
599+
}
600+
}
596601
}
597602

598603
def makeTarget(String context, String target, boolean clean = true) {
@@ -801,14 +806,14 @@ def dumpFilteredEnvironment(){
801806
def k8sTest(versions){
802807
versions.each{ v ->
803808
stage("k8s ${v}"){
804-
withEnv(["K8S_VERSION=${v}"]){
809+
withEnv(["K8S_VERSION=${v}", "KIND_VERSION=v0.7.0", "KUBECONFIG=${env.WORKSPACE}/kubecfg"]){
805810
withGithubNotify(context: "K8s ${v}") {
806811
withBeatsEnv(false) {
807-
sh(label: "Install k8s", script: """
808-
eval "\$(gvm use ${GO_VERSION} --format=bash)"
809-
.ci/scripts/kind-setup.sh
810-
""")
811-
sh(label: "Kubernetes Kind",script: "make KUBECONFIG=\"\$(kind get kubeconfig-path)\" -C deploy/kubernetes test")
812+
sh(label: "Install kind", script: ".ci/scripts/install-kind.sh")
813+
sh(label: "Install kubectl", script: ".ci/scripts/install-kubectl.sh")
814+
sh(label: "Integration tests", script: "MODULE=kubernetes make -C metricbeat integration-tests")
815+
sh(label: "Setup kind", script: ".ci/scripts/kind-setup.sh")
816+
sh(label: "Deploy to kubernetes",script: "make -C deploy/kubernetes test")
812817
sh(label: 'Delete cluster', script: 'kind delete cluster')
813818
}
814819
}
@@ -853,7 +858,6 @@ def isChangedOSSCode(patterns) {
853858
"^\\.ci/.*",
854859
]
855860
allPatterns.addAll(patterns)
856-
allPatterns.addAll(getVendorPatterns('libbeat'))
857861
return isChanged(allPatterns)
858862
}
859863

@@ -868,14 +872,17 @@ def isChangedXPackCode(patterns) {
868872
"^\\.ci/.*",
869873
]
870874
allPatterns.addAll(patterns)
871-
allPatterns.addAll(getVendorPatterns('x-pack/libbeat'))
872875
return isChanged(allPatterns)
873876
}
874877

875878
def loadConfigEnvVars(){
876879
def empty = []
877880
env.GO_VERSION = readFile(".go-version").trim()
878881

882+
withEnv(["HOME=${env.WORKSPACE}"]) {
883+
sh(label: "Install Go ${env.GO_VERSION}", script: ".ci/scripts/install-go.sh")
884+
}
885+
879886
// Libbeat is the core framework of Beats. It has no additional dependencies
880887
// on other projects in the Beats repository.
881888
env.BUILD_LIBBEAT = isChangedOSSCode(empty)
@@ -934,17 +941,25 @@ def loadConfigEnvVars(){
934941
// involved.
935942
env.BUILD_KUBERNETES = isChanged(["^deploy/kubernetes/.*"])
936943

937-
env.BUILD_GENERATOR = isChangedOSSCode(getVendorPatterns('generator'))
944+
def generatorPatterns = ['^generator/.*']
945+
generatorPatterns.addAll(getVendorPatterns('generator/common/beatgen'))
946+
generatorPatterns.addAll(getVendorPatterns('metricbeat/beater'))
947+
env.BUILD_GENERATOR = isChangedOSSCode(generatorPatterns)
938948
}
939949

940950
/**
941951
This method grab the dependencies of a Go module and transform them on regexp
942952
*/
943953
def getVendorPatterns(beatName){
954+
def os = goos()
955+
def goRoot = "${env.WORKSPACE}/.gvm/versions/go${GO_VERSION}.${os}.amd64"
944956
def output = ""
945-
docker.image("golang:${GO_VERSION}").inside{
957+
958+
withEnv([
959+
"HOME=${env.WORKSPACE}/${env.BASE_DIR}",
960+
"PATH=${env.WORKSPACE}/bin:${goRoot}/bin:${env.PATH}",
961+
]) {
946962
output = sh(label: 'Get vendor dependency patterns', returnStdout: true, script: """
947-
export HOME=${WORKSPACE}/${BASE_DIR}
948963
go list -mod=vendor -f '{{ .ImportPath }}{{ "\\n" }}{{ join .Deps "\\n" }}' ./${beatName}\
949964
|awk '{print \$1"/.*"}'\
950965
|sed -e "s#github.com/elastic/beats/v7/##g"

‎NOTICE.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,6 +1371,15 @@ License type (autodetected): Apache-2.0
13711371
Apache License 2.0
13721372

13731373

1374+
--------------------------------------------------------------------
1375+
Dependency: github.com/docker/spdystream
1376+
Revision: 449fdfce4d96
1377+
License type (autodetected): Apache-2.0
1378+
./vendor/github.com/docker/spdystream/LICENSE:
1379+
--------------------------------------------------------------------
1380+
Apache License 2.0
1381+
1382+
13741383
--------------------------------------------------------------------
13751384
Dependency: github.com/dop251/goja
13761385
Overwrite: github.com/andrewkroh/goja
@@ -7957,6 +7966,15 @@ License type (autodetected): Apache-2.0
79577966
Apache License 2.0
79587967

79597968

7969+
--------------------------------------------------------------------
7970+
Dependency: gopkg.in/jcmturner/goidentity.v3
7971+
Version: v3.0.0
7972+
License type (autodetected): Apache-2.0
7973+
./vendor/gopkg.in/jcmturner/goidentity.v3/LICENSE:
7974+
--------------------------------------------------------------------
7975+
Apache License 2.0
7976+
7977+
79607978
--------------------------------------------------------------------
79617979
Dependency: gopkg.in/jcmturner/gokrb5.v7
79627980
Version: v7.3.0

‎auditbeat/auditbeat.reference.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,27 @@ output.elasticsearch:
526526
# The pin is a base64 encoded string of the SHA-256 fingerprint.
527527
#ssl.ca_sha256: ""
528528

529+
# Enable Kerberos support. Kerberos is automatically enabled if any Kerberos setting is set.
530+
#kerberos.enabled: true
531+
532+
# Authentication type to use with Kerberos. Available options: keytab, password.
533+
#kerberos.auth_type: password
534+
535+
# Path to the keytab file. It is used when auth_type is set to keytab.
536+
#kerberos.keytab: /etc/elastic.keytab
537+
538+
# Path to the Kerberos configuration.
539+
#kerberos.config_path: /etc/krb5.conf
540+
541+
# Name of the Kerberos user.
542+
#kerberos.username: elastic
543+
544+
# Password of the Kerberos user. It is used when auth_type is set to password.
545+
#kerberos.password: changeme
546+
547+
# Kerberos realm.
548+
#kerberos.realm: ELASTIC
549+
529550
#----------------------------- Logstash output ---------------------------------
530551
#output.logstash:
531552
# Boolean flag to enable or disable the output module.
@@ -794,6 +815,9 @@ output.elasticsearch:
794815
# never, once, and freely. Default is never.
795816
#ssl.renegotiation: never
796817

818+
# Enable Kerberos support. Kerberos is automatically enabled if any Kerberos setting is set.
819+
#kerberos.enabled: true
820+
797821
# Authentication type to use with Kerberos. Available options: keytab, password.
798822
#kerberos.auth_type: password
799823

@@ -1380,6 +1404,27 @@ logging.files:
13801404
# never, once, and freely. Default is never.
13811405
#ssl.renegotiation: never
13821406

1407+
# Enable Kerberos support. Kerberos is automatically enabled if any Kerberos setting is set.
1408+
#kerberos.enabled: true
1409+
1410+
# Authentication type to use with Kerberos. Available options: keytab, password.
1411+
#kerberos.auth_type: password
1412+
1413+
# Path to the keytab file. It is used when auth_type is set to keytab.
1414+
#kerberos.keytab: /etc/elastic.keytab
1415+
1416+
# Path to the Kerberos configuration.
1417+
#kerberos.config_path: /etc/krb5.conf
1418+
1419+
# Name of the Kerberos user.
1420+
#kerberos.username: elastic
1421+
1422+
# Password of the Kerberos user. It is used when auth_type is set to password.
1423+
#kerberos.password: changeme
1424+
1425+
# Kerberos realm.
1426+
#kerberos.realm: ELASTIC
1427+
13831428
#metrics.period: 10s
13841429
#state.period: 1m
13851430

‎dev-tools/mage/common.go‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,19 @@ func dockerInfo() (*DockerInfo, error) {
220220
// PATH.
221221
func HaveDockerCompose() error {
222222
_, err := exec.LookPath("docker-compose")
223-
return errors.Wrap(err, "docker-compose was not found on the PATH")
223+
if err != nil {
224+
return fmt.Errorf("docker-compose is not available")
225+
}
226+
return nil
227+
}
228+
229+
// HaveKubectl returns an error if kind is not found on the PATH.
230+
func HaveKubectl() error {
231+
_, err := exec.LookPath("kubectl")
232+
if err != nil {
233+
return fmt.Errorf("kubectl is not available")
234+
}
235+
return nil
224236
}
225237

226238
// FindReplace reads a file, performs a find/replace operation, then writes the

0 commit comments

Comments
 (0)