Merge remote-tracking branch 'upstream/master' into madv-rss-usage-kn…

…own-issue
elastic · Jan 14, 2021 · 83524b6 · 83524b6
2 parents b6c999b + 72eb969
commit 83524b6
Show file tree

Hide file tree

Showing 77 changed files with 2,729 additions and 817 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,6 +1,6 @@
 {
   "upstream": "elastic/beats",
-  "branches": [ { "name": "7.x", "checked": true }, "7.10" ],
+  "branches": [ { "name": "7.x", "checked": true }, "7.11", "7.10" ],
   "labels": ["backport"],
   "autoAssign": true,
   "prTitle": "Cherry-pick to {targetBranch}: {commitMessages}"

diff --git a/.ci/jobs/beats-schedule-weekly.yml b/.ci/jobs/beats-schedule-weekly.yml
@@ -15,7 +15,7 @@
       scm:
         - git:
             url: git@github.com:elastic/beats.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/pull/*/head:refs/remotes/origin/pr/*
+            refspec: +refs/heads/*:refs/remotes/origin/*
             wipe-workspace: 'True'
             name: origin
             shallow-clone: true

diff --git a/.ci/schedule-weekly.groovy b/.ci/schedule-weekly.groovy
@@ -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)
       }
     }
   }

diff --git a/.ci/scripts/install-tools.bat b/.ci/scripts/install-tools.bat
@@ -79,4 +79,4 @@ gcc --version
 where gcc
 
 REM Reset the USERPROFILE
-SET USERPROFILE=%PREVIOUS_USERPROFILE%
+SET USERPROFILE=%PREVIOUS_USERPROFILE%
diff --git a/CHANGELOG-developer.asciidoc b/CHANGELOG-developer.asciidoc
@@ -13,7 +13,7 @@ other Beats should be migrated.
 Note: This changelog was only started after the 6.3 release.
 
 === Beats version 8.0.0
-https://github.com/elastic/beats/compare/v7.x..master[Check the HEAD diff]
+https://github.com/elastic/beats/compare/7.x..master[Check the HEAD diff]
 
 ==== Breaking changes
  - Replace custom Pins type for a slice of string for defining the `ca_sha256` values.