Merge branch 'main' into feat/checkin-policy-details

michel-laterman · web-flow · commit 020e9b162549 · 2025-09-18T15:36:17.000-07:00
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -297,16 +297,20 @@ steps:
           PLATFORMS: "linux/amd64"
           TF_VAR_pull_request: "${BUILDKITE_PULL_REQUEST}"
           FIPS: "true"
-          EC_ENDPOINT: "https://api.staging.elastic-gov.com"
-          TF_VAR_ess_region: "us-gov-east-1"
-          TF_VAR_deployment_template_id: "aws-general-purpose"
+          # PR #5536 redirects Cloud e2e test to prod as new deployments are not able to start on FRH-staging
+          # The following env vars should be uncommented once FRH-staging is fixed
+          #EC_ENDPOINT: "https://api.staging.elastic-gov.com"
+          #TF_VAR_ess_region: "us-gov-east-1"
+          #TF_VAR_deployment_template_id: "aws-general-purpose"
         command: ".buildkite/scripts/cloud_e2e_test.sh"
         agents:
           provider: "gcp"
         plugins:
           - *docker_elastic_login_plugin
           - elastic/vault-secrets#v0.1.0:
-              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
+              path: "kv/ci-shared/platform-ingest/platform-ingest-ec-prod"
+              # Use the commented path below instead of the one above when FRH-staging is fixed.
+              #path: "kv/ci-shared/platform-ingest/platform-ingest-ec-staging-gov"
               field: "apiKey"
               env_var: "EC_API_KEY"
         depends_on:
diff --git a/NOTICE-fips.txt b/NOTICE-fips.txt
@@ -2335,11 +2335,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 
 --------------------------------------------------------------------------------
 Dependency : github.com/mailru/easyjson
-Version: v0.9.0
+Version: v0.9.1
 Licence type (autodetected): MIT
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/mailru/easyjson@v0.9.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/mailru/easyjson@v0.9.1/LICENSE:
 
 Copyright (c) 2016 Mail.Ru Group
 
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -2335,11 +2335,11 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
 
 --------------------------------------------------------------------------------
 Dependency : github.com/mailru/easyjson
-Version: v0.9.0
+Version: v0.9.1
 Licence type (autodetected): MIT
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/mailru/easyjson@v0.9.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/mailru/easyjson@v0.9.1/LICENSE:
 
 Copyright (c) 2016 Mail.Ru Group
 
diff --git a/changelog/9.0.7.yaml b/changelog/9.0.7.yaml
@@ -0,0 +1,47 @@
+version: 9.0.7
+entries:
+    - kind: bug-fix
+      summary: Reset trace links on bulk items when returning to pool
+      description: ""
+      component: fleet-server
+      pr:
+        - https://github.com/elastic/fleet-server/pull/5317
+      issue: []
+      impact: ""
+      action: ""
+      timestamp: 1755810145
+      file:
+        name: 1755810145-Reset-trace-headers-on-bulk-items-when-returning-to-pool.yaml
+        checksum: e95e0e1b1ea66a2c365ba00d6bd7e9def2b07ace
+    - kind: bug-fix
+      summary: Restore connection limiter
+      description: |
+        Restore connection level limiter to prevent OOM incidents.
+        This limiter is used in addition to the request-level throttle so that once
+        our in-flight requests reaches max_connections a 429 is returned, but if the
+        total connections the server uses is over max_connections*1.1 the server drops
+        the connection before the TLS handshake.
+      component: fleet-server
+      pr:
+        - https://github.com/elastic/fleet-server/pull/5372
+      issue: []
+      impact: ""
+      action: ""
+      timestamp: 1756409821
+      file:
+        name: 1756409821-Restore-connection-limiter.yaml
+        checksum: 7ae8e8521ecea4ac5d8944328b4ffcc51c1a609b
+    - kind: bug-fix
+      summary: Build fleet-server as fully static binary to restore OS matrix compatibility
+      description: ""
+      component: fleet-server
+      pr:
+        - https://github.com/elastic/fleet-server/pull/5392
+      issue:
+        - https://github.com/elastic/fleet-server/issues/5262
+      impact: ""
+      action: ""
+      timestamp: 1756940128
+      file:
+        name: 1756940128-fix-binary-compilation.yaml
+        checksum: 7d4f89d7775d01ca5c63dd022364a5eec262cae0
diff --git a/changelog/9.1.4.yaml b/changelog/9.1.4.yaml
@@ -0,0 +1,47 @@
+version: 9.1.4
+entries:
+    - kind: bug-fix
+      summary: Reset trace links on bulk items when returning to pool
+      description: ""
+      component: fleet-server
+      pr:
+        - https://github.com/elastic/fleet-server/pull/5317
+      issue: []
+      impact: ""
+      action: ""
+      timestamp: 1755810145
+      file:
+        name: 1755810145-Reset-trace-headers-on-bulk-items-when-returning-to-pool.yaml
+        checksum: e95e0e1b1ea66a2c365ba00d6bd7e9def2b07ace
+    - kind: bug-fix
+      summary: Restore connection limiter
+      description: |
+        Restore connection level limiter to prevent OOM incidents.
+        This limiter is used in addition to the request-level throttle so that once
+        our in-flight requests reaches max_connections a 429 is returned, but if the
+        total connections the server uses is over max_connections*1.1 the server drops
+        the connection before the TLS handshake.
+      component: fleet-server
+      pr:
+        - https://github.com/elastic/fleet-server/pull/5372
+      issue: []
+      impact: ""
+      action: ""
+      timestamp: 1756409821
+      file:
+        name: 1756409821-Restore-connection-limiter.yaml
+        checksum: 7ae8e8521ecea4ac5d8944328b4ffcc51c1a609b
+    - kind: bug-fix
+      summary: Build fleet-server as fully static binary to restore OS matrix compatibility
+      description: ""
+      component: fleet-server
+      pr:
+        - https://github.com/elastic/fleet-server/pull/5392
+      issue:
+        - https://github.com/elastic/fleet-server/issues/5262
+      impact: ""
+      action: ""
+      timestamp: 1756940128
+      file:
+        name: 1756940128-fix-binary-compilation.yaml
+        checksum: 7d4f89d7775d01ca5c63dd022364a5eec262cae0
diff --git a/changelog/fragments/1755810145-Reset-trace-headers-on-bulk-items-when-returning-to-pool.yaml b/changelog/fragments/1755810145-Reset-trace-headers-on-bulk-items-when-returning-to-pool.yaml
diff --git a/changelog/fragments/1756409821-Restore-connection-limiter.yaml b/changelog/fragments/1756409821-Restore-connection-limiter.yaml
diff --git a/changelog/fragments/1756940128-fix-binary-compilation.yaml b/changelog/fragments/1756940128-fix-binary-compilation.yaml
diff --git a/docs/release-notes/_snippets/9.0.7/breaking.md b/docs/release-notes/_snippets/9.0.7/breaking.md
@@ -0,0 +1,3 @@
+## 9.0.7 [fleet-server-9.0.7-breaking-changes]
+
+_No breaking changes._
diff --git a/docs/release-notes/_snippets/9.0.7/deprecations.md b/docs/release-notes/_snippets/9.0.7/deprecations.md
@@ -0,0 +1,3 @@
+## 9.0.7 [fleet-server-9.0.7-deprecations]
+
+_No deprecations._
diff --git a/docs/release-notes/_snippets/9.0.7/index.md b/docs/release-notes/_snippets/9.0.7/index.md
@@ -0,0 +1,18 @@
+## 9.0.7 [fleet-server-release-notes-9.0.7]
+
+
+
+
+### Fixes [fleet-server-9.0.7-fixes]
+
+* Reset trace links on bulk items when returning to pool. [#5317](https://github.com/elastic/fleet-server/pull/5317)
+* Restore connection limiter. [#5372](https://github.com/elastic/fleet-server/pull/5372)
+
+  Restore connection level limiter to prevent OOM incidents.
+  This limiter is used in addition to the request-level throttle so that once
+  our in-flight requests reaches max_connections a 429 is returned, but if the
+  total connections the server uses is over max_connections*1.1 the server drops
+  the connection before the TLS handshake.
+
+* Build fleet-server as fully static binary to restore OS matrix compatibility. [#5392](https://github.com/elastic/fleet-server/pull/5392) [#5262](https://github.com/elastic/fleet-server/issues/5262)
+
diff --git a/docs/release-notes/_snippets/9.1.4/breaking.md b/docs/release-notes/_snippets/9.1.4/breaking.md
@@ -0,0 +1,3 @@
+## 9.1.4 [fleet-server-9.1.4-breaking-changes]
+
+_No breaking changes._
diff --git a/docs/release-notes/_snippets/9.1.4/deprecations.md b/docs/release-notes/_snippets/9.1.4/deprecations.md
@@ -0,0 +1,3 @@
+## 9.1.4 [fleet-server-9.1.4-deprecations]
+
+_No deprecations._
diff --git a/docs/release-notes/_snippets/9.1.4/index.md b/docs/release-notes/_snippets/9.1.4/index.md
@@ -0,0 +1,18 @@
+## 9.1.4 [fleet-server-release-notes-9.1.4]
+
+
+
+
+### Fixes [fleet-server-9.1.4-fixes]
+
+* Reset trace links on bulk items when returning to pool. [#5317](https://github.com/elastic/fleet-server/pull/5317)
+* Restore connection limiter. [#5372](https://github.com/elastic/fleet-server/pull/5372)
+
+  Restore connection level limiter to prevent OOM incidents.
+  This limiter is used in addition to the request-level throttle so that when
+  our in-flight requests reaches max_connections, a 429 is returned. If the
+  total connections the server uses is over max_connections*1.1 the server drops
+  the connection before the TLS handshake.
+
+* Build fleet-server as fully static binary to restore OS matrix compatibility. [#5392](https://github.com/elastic/fleet-server/pull/5392) [#5262](https://github.com/elastic/fleet-server/issues/5262)
+
diff --git a/docs/release-notes/_snippets/breaking-changes.md b/docs/release-notes/_snippets/breaking-changes.md
@@ -1,3 +1,6 @@
+:::{include} /release-notes/_snippets/9.1.4/breaking.md
+:::
+
 :::{include} /release-notes/_snippets/9.1.3/breaking.md
 :::
 
@@ -10,6 +13,9 @@
 :::{include} /release-notes/_snippets/9.1.0/breaking.md
 :::
 
+:::{include} /release-notes/_snippets/9.0.7/breaking.md
+:::
+
 :::{include} /release-notes/_snippets/9.0.6/breaking.md
 :::
 
diff --git a/docs/release-notes/_snippets/deprecations.md b/docs/release-notes/_snippets/deprecations.md
@@ -1,3 +1,6 @@
+:::{include} /release-notes/_snippets/9.1.4/deprecations.md
+:::
+
 :::{include} /release-notes/_snippets/9.1.3/deprecations.md
 :::
 
@@ -10,6 +13,9 @@
 :::{include} /release-notes/_snippets/9.1.0/deprecations.md
 :::
 
+:::{include} /release-notes/_snippets/9.0.7/deprecations.md
+:::
+
 :::{include} /release-notes/_snippets/9.0.6/deprecations.md
 :::
 
diff --git a/docs/release-notes/_snippets/index.md b/docs/release-notes/_snippets/index.md
@@ -1,3 +1,6 @@
+:::{include} /release-notes/_snippets/9.1.4/index.md
+:::
+
 :::{include} /release-notes/_snippets/9.1.3/index.md
 :::
 
@@ -10,6 +13,9 @@
 :::{include} /release-notes/_snippets/9.1.0/index.md
 :::
 
+:::{include} /release-notes/_snippets/9.0.7/index.md
+:::
+
 :::{include} /release-notes/_snippets/9.0.6/index.md
 :::
 
diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/hashicorp/go-version v1.7.0
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/magefile/mage v1.15.0
-	github.com/mailru/easyjson v0.9.0
+	github.com/mailru/easyjson v0.9.1
 	github.com/miolini/datacounter v1.0.3
 	github.com/oapi-codegen/runtime v1.1.2
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
diff --git a/go.sum b/go.sum
@@ -111,8 +111,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
 github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/mailru/easyjson v0.9.1 h1:LbtsOm5WAswyWbvTEOqhypdPeZzHavpZx96/n553mR8=
+github.com/mailru/easyjson v0.9.1/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+## 9.0.7 [fleet-server-9.0.7-breaking-changes]`
	`2`	`+`
	`3`	`+_No breaking changes._`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+## 9.0.7 [fleet-server-9.0.7-deprecations]`
	`2`	`+`
	`3`	`+_No deprecations._`