From 4e54faf5af5bb82fd3b8a23353f95d689696b9f5 Mon Sep 17 00:00:00 2001 From: Ajay Date: Thu, 26 Oct 2023 16:58:49 +0000 Subject: [PATCH 1/5] installation: platforms: add s390x to supported architectures Signed-off-by: Ajay --- installation/requirements.md | 4 +++- installation/supported-platforms.md | 4 +++- update-release-version-docs.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/installation/requirements.md b/installation/requirements.md index 43fddcd3f..7c10f7244 100644 --- a/installation/requirements.md +++ b/installation/requirements.md @@ -1,6 +1,6 @@ # Requirements -[Fluent Bit](http://fluentbit.io) uses very low CPU and Memory consumption, it's compatible with most of x86, x86\_64, arm32v7 and arm64v8 based platforms. In order to build it you need the following components in your system for the build process: +[Fluent Bit](http://fluentbit.io) uses very low CPU and Memory consumption, it's compatible with most of x86, x86\_64, arm32v7, arm64v8 based platforms. In order to build it you need the following components in your system for the build process: * Compiler: GCC or clang * CMake @@ -9,3 +9,5 @@ In the core there are not other dependencies, For certain features that depends on third party components like output plugins with special backend libraries \(e.g: kafka\), those are included in the main source code repository. +Fluent Bit is supported on Linux on IBM Z (s390x) environment without WASM, because building WAMR is not supported as of today on s390x and LuaJIT as well. + diff --git a/installation/supported-platforms.md b/installation/supported-platforms.md index cbe9903db..27a2ad3cb 100644 --- a/installation/supported-platforms.md +++ b/installation/supported-platforms.md @@ -14,7 +14,7 @@ The following operating systems and architectures are supported in Fluent Bit. | | [Debian 12 \(Bookworm\)](linux/debian.md) | x86\_64, Arm64v8 | | | [Debian 11 \(Bullseye\)](linux/debian.md) | x86\_64, Arm64v8 | | | [Debian 10 \(Buster\)](linux/debian.md) | x86\_64, Arm64v8 | -| | [Ubuntu 22.04 \(Jammy Jellyfish\)](linux/ubuntu.md) | x86\_64, Arm64v8 | +| | [Ubuntu 22.04 \(Jammy Jellyfish\)](linux/ubuntu.md) | x86\_64, Arm64v8, s390x | | | [Ubuntu 20.04 \(Focal Fossa\)](linux/ubuntu.md) | x86\_64, Arm64v8 | | | [Ubuntu 18.04 \(Bionic Beaver\)](linux/ubuntu.md) | x86\_64, Arm64v8 | | | [Ubuntu 16.04 \(Xenial Xerus\)](linux/ubuntu.md) | x86\_64 | @@ -29,3 +29,5 @@ From an architecture support perspective, Fluent Bit is fully functional on x86\ Fluent Bit can work also on OSX and \*BSD systems, but not all plugins will be available on all platforms. Official support will be expanding based on community demand. Fluent Bit may run on older operating systems though will need to be built from source, or use custom packages from [enterprise providers](https://fluentbit.io/enterprise). + +Fluent Bit is supported on Linux on IBM Z (s390x) environment without WASM, because building WAMR is not supported as of today on s390x and LuaJIT as well. diff --git a/update-release-version-docs.sh b/update-release-version-docs.sh index 7201c3b4b..24009c76d 100755 --- a/update-release-version-docs.sh +++ b/update-release-version-docs.sh @@ -32,8 +32,8 @@ fi if grep -q "$NEW_VERSION" "$SCRIPT_DIR"/installation/docker.md; then echo "Found $NEW_VERSION already in the Docker docs so skipping update" else - sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION | x86\_64, arm64v8, arm32v7 | Release [v$NEW_VERSION](https://fluentbit.io/announcements/v$NEW_VERSION/) |" "$SCRIPT_DIR"/installation/docker.md - sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION-debug | x86\_64, arm64v8, arm32v7 | Debug images |" "$SCRIPT_DIR"/installation/docker.md + sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION | x86\_64, arm64v8, arm32v7, s390x | Release [v$NEW_VERSION](https://fluentbit.io/announcements/v$NEW_VERSION/) |" "$SCRIPT_DIR"/installation/docker.md + sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION-debug | x86\_64, arm64v8, arm32v7, s390x | Debug images |" "$SCRIPT_DIR"/installation/docker.md fi WIN_32_EXE_HASH=${WIN_32_EXE_HASH:?} From 9b026d63084bb2b0b43e1990c06dab85045f8063 Mon Sep 17 00:00:00 2001 From: Ajay Date: Thu, 26 Oct 2023 16:58:49 +0000 Subject: [PATCH 2/5] installation: platforms: add s390x to supported architectures Signed-off-by: Ajay Signed-off-by: Ajay Victor --- installation/requirements.md | 3 ++- installation/supported-platforms.md | 4 +++- update-release-version-docs.sh | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/installation/requirements.md b/installation/requirements.md index 43fddcd3f..efaf1ada0 100644 --- a/installation/requirements.md +++ b/installation/requirements.md @@ -1,6 +1,6 @@ # Requirements -[Fluent Bit](http://fluentbit.io) uses very low CPU and Memory consumption, it's compatible with most of x86, x86\_64, arm32v7 and arm64v8 based platforms. In order to build it you need the following components in your system for the build process: +[Fluent Bit](http://fluentbit.io) uses very low CPU and Memory consumption, it's compatible with most of x86, x86\_64, arm32v7, arm64v8 based platforms. In order to build it you need the following components in your system for the build process: * Compiler: GCC or clang * CMake @@ -9,3 +9,4 @@ In the core there are not other dependencies, For certain features that depends on third party components like output plugins with special backend libraries \(e.g: kafka\), those are included in the main source code repository. +Fluent Bit is supported on Linux on IBM Z(s390x), but the WASM and LUA filter plugins are not. diff --git a/installation/supported-platforms.md b/installation/supported-platforms.md index cbe9903db..27a2ad3cb 100644 --- a/installation/supported-platforms.md +++ b/installation/supported-platforms.md @@ -14,7 +14,7 @@ The following operating systems and architectures are supported in Fluent Bit. | | [Debian 12 \(Bookworm\)](linux/debian.md) | x86\_64, Arm64v8 | | | [Debian 11 \(Bullseye\)](linux/debian.md) | x86\_64, Arm64v8 | | | [Debian 10 \(Buster\)](linux/debian.md) | x86\_64, Arm64v8 | -| | [Ubuntu 22.04 \(Jammy Jellyfish\)](linux/ubuntu.md) | x86\_64, Arm64v8 | +| | [Ubuntu 22.04 \(Jammy Jellyfish\)](linux/ubuntu.md) | x86\_64, Arm64v8, s390x | | | [Ubuntu 20.04 \(Focal Fossa\)](linux/ubuntu.md) | x86\_64, Arm64v8 | | | [Ubuntu 18.04 \(Bionic Beaver\)](linux/ubuntu.md) | x86\_64, Arm64v8 | | | [Ubuntu 16.04 \(Xenial Xerus\)](linux/ubuntu.md) | x86\_64 | @@ -29,3 +29,5 @@ From an architecture support perspective, Fluent Bit is fully functional on x86\ Fluent Bit can work also on OSX and \*BSD systems, but not all plugins will be available on all platforms. Official support will be expanding based on community demand. Fluent Bit may run on older operating systems though will need to be built from source, or use custom packages from [enterprise providers](https://fluentbit.io/enterprise). + +Fluent Bit is supported on Linux on IBM Z (s390x) environment without WASM, because building WAMR is not supported as of today on s390x and LuaJIT as well. diff --git a/update-release-version-docs.sh b/update-release-version-docs.sh index 7201c3b4b..24009c76d 100755 --- a/update-release-version-docs.sh +++ b/update-release-version-docs.sh @@ -32,8 +32,8 @@ fi if grep -q "$NEW_VERSION" "$SCRIPT_DIR"/installation/docker.md; then echo "Found $NEW_VERSION already in the Docker docs so skipping update" else - sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION | x86\_64, arm64v8, arm32v7 | Release [v$NEW_VERSION](https://fluentbit.io/announcements/v$NEW_VERSION/) |" "$SCRIPT_DIR"/installation/docker.md - sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION-debug | x86\_64, arm64v8, arm32v7 | Debug images |" "$SCRIPT_DIR"/installation/docker.md + sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION | x86\_64, arm64v8, arm32v7, s390x | Release [v$NEW_VERSION](https://fluentbit.io/announcements/v$NEW_VERSION/) |" "$SCRIPT_DIR"/installation/docker.md + sed_wrapper -i -e "/| -.*$/a | $NEW_VERSION-debug | x86\_64, arm64v8, arm32v7, s390x | Debug images |" "$SCRIPT_DIR"/installation/docker.md fi WIN_32_EXE_HASH=${WIN_32_EXE_HASH:?} From 56623c52d29b2831f3ba89445249fea6b3a6e3e7 Mon Sep 17 00:00:00 2001 From: Ajay P Victor <70255576+ajaypvictor@users.noreply.github.com> Date: Wed, 8 Nov 2023 11:22:51 +0530 Subject: [PATCH 3/5] Update installation/supported-platforms.md Co-authored-by: Pat Signed-off-by: Ajay P Victor <70255576+ajaypvictor@users.noreply.github.com> --- installation/supported-platforms.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/supported-platforms.md b/installation/supported-platforms.md index 27a2ad3cb..c50dcfb56 100644 --- a/installation/supported-platforms.md +++ b/installation/supported-platforms.md @@ -30,4 +30,4 @@ Fluent Bit can work also on OSX and \*BSD systems, but not all plugins will be a Official support will be expanding based on community demand. Fluent Bit may run on older operating systems though will need to be built from source, or use custom packages from [enterprise providers](https://fluentbit.io/enterprise). -Fluent Bit is supported on Linux on IBM Z (s390x) environment without WASM, because building WAMR is not supported as of today on s390x and LuaJIT as well. +Fluent Bit is supported on Linux on IBM Z (s390x) environment with some restrictions but only container images are provided for these targets officially. From 10ce457040ba312da0f617805aac74c195869218 Mon Sep 17 00:00:00 2001 From: Ajay Victor Date: Wed, 8 Nov 2023 11:55:09 +0530 Subject: [PATCH 4/5] installation: platforms: add s390x to supported architectures Signed-off-by: Ajay Victor --- pipeline/inputs/exec.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/inputs/exec.md b/pipeline/inputs/exec.md index c622890c1..5b3c80297 100644 --- a/pipeline/inputs/exec.md +++ b/pipeline/inputs/exec.md @@ -8,7 +8,7 @@ command arguments could lead to malicious command execution. ## Container support -This plugin will not function in the distroless production images (AMD64 currently) as it needs a functional `/bin/sh` which is not present. +This plugin will not function in the distroless production images (AMD64 and s390x currently) as it needs a functional `/bin/sh` which is not present. The debug images use the same binaries so even though they have a shell, there is no support for this plugin as it is compiled out. ## Configuration Parameters From 66eab69c5a3967349a03dd69dc8a9cc1b714e611 Mon Sep 17 00:00:00 2001 From: Ajay Victor Date: Thu, 9 Nov 2023 05:29:23 +0530 Subject: [PATCH 5/5] incorporate review comments Signed-off-by: Ajay Victor --- installation/supported-platforms.md | 2 +- pipeline/inputs/exec.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/supported-platforms.md b/installation/supported-platforms.md index c50dcfb56..778edbb6a 100644 --- a/installation/supported-platforms.md +++ b/installation/supported-platforms.md @@ -14,7 +14,7 @@ The following operating systems and architectures are supported in Fluent Bit. | | [Debian 12 \(Bookworm\)](linux/debian.md) | x86\_64, Arm64v8 | | | [Debian 11 \(Bullseye\)](linux/debian.md) | x86\_64, Arm64v8 | | | [Debian 10 \(Buster\)](linux/debian.md) | x86\_64, Arm64v8 | -| | [Ubuntu 22.04 \(Jammy Jellyfish\)](linux/ubuntu.md) | x86\_64, Arm64v8, s390x | +| | [Ubuntu 22.04 \(Jammy Jellyfish\)](linux/ubuntu.md) | x86\_64, Arm64v8 | | | [Ubuntu 20.04 \(Focal Fossa\)](linux/ubuntu.md) | x86\_64, Arm64v8 | | | [Ubuntu 18.04 \(Bionic Beaver\)](linux/ubuntu.md) | x86\_64, Arm64v8 | | | [Ubuntu 16.04 \(Xenial Xerus\)](linux/ubuntu.md) | x86\_64 | diff --git a/pipeline/inputs/exec.md b/pipeline/inputs/exec.md index 5b3c80297..63d2edb54 100644 --- a/pipeline/inputs/exec.md +++ b/pipeline/inputs/exec.md @@ -8,7 +8,7 @@ command arguments could lead to malicious command execution. ## Container support -This plugin will not function in the distroless production images (AMD64 and s390x currently) as it needs a functional `/bin/sh` which is not present. +This plugin will not function in all the distroless production images as it needs a functional `/bin/sh` which is not present. The debug images use the same binaries so even though they have a shell, there is no support for this plugin as it is compiled out. ## Configuration Parameters