Merge branch 'master' of https://github.com/elastic/beats into window…

…s-memory-usage-bytes-take-2
elastic · Apr 30, 2021 · f5bad30 · f5bad30
2 parents cf07d3d + fcfe6b6
commit f5bad30
Show file tree

Hide file tree

Showing 27 changed files with 211 additions and 158 deletions.
diff --git a/.ci/packaging.groovy b/.ci/packaging.groovy
@@ -17,7 +17,6 @@ pipeline {
     JOB_GCS_BUCKET = 'beats-ci-artifacts'
     JOB_GCS_BUCKET_STASH = 'beats-ci-temp'
     JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin'
-    JOB_GCS_EXT_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials'
     DOCKERELASTIC_SECRET = 'secret/observability-team/ci/docker-registry/prod'
     DOCKER_REGISTRY = 'docker.elastic.co'
     GITHUB_CHECK_E2E_TESTS_NAME = 'E2E Tests'
@@ -471,11 +470,14 @@ def publishPackages(baseDir){
   uploadPackages("${bucketUri}/${beatsFolderName}", baseDir)
 }
 
-def uploadPackages(bucketUri, beatsFolder){
-  googleStorageUploadExt(bucket: bucketUri,
-    credentialsId: "${JOB_GCS_EXT_CREDENTIALS}",
-    pattern: "${beatsFolder}/build/distributions/**/*",
-    sharedPublicly: true)
+def uploadPackages(bucketUri, baseDir){
+  googleStorageUpload(bucket: bucketUri,
+    credentialsId: "${JOB_GCS_CREDENTIALS}",
+    pathPrefix: "${baseDir}/build/distributions/",
+    pattern: "${baseDir}/build/distributions/**/*",
+    sharedPublicly: true,
+    showInline: true
+  )
 }
 
 /**
@@ -530,4 +532,4 @@ def fixPermissions() {
       }
     }
   }
-}
+}
diff --git a/.mergify.yml b/.mergify.yml
@@ -12,6 +12,7 @@ pull_request_rules:
           - "7.x"
         labels:
           - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
   - name: backport patches to 7.13 branch
     conditions:
       - merged
@@ -25,6 +26,7 @@ pull_request_rules:
           - "7.13"
         labels:
           - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
   - name: backport patches to 7.12 branch
     conditions:
       - merged
@@ -38,19 +40,7 @@ pull_request_rules:
           - "7.12"
         labels:
           - "backport"
-  - name: backport patches to 7.11 branch
-    conditions:
-      - merged
-      - base=master
-      - label=backport-v7.11.0
-    actions:
-      backport:
-        assignees:
-          - "{{ author }}"
-        branches:
-          - "7.11"
-        labels:
-          - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
   - name: ask to resolve conflict
     conditions:
       - conflict
@@ -78,7 +68,7 @@ pull_request_rules:
     conditions:
       - merged
       - label=automation
-      - base~=^update-stack-version
+      - head~=^update-stack-version
       - files~=^testing/environments/snapshot.*\.yml$
     actions:
       delete_head_branch:
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -388,6 +388,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Updating Oauth2 flow for m365_defender fileset. {pull}24829[24829]
 - Fix IPtables Pipeline and Ubiquiti dashboard. {issue}24878[24878] {pull}24928[24928]
 - Change `checkpoint.source_object` from Long to Keyword. {issue}25124[25124] {pull}25145[25145]
+- Fix s3 input when there is a blank line in the log file. {pull}25357[25357]
 - Fix Nginx module pipelines. {issue}19088[19088] {pull}24699[24699]
 
 *Heartbeat*
@@ -507,6 +508,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fix type of `uwsgi.status.worker.rss` type. {pull}24468[24468]
 - Accept text/plain type by default for prometheus client scraping. {pull}24622[24622]
 - Use working set bytes to calculate the pod memory limit pct when memory usage is not reported (ie. Windows pods). {pull}25428[25428]
+- Fix copy-paste error in libbeat docs. {pull}25448[25448]
 
 *Packetbeat*
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -15,7 +15,6 @@ pipeline {
     DOCKER_REGISTRY = 'docker.elastic.co'
     JOB_GCS_BUCKET = 'beats-ci-temp'
     JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin'
-    JOB_GCS_EXT_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials'
     OSS_MODULE_PATTERN = '^[a-z0-9]+beat\\/module\\/([^\\/]+)\\/.*'
     PIPELINE_LOG_LEVEL = 'INFO'
     PYTEST_ADDOPTS = "${params.PYTEST_ADDOPTS}"
@@ -387,10 +386,13 @@ def publishPackages(beatsFolder){
 * @param beatsFolder the beats folder.
 */
 def uploadPackages(bucketUri, beatsFolder){
-  googleStorageUploadExt(bucket: bucketUri,
-    credentialsId: "${JOB_GCS_EXT_CREDENTIALS}",
+  googleStorageUpload(bucket: bucketUri,
+    credentialsId: "${JOB_GCS_CREDENTIALS}",
+    pathPrefix: "${beatsFolder}/build/distributions/",
     pattern: "${beatsFolder}/build/distributions/**/*",
-    sharedPublicly: true)
+    sharedPublicly: true,
+    showInline: true
+  )
 }
 
 /**
@@ -785,12 +787,12 @@ def archiveTestOutput(Map args = [:]) {
 * disk space of the jenkins instance
 */
 def tarAndUploadArtifacts(Map args = [:]) {
-  def fileName = args.file.replaceAll('[^A-Za-z-0-9]','-')
-  tar(file: fileName, dir: args.location, archive: false, allowMissing: true)
-  googleStorageUploadExt(bucket: "gs://${JOB_GCS_BUCKET}/${env.JOB_NAME}-${env.BUILD_ID}",
-                         credentialsId: "${JOB_GCS_EXT_CREDENTIALS}",
-                         pattern: "${fileName}",
-                         sharedPublicly: true)
+  tar(file: args.file, dir: args.location, archive: false, allowMissing: true)
+  googleStorageUpload(bucket: "gs://${JOB_GCS_BUCKET}/${env.JOB_NAME}-${env.BUILD_ID}",
+                      credentialsId: "${JOB_GCS_CREDENTIALS}",
+                      pattern: "${args.file}",
+                      sharedPublicly: true,
+                      showInline: true)
 }
 
 /**

diff --git a/Vagrantfile b/Vagrantfile
@@ -139,9 +139,14 @@ apt-get install -y make gcc python3 python3-pip python3-venv git libsystemd-dev
 SCRIPT
 end
 
-Vagrant.configure(2) do |config|
+Vagrant.configure("2") do |config|
+  config.vm.provider :virtualbox do |vbox|
+    vbox.memory = 4096
+    vbox.cpus = 4
+  end
+
   # Windows Server 2012 R2
-  config.vm.define "win2012", primary: true do |c|
+  config.vm.define "win2012" do |c|
     c.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-win2012-r2-virtualbox-2016-10-28_1224.box"
     c.vm.guest = :windows
 
@@ -156,120 +161,165 @@ Vagrant.configure(2) do |config|
     c.vm.provision "shell", inline: $winPsProvision
   end
 
-  config.vm.define "win2016", primary: true do |c|
+  config.vm.define "win2016" do |c|
     c.vm.box = "StefanScherer/windows_2016"
     c.vm.provision "shell", inline: $winPsProvision, privileged: false
   end
 
-  config.vm.define "win2019", primary: true do |c|
+  config.vm.define "win2019" do |c|
     c.vm.box = "StefanScherer/windows_2019"
     c.vm.provision "shell", inline: $winPsProvision, privileged: false
-
-    c.vm.provider :virtualbox do |vbox|
-      vbox.memory = 4096
-      vbox.cpus = 4
-    end
   end
 
-  # Solaris 11.2
-  config.vm.define "solaris", primary: true do |c|
-    c.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-solaris-11.2-virtualbox-2016-11-02_1603.box"
+  config.vm.define "centos6" do |c|
+    c.vm.box = "bento/centos-6.10"
     c.vm.network :forwarded_port, guest: 22, host: 2223, id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "yum install -y make gcc git rpm-devel epel-release"
+    c.vm.provision "shell", inline: "yum install -y python34 python34-pip"
   end
 
-  # FreeBSD 11.0
-  config.vm.define "freebsd", primary: true do |c|
-    c.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-freebsd-11.0-virtualbox-2016-11-02_1638.box"
+  config.vm.define "centos7" do |c|
+    c.vm.box = "bento/centos-7"
     c.vm.network :forwarded_port, guest: 22, host: 2224, id: "ssh", auto_correct: true
 
-    # Must use NFS to sync a folder on FreeBSD and this requires a host-only network.
-    # To enable the /vagrant folder, set disabled to false and uncomment the private_network.
-    c.vm.synced_folder ".", "/vagrant", id: "vagrant-root", :nfs => true, disabled: true
-    #c.vm.network "private_network", ip: "192.168.135.18"
-
-    c.vm.hostname = "beats-tester"
     c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "yum install -y make gcc python3 python3-pip git rpm-devel"
   end
 
-  # OpenBSD 5.9-stable
-  config.vm.define "openbsd", primary: true do |c|
-    c.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-openbsd-5.9-current-virtualbox-2016-11-02_2007.box"
+  config.vm.define "centos8" do |c|
+    c.vm.box = "bento/centos-8"
     c.vm.network :forwarded_port, guest: 22, host: 2225, id: "ssh", auto_correct: true
 
-    c.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: true
-    c.vm.provider :virtualbox do |vbox|
-      vbox.check_guest_additions = false
-      vbox.functional_vboxsf = false
-    end
-
     c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "yum install -y make gcc python3 python3-pip git rpm-devel"
   end
 
-  config.vm.define "precise32", primary: true do |c|
-    c.vm.box = "ubuntu/precise32"
+  config.vm.define "ubuntu1404" do |c|
+    c.vm.box = "ubuntu/trusty64"
     c.vm.network :forwarded_port, guest: 22, host: 2226, id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
-    c.vm.provision "shell", inline: linuxGvmProvision("386"), privileged: false
-    c.vm.provision "shell", inline: linuxDebianProvision
+    c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "apt-get update && apt-get install -y make gcc python3 python3-pip python3.4-venv git"
   end
 
-  config.vm.define "precise64", primary: true do |c|
-    c.vm.box = "ubuntu/precise64"
+  config.vm.define "ubuntu1604" do |c|
+    c.vm.box = "ubuntu/xenial64"
     c.vm.network :forwarded_port, guest: 22, host: 2227, id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
     c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
     c.vm.provision "shell", inline: linuxDebianProvision
   end
 
-  config.vm.define "ubuntu1804", primary: true do |c|
+  config.vm.define "ubuntu1804" do |c|
     c.vm.box = "ubuntu/bionic64"
     c.vm.network :forwarded_port, guest: 22, host: 2228, id: "ssh", auto_correct: true
 
-    c.vm.provider :virtualbox do |vbox|
-      vbox.memory = 4096
-      vbox.cpus = 4
-    end
-
     c.vm.provision "shell", inline: $unixProvision, privileged: false
     c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
     c.vm.provision "shell", inline: linuxDebianProvision
   end
 
-  config.vm.define "centos6", primary: true do |c|
-    c.vm.box = "bento/centos-6.10"
+  config.vm.define "ubuntu2004", primary: true  do |c|
+    c.vm.box = "ubuntu/focal64"
     c.vm.network :forwarded_port, guest: 22, host: 2229, id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
     c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
-    c.vm.provision "shell", inline: "yum install -y make gcc git rpm-devel epel-release"
-    c.vm.provision "shell", inline: "yum install -y python34 python34-pip"
+    c.vm.provision "shell", inline: linuxDebianProvision
   end
 
-  config.vm.define "centos7", primary: true do |c|
-    c.vm.box = "bento/centos-7"
-    c.vm.network :forwarded_port, guest: 22, host: 2230, id: "ssh", auto_correct: true
+  config.vm.define "debian8" do |c|
+    c.vm.box = "debian/jessie64"
+    c.vm.network :forwarded_port, guest: 22, host: 2231, id: "ssh", auto_correct: true
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: linuxDebianProvision
+  end
+
+  config.vm.define "debian9" do |c|
+    c.vm.box = "debian/stretch64"
+    c.vm.network :forwarded_port, guest: 22, host: 2232, id: "ssh", auto_correct: true
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: linuxDebianProvision
+  end
+
+  config.vm.define "debian10" do |c|
+    c.vm.box = "debian/buster64"
+    c.vm.network :forwarded_port, guest: 22, host: 2233, id: "ssh", auto_correct: true
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: linuxDebianProvision
+  end
+
+  config.vm.define "amazon1" do |c|
+    c.vm.box = "mvbcoding/awslinux"
+    c.vm.network :forwarded_port, guest: 22, host: 2234, id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
     c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
     c.vm.provision "shell", inline: "yum install -y make gcc python3 python3-pip git rpm-devel"
   end
 
-  config.vm.define "fedora31", primary: true do |c|
-    c.vm.box = "bento/fedora-31"
-    c.vm.network :forwarded_port, guest: 22, host: 2231, id: "ssh", auto_correct: true
+  config.vm.define "amazon2" do |c|
+    c.vm.box = "bento/amazonlinux-2"
+    c.vm.network :forwarded_port, guest: 22, host: 2235, id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
     c.vm.provision "shell", inline: linuxGvmProvision, privileged: false
-    c.vm.provision "shell", inline: "dnf install -y make gcc python3 python3-pip git rpm-devel"
+    c.vm.provision "shell", inline: "yum install -y make gcc python3 python3-pip git rpm-devel"
+  end
+
+  # The following boxes are not listed as officially supported by the Elastic support matrix
+  # Solaris 11.2
+  config.vm.define "solaris", autostart: false do |c|
+    c.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-solaris-11.2-virtualbox-2016-11-02_1603.box"
+    c.vm.network :forwarded_port, guest: 22, host: 2236, id: "ssh", auto_correct: true
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
   end
 
-  config.vm.define "archlinux", primary: true do |c|
+  # FreeBSD 11.0
+  config.vm.define "freebsd", autostart: false do |c|
+    c.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-freebsd-11.0-virtualbox-2016-11-02_1638.box"
+    c.vm.network :forwarded_port, guest: 22, host: 2237, id: "ssh", auto_correct: true
+
+    # Must use NFS to sync a folder on FreeBSD and this requires a host-only network.
+    # To enable the /vagrant folder, set disabled to false and uncomment the private_network.
+    c.vm.synced_folder ".", "/vagrant", id: "vagrant-root", :nfs => true, disabled: true
+    #c.vm.network "private_network", ip: "192.168.135.18"
+
+    c.vm.hostname = "beats-tester"
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+  end
+
+  # OpenBSD 5.9-stable
+  config.vm.define "openbsd", autostart: false do |c|
+    c.vm.box = "https://s3.amazonaws.com/beats-files/vagrant/beats-openbsd-5.9-current-virtualbox-2016-11-02_2007.box"
+    c.vm.network :forwarded_port, guest: 22, host: 2238, id: "ssh", auto_correct: true
+
+    c.vm.synced_folder ".", "/vagrant", type: "rsync", disabled: true
+    c.vm.provider :virtualbox do |vbox|
+      vbox.check_guest_additions = false
+      vbox.functional_vboxsf = false
+    end
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+  end
+
+  config.vm.define "archlinux", autostart: false do |c|
     c.vm.box = "archlinux/archlinux"
-    c.vm.network :forwarded_port, guest: 22, host: 2233, id: "ssh", auto_correct: true
+    c.vm.network :forwarded_port, guest: 22, host: 2239, id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
     c.vm.provision "shell", inline: linuxGvmProvision, privileged: false