Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

installation: platforms: add s390x to supported architectures #1245

Merged
merged 6 commits into from
Nov 9, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion installation/requirements.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
4 changes: 3 additions & 1 deletion installation/supported-platforms.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this true? We do not seem to explicitly do anything to provide any DEBs for s390x which is what this table is showing - actual packages are built and provided officially from our repos. Not that it can be but that it is.

The only changes in the linked PR are to build images, not packages, so want to confirm. If we want to build it via the normal ./packaging/build.sh -d <distro> then how do we do that?

I would extend the statement about container images being provided with something along the lines of "it is possible to build for Ubuntu 22.04 as well".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed..

| | [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 |
Expand All @@ -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 with some restrictions but only container images are provided for these targets officially.
2 changes: 1 addition & 1 deletion pipeline/inputs/exec.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs updating, all production images are distroless so this was out of date for a while. No container images support this plugin other than the debug ones.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated..

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
Expand Down
4 changes: 2 additions & 2 deletions update-release-version-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:?}
Expand Down