Merge commit 'b49f904ec42d6e1c7931a8bd1d0df48bf72f0420' into update-t…

…o-upstream

.ci/apm-beats-update.groovy

@@ -81,7 +81,7 @@ pipeline {
           when {
             beforeAgent true
             anyOf {
-              branch 'master'
+              branch 'main'
               branch "\\d+\\.\\d+"
               branch "v\\d?"
               tag "v\\d+\\.\\d+\\.\\d+*"

.ci/beats-tester-bc.groovy

@@ -24,7 +24,7 @@ pipeline {
   }
   parameters {
     string(name: 'version', defaultValue: '', description: 'Id of the Build Candidate (7.10.0-b55684ff).')
-    string(name: 'BRANCH_REFERENCE', defaultValue: 'master', description: 'Branch to grab the Groovy script(for test changes).')
+    string(name: 'BRANCH_REFERENCE', defaultValue: 'main', description: 'Branch to grab the Groovy script(for test changes).')
   }
   stages {
     stage('Run Beat Tester') {

.ci/beats-tester.groovy

@@ -50,9 +50,9 @@ pipeline {
             setEnvVar('VERSION', sh(script: "grep ':stack-version:' ${BASE_DIR}/libbeat/docs/version.asciidoc | cut -d' ' -f2", returnStdout: true).trim())
           }
         }
-        stage('Build master') {
+        stage('Build main') {
           options { skipDefaultCheckout() }
-          when { branch 'master' }
+          when { branch 'main' }
           steps {
             runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT")
           }
@@ -78,7 +78,7 @@ pipeline {
           when {
             not {
               anyOf {
-                branch comparator: 'REGEXP', pattern: '(master|.*x)'
+                branch comparator: 'REGEXP', pattern: '(main|.*x)'
                 changeRequest()
               }
             }

.ci/build-docker-images.groovy

@@ -29,7 +29,7 @@ pipeline {
   }
   parameters {
     booleanParam(name: "RELEASE_TEST_IMAGES", defaultValue: "true", description: "If it's needed to build & push Beats' test images")
-    string(name: 'BRANCH_REFERENCE', defaultValue: "master", description: "Git branch/tag to use")
+    string(name: 'BRANCH_REFERENCE', defaultValue: "main", description: "Git branch/tag to use")
   }
   stages {
     stage('Checkout') {

.ci/jobs/apm-beats-update.yml

@@ -1,7 +1,7 @@
 - job:
     name: Beats/apm-beats-update
     display-name: 'APM Server Beats update'
-    description: 'Check if the Beats lib update works on the APM server master branch'
+    description: 'Check if the Beats lib update works on the APM server main branch'
     view: Beats
     concurrent: true
     project-type: multibranch
@@ -18,7 +18,7 @@
         discover-pr-forks-trust: 'permission'
         discover-pr-origin: 'merge-current'
         discover-tags: true
-        head-filter-regex: '(master|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
+        head-filter-regex: '(main|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
         disable-pr-notifications: true
         notification-context: 'apm-beats-update'
         repo: 'beats'
@@ -33,7 +33,7 @@
             ignore-tags-newer-than: 30
         - named-branches:
             - exact-name:
-                name: 'master'
+                name: 'main'
                 case-sensitive: true
             - regex-name:
                 regex: '7\.1[6789]'

.ci/jobs/beats-schedule-daily.yml

@@ -8,7 +8,7 @@
     parameters:
       - string:
           name: branch_specifier
-          default: master
+          default: main
           description: the Git branch specifier to build
     pipeline-scm:
       script-path: .ci/schedule-daily.groovy

.ci/jobs/beats-schedule-weekly.yml

@@ -8,7 +8,7 @@
     parameters:
       - string:
           name: branch_specifier
-          default: master
+          default: main
           description: the Git branch specifier to build
     pipeline-scm:
       script-path: .ci/schedule-weekly.groovy

.ci/jobs/beats-test-infra.yml

@@ -17,6 +17,6 @@
             credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
             reference-repo: /var/lib/jenkins/.git-references/apm-test-pipeline.git
             branches:
-                - master
+                - main
     triggers:
         - timed: 'H H(3-4) * * 1-5'

.ci/jobs/beats-tester-bc.yml

@@ -9,7 +9,7 @@
     parameters:
       - string:
           name: BRANCH_REFERENCE
-          default: master
+          default: main
           description: the Git branch specifier
     pipeline-scm:
       script-path: .ci/beats-tester-bc.groovy

.ci/jobs/beats-tester.yml

@@ -14,7 +14,7 @@
           discover-pr-forks-trust: 'permission'
           discover-pr-origin: 'merge-current'
           discover-tags: true
-          head-filter-regex: '(master|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
+          head-filter-regex: '(main|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
           disable-pr-notifications: true
           notification-context: 'beats-tester'
           repo: 'beats'
@@ -29,7 +29,7 @@
               ignore-tags-newer-than: 30
           - named-branches:
               - exact-name:
-                  name: 'master'
+                  name: 'main'
                   case-sensitive: true
               - regex-name:
                   regex: '7\.1[6789]'

.ci/jobs/beats.yml

@@ -17,7 +17,7 @@
         discover-pr-forks-strategy: 'merge-current'
         discover-pr-forks-trust: 'permission'
         discover-pr-origin: 'merge-current'
-        head-filter-regex: '(master|6\.[89]|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
+        head-filter-regex: '(main|6\.[89]|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
         discover-tags: true
         notification-context: "beats-ci"
         repo: 'beats'
@@ -33,7 +33,7 @@
             ignore-target-only-changes: true
         - named-branches:
             - exact-name:
-                name: 'master'
+                name: 'main'
                 case-sensitive: true
             - regex-name:
                 regex: '6\.[89]'

.ci/jobs/build-it-docker-images.yml

@@ -8,7 +8,7 @@
     parameters:
       - string:
           name: BRANCH_REFERENCE
-          default: master
+          default: main
           description: the Git branch specifier
     pipeline-scm:
       script-path: .ci/build-docker-images.groovy

.ci/jobs/packaging.yml

@@ -14,7 +14,7 @@
           discover-pr-forks-trust: 'permission'
           discover-pr-origin: 'merge-current'
           discover-tags: true
-          head-filter-regex: '(master|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
+          head-filter-regex: '(main|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
           disable-pr-notifications: true
           notification-context: 'beats-packaging'
           repo: 'beats'
@@ -29,7 +29,7 @@
               ignore-tags-newer-than: 30
           - named-branches:
               - exact-name:
-                  name: 'master'
+                  name: 'main'
                   case-sensitive: true
               - regex-name:
                   regex: '7\.1[6789]'

.ci/packer_cache.sh

@@ -76,8 +76,8 @@ if [ -x "$(command -v docker)" ]; then
   ## Probably we need a different approach to search the latest minor.
   latestMinor=$(curl -s https://api.github.com/repos/elastic/beats/branches\?per_page=100 | jq -r '.[].name' | grep "^7." | tail -1)
 
-  for branch in master 7.x $latestMinor ; do
-    if [ "$branch" != "master" ] ; then
+  for branch in main $latestMinor ; do
+    if [ "$branch" != "main" ] ; then
       echo "Checkout the branch $branch"
       git checkout "$branch"
     fi

.ci/schedule-daily.groovy

@@ -20,7 +20,7 @@ pipeline {
   stages {
     stage('Nighly beats builds') {
       steps {
-        runBuilds(quietPeriodFactor: 2000, branches: ['master', '8.<minor>', '7.<minor>', '7.<next-minor>'])
+        runBuilds(quietPeriodFactor: 2000, branches: ['main', '8.<minor>', '7.<minor>', '7.<next-minor>'])
       }
     }
   }

.ci/schedule-weekly.groovy

@@ -20,7 +20,7 @@ pipeline {
   stages {
     stage('Weekly beats builds') {
       steps {
-        runBuilds(quietPeriodFactor: 1000, branches: ['master', '8.<minor>', '7.<minor>', '7.<next-minor>'])
+        runBuilds(quietPeriodFactor: 1000, branches: ['main', '8.<minor>', '7.<minor>', '7.<next-minor>'])
       }
     }
   }

.github/stale.yml

@@ -1,20 +1,21 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 335
+daysUntilStale: 365
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 30
+daysUntilClose: 180
 
 # Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
 onlyLabels: []
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels: []
+exemptLabels:
+  - flaky-test
 
 # Set to true to ignore issues in a project (defaults to false)
-exemptProjects: true
+exemptProjects: false
 
 # Set to true to ignore issues in a milestone (defaults to false)
 exemptMilestones: true
@@ -47,7 +48,7 @@ limitPerRun: 30
 
 # Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
 pulls:
-  daysUntilStale: 30
+  daysUntilStale: 60
   daysUntilClose: 30
   markComment: >
     Hi!
@@ -79,4 +80,4 @@ pulls:
 
 # issues:
 #   exemptLabels:
-#     - confirmed
+#     - confirmed

.github/workflows/elastic-agent-pull-requests.yml

@@ -0,0 +1,44 @@
+name: Add to Elastic Agent Data Plane or Control Plane Board
+on:
+  pull_request:
+    types:
+      - labeled
+jobs:
+  add_to_data_plane-project:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.label.name == 'Team:Elastic-Agent-Data-Plane'
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        with:
+          query: |
+            mutation add_to_project($projectid:String!,$contentid:String!) {
+               updatePullRequest(input: {pullRequestId:$contentid, projectIds:$projectid}) {
+                clientMutationId
+              }
+             }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.pull_request.node_id }}
+        env:
+          PROJECT_ID: "PRO_kwDOAGc3Zs4AzG8z"
+          GITHUB_TOKEN: ${{ secrets.ELASTIC_AGENT_PROJECT_BOARD_TOKEN }}
+  add_to_control_plane-project:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.label.name == 'Team:Elastic-Agent-Control-Plane'
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        with:
+          query: |
+             mutation add_to_project($projectid:String!,$contentid:String!) {
+               updatePullRequest(input: {pullRequestId:$contentid, projectIds:$projectid}) {
+                clientMutationId
+              }
+             }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.pull_request.node_id }}
+        env:
+          PROJECT_ID: "PRO_kwDOAGc3Zs4AzG9E"
+          GITHUB_TOKEN: ${{ secrets.ELASTIC_AGENT_PROJECT_BOARD_TOKEN }}

.mergify.yml

@@ -3,16 +3,16 @@ queue_rules:
     conditions:
       - check-success=beats-ci/pr-merge
 pull_request_rules:
-  - name: forward-port patches to master branch
+  - name: forward-port patches to main branch
     conditions:
       - merged
-      - label=forwardport-master
+      - label=forwardport-main
     actions:
       backport:
         assignees:
           - "{{ author }}"
         branches:
-          - "master"
+          - "main"
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
@@ -135,7 +135,7 @@ pull_request_rules:
   - name: notify the backport policy
     conditions:
       - -label~=^backport
-      - base=master
+      - base=main
       - -merged
       - -closed
     actions:
@@ -224,3 +224,16 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
+  - name: backport patches to 8.1 branch
+    conditions:
+      - merged
+      - label=backport-v8.1.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.1"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"

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/7.x..master[Check the HEAD diff]
+https://github.com/elastic/beats/compare/7.x..main[Check the HEAD diff]
 
 ==== Breaking changes
  - Replace custom Pins type for a slice of string for defining the `ca_sha256` values.

CHANGELOG-developer.next.asciidoc

@@ -14,9 +14,9 @@ Note: This changelog documents the current changes which are not yet present in
 an actual release.
 
 === Beats version HEAD
-https://github.com/elastic/beats/compare/v7.0.0-rc2..master[Check the HEAD diff]
+https://github.com/elastic/beats/compare/v7.0.0-rc2..main[Check the HEAD diff]
 
-The list below covers the major changes between 7.0.0-rc2 and master only.
+The list below covers the major changes between 7.0.0-rc2 and main only.
 
 ==== Breaking changes
 
@@ -130,6 +130,8 @@ The list below covers the major changes between 7.0.0-rc2 and master only.
 - Update Go version to 1.17.1. {pull}27543[27543]
 - Whitelist `GCP_*` environment variables in dev tools {pull}28364[28364]
 - Add support for `credentials_json` in `gcp` module, all metricsets {pull}29584[29584]
+- Add gcp firestore metricset. {pull}29918[29918]
+- Added TESTING_FILEBEAT_FILEPATTERN option for filebeat module pytests {pull}30103[30103]
 
 ==== Deprecated