Merge branch '8.17' into mergify/bp/8.17/pr-42016

elastic · Jan 7, 2025 · 8eeeb72 · 8eeeb72
2 parents b6372ac + a3c425a
commit 8eeeb72
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/check-default.yml b/.github/workflows/check-default.yml
@@ -20,6 +20,11 @@ jobs:
     - uses: actions/setup-go@v5
       with:
         go-version-file: .go-version
+    #  when using ubuntu-latest, python 3.10 is not the default version.
+    - name: Fix Code is not compatible with Python 3.12
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: Run check-default
       run: |
         go install github.com/magefile/mage

diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml
@@ -28,6 +28,11 @@ jobs:
       run: sudo apt-get install -y libsystemd-dev
     - name: Install librpm-dev
       run: sudo apt-get install -y librpm-dev
+    #  when using ubuntu-latest, python 3.10 is not the default version.
+    - name: Fix Code is not compatible with Python 3.12
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: Run check
       run: |
         make check
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -120,6 +120,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Fix awss3 document ID construction when using the CSV decoder. {pull}42019[42019]
 - Improve S3 object size metric calculation to support situations where Content-Length is not available. {pull}41755[41755]
 - Fix Netflow Template Sharing configuration handling. {pull}42080[42080]
+- Updated websocket retry error code list to allow more scenarios to be retried which could have been missed previously. {pull}42218[42218] 
 
 *Heartbeat*
 

diff --git a/libbeat/tests/system/requirements.txt b/libbeat/tests/system/requirements.txt
@@ -10,7 +10,7 @@ backports.ssl-match-hostname==3.5.0.1
 bcrypt==4.1.2
 cached-property==1.4.2
 certifi==2024.7.4
-cffi==1.16.0
+cffi==1.17.1
 chardet==3.0.4
 charset-normalizer==3.3.2
 cryptography==43.0.1
@@ -24,7 +24,7 @@ elasticsearch==7.8.1
 enum34==1.1.6
 exceptiongroup==1.2.0
 googleapis-common-protos==1.56.4
-grpcio==1.60.0
+grpcio==1.68.1
 idna==3.7
 importlib-metadata==1.7.0
 iniconfig==1.0.1

diff --git a/x-pack/filebeat/input/streaming/websocket.go b/x-pack/filebeat/input/streaming/websocket.go
@@ -176,6 +176,9 @@ func isRetryableError(err error) bool {
 			websocket.CloseInternalServerErr,
 			websocket.CloseTryAgainLater,
 			websocket.CloseServiceRestart,
+			websocket.CloseAbnormalClosure,
+			websocket.CloseMessageTooBig,
+			websocket.CloseNoStatusReceived,
 			websocket.CloseTLSHandshake:
 			return true
 		}