[v2] Merge main as of Nov 7

.ci/Jenkinsfile

@@ -10,8 +10,8 @@ pipeline {
     DOCKER_COMPOSE_VERSION = '1.25.5'
     JOB_GIT_CREDENTIALS = "f6c7695a-671e-4f4f-a331-acdce44ff9ba"
     PIPELINE_LOG_LEVEL='INFO'
-    JOB_GCS_BUCKET = 'beats-ci-artifacts'
-    JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin-file-credentials'
+    JOB_GCS_BUCKET = 'fleet-ci-artifacts'
+    JOB_GCS_CREDENTIALS = 'fleet-ci-gcs-plugin-file-credentials'
   }
   options {
     timeout(time: 1, unit: 'HOURS')
@@ -139,7 +139,7 @@ pipeline {
       options { skipDefaultCheckout() }
       when { expression { isBranch() } }
       steps {
-        build(job: "Ingest-manager/fleet-server-package-mbp/${env.JOB_BASE_NAME}",
+        build(job: "fleet-server/fleet-server-package-mbp/${env.JOB_BASE_NAME}",
               propagate: false,
               wait: false,
               parameters: [string(name: 'COMMIT', value: "${env.GIT_BASE_COMMIT}")])

.ci/jobs/defaults.yml

@@ -3,7 +3,7 @@
 ##### GLOBAL METADATA
 
 - meta:
-    cluster: beats-ci
+    cluster: fleet-ci
 
 ##### JOB DEFAULTS
 
@@ -15,4 +15,4 @@
     publishers:
       - email:
           recipients: [email protected]
-    prune-dead-branches: true
+    prune-dead-branches: true

.ci/jobs/fleet-server-package-mbp.yml

@@ -1,6 +1,6 @@
 ---
 - job:
-    name: Ingest-manager/fleet-server-package-mbp
+    name: fleet-server/fleet-server-package-mbp
     display-name: Fleet Server Package
     description: Jenkins pipeline for the Elastic Fleet Server package process
     project-type: multibranch
@@ -53,4 +53,4 @@
           reference-repo: /var/lib/jenkins/.git-references/fleet-server.git
         timeout: '15'
         use-author: true
-        wipe-workspace: 'True'
+        wipe-workspace: true

.ci/jobs/fleet-server.yml

@@ -1,6 +1,6 @@
 ---
 - job:
-    name: Ingest-manager/fleet-server
+    name: fleet-server/fleet-server-mbp
     display-name: Fleet Server
     description: Jenkins pipeline for the Elastic Fleet Server project
     view: Beats

.ci/jobs/folders.yml

@@ -1,10 +1,10 @@
 ---
 #https://docs.openstack.org/infra/jenkins-job-builder/project_folder.html
 - job:
-    name: Ingest-manager
-    description: Ingest manager related Jobs
+    name: fleet-server
+    description: Fleet Server related Jobs
     project-type: folder
 
 - view:
-    name: Ingest-manager
-    view-type: list
+    name: fleet-server
+    view-type: list

.ci/packaging.groovy

@@ -9,7 +9,7 @@ pipeline {
     SLACK_CHANNEL = '#elastic-agent-control-plane'
     NOTIFY_TO = '[email protected]'
     JOB_GCS_BUCKET = credentials('gcs-bucket')
-    JOB_GCS_CREDENTIALS = 'beats-ci-gcs-plugin'
+    JOB_GCS_CREDENTIALS = 'fleet-ci-gcs-plugin'
     DOCKER_SECRET = 'secret/observability-team/ci/docker-registry/prod'
     DOCKER_REGISTRY = 'docker.elastic.co'
     DRA_OUTPUT = 'release-manager.out'
@@ -133,7 +133,7 @@ pipeline {
             }
           }
         }
-        stage('DRA Staging') {
+        stage('DRA Release Staging') {
           options { skipDefaultCheckout() }
           when {
             allOf {

.github/workflows/add-issues-to-ingest-board.yml

@@ -0,0 +1,51 @@
+name: Add issue to Platform Ingest project
+
+on:
+  issues:
+    types:
+      - labeled
+
+env:
+  INGEST_PROJECT_ID: 'PVT_kwDOAGc3Zs4AEzn4'
+  FLEET_LABEL: 'Team:Fleet'
+  AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AEzn4zgEgZSo'
+  FLEET_SERVER_OPTION_ID: 'ea828bb4'
+
+jobs:
+  add_to_ingest_project:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/[email protected]
+        id: add_to_project
+        if: ${{ github.event.label.name == env.FLEET_LABEL }}
+        with:
+          query: |
+            # Variables have to be snake cased because of https://github.com/octokit/graphql-action/issues/164
+            mutation AddToIngestProject($project_id: ID!, $content_id: ID!) {
+              addProjectV2ItemById(input: { projectId: $project_id, contentId: $content_id }) {
+                  item {
+                    id
+                  }
+                }
+              }
+          project_id: ${{ env.INGEST_PROJECT_ID }}
+          content_id: ${{ github.event.issue.node_id }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
+      - uses: octokit/[email protected]
+        id: set_fleet_server_area
+        if: github.event.label.name == env.FLEET_LABEL
+        with:
+          query: |
+            mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
+              updateProjectV2ItemFieldValue(
+                input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
+                  clientMutationId
+                }
+              }
+          item_id: ${{ fromJSON(steps.add_to_project.outputs.data).addProjectV2ItemById.item.id }}
+          project_id: ${{ env.INGEST_PROJECT_ID }}
+          area_field_id: ${{ env.AREA_FIELD_ID }}
+          area_id: ${{ env.FLEET_SERVER_OPTION_ID }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}

.go-version

@@ -1 +1 @@
-1.18.5
+1.18.7

.mergify.yml

@@ -144,3 +144,16 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"
+  - name: backport patches to 8.5 branch
+    conditions:
+      - merged
+      - label=backport-v8.5.0
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.5"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}](backport #{{ number }}) {{ title }}"

CHANGELOG.next.asciidoc

@@ -1,8 +1,22 @@
+==== Breaking Changes
+
+- Upgrade to Go 1.18. Certificates signed with SHA-1 are now rejected. See the Go 1.18 https://tip.golang.org/doc/go1.18#sha1[release notes] for details. {pull}1709[1709]
+
 ==== Bugfixes
 
 - Return a better error on enrolling and the Elasticsearch version is incompatible. {pull}1211[1211]
 - Give a grace period when starting the unenroll monitor. {issue}1500[1500]
 - Fixes a race condition between the unenroller goroutine and the main goroutine for the coordinator monitor. {issues}1738[1738]
+- Remove events from agent checkin body. {issue}1774[1774]
+- Improve authc debug logging. {pull}1870[1870]
+- Add error detail to catch-all HTTP error response. {pull}1854[1854]
+- Fix issue were errors where being ignored written to elasticsearch. {pull}1896[1896]
+- Update apikey.cache_hit log field name to match convention. {pull}1900[1900]
+- LoadServerLimits will not overwrite specified limits when loading default/agent number specified values. {issue}1841[1841] {pull}1912[1912]
+- Use seperate rate limiters for internal and external API listeners. {issue}1859[1859] {pull}1904[1904]
+- Fix fleet.migration.total log key overlap {pull}1951[1951]
+- Remove POLICY_CHANGE actions from list retrieved from actions index before sending actions to agent on Checkin. {issue}1773[1773] {pull}1963[1963]
+- Add "active: true" filter to enrollemnent key queries. {issue}2029[2029] {pull}2044[2044]
 
 ==== New Features
 
@@ -12,4 +26,6 @@
 - Add start_time and minimum_execution_duration to actions to allow fleet-server to schedule agent actions. {pull}1381[1381]
 - Fleet Server now allows setting global labels on APM instrumentation. {pull}1649[1649]
 - Fleet Server now allows setting transaction sample rate on APM instrumentation {pull}1681[1681]
-- Log redacted config when config updates. {issue}1626[1626] {pull}1668[1668]
+- Log redacted config when config updates. {issue}1626[1626] {pull}1668[1668]
+- Storing checkin message in last_checkin_message {pull}1932[1932]
+- Allow upgrade actions to signal that they will be retried. {pull}1887[1887]