Skip to content

Commit 0a4aa73

Browse files
authored
Merge pull request #2072 from fluent/lynettemiles/sc-148185/ensure-all-fluent-bit-install-docs-follow
2 parents 6a56d7d + 724c18b commit 0a4aa73

File tree

7 files changed

+29
-157
lines changed

7 files changed

+29
-157
lines changed

installation/downloads/linux.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Fluent Bit is available for a variety of Linux distributions and embedded Linux
44

55
The most secure option is to create the repositories according to the instructions for your specific OS.
66

7+
## Single line install
8+
79
An installation script is provided for use with most Linux targets. This will by default install the most recent version released.
810

911
```bash

installation/downloads/linux/alma-rocky.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@ Fluent Bit supports the following architectures:
88
- `aarch64`
99
- `arm64v8`
1010

11-
## Single line install
12-
13-
Fluent Bit provides an installation script to use for most Linux targets. This will always install the most recently released version.
14-
15-
```shell
16-
curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh
17-
```
18-
19-
This is a convenience helper and should always be validated prior to use. Older versions of this install script won't support auto-detecting Rocky or Alma Linux. The recommended secure deployment approach is to use the following instructions:
20-
2111
## RHEL 9
2212

2313
From CentOS 9 Stream and later, the CentOS dependencies will update more often than
@@ -74,4 +64,6 @@ $ systemctl status fluent-bit
7464
...
7565
```
7666

77-
The default Fluent Bit configuration collect metrics of CPU usage and sends the records to the standard output. You can see the outgoing data in your `/var/log/messages` file.
67+
The default Fluent Bit configuration collect metrics of CPU usage and sends the
68+
records to the standard output. You can see the outgoing data in your
69+
`/var/log/messages` file.

installation/downloads/linux/amazon-linux.md

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@ Fluent Bit is distributed as the `fluent-bit` package and is available for the l
99

1010
Amazon Linux 2022 is no longer supported.
1111

12-
## Single line install
13-
14-
Fluent Bit provides an installation script to use for most Linux targets. This will always install the most recently released version.
15-
16-
```shell
17-
curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh
18-
```
19-
20-
This is a convenience helper and should always be validated prior to use. The recommended secure deployment approach is to use the following instructions:
12+
The recommended secure deployment approach is to use the following instructions:
2113

2214
## Configure YUM
2315

@@ -47,29 +39,9 @@ The `fluent-bit` is provided through a Yum repository. To add the repository ref
4739

4840
You should always enable `gpgcheck` for security reasons. All Fluent Bit packages are signed.
4941

50-
### Updated key from March 2022
51-
52-
For the 1.9.0 and 1.8.15 and later releases, the [GPG key has been updated](https://packages.fluentbit.io/fluentbit.key). Ensure this new one is added.
53-
54-
The GPG Key fingerprint of the new key is:
55-
56-
```text
57-
C3C0 A285 34B9 293E AF51 FABD 9F9D DC08 3888 C1CD
58-
Fluentbit releases (Releases signing key) <[email protected]>
59-
```
60-
61-
The previous key is [still available](https://packages.fluentbit.io/fluentbit-legacy.key) and might be required to install previous versions.
62-
63-
The GPG Key fingerprint of the old key is:
64-
65-
```text
66-
F209 D876 2A60 CD49 E680 633B 4FF8 368B 6EA0 722A
67-
```
68-
69-
Refer to the [supported platform documentation](../supported-platforms.md) to see which platforms are supported in each release.
70-
7142
### Install
7243

44+
1. Ensure your [GPG key](../linux.md#gpg-key-updates) is up to date.
7345
1. After your repository is configured, run the following command to install it:
7446

7547
```shell
@@ -96,4 +68,4 @@ $ systemctl status fluent-bit
9668
...
9769
```
9870

99-
The default Fluent Bit configuration collect metrics of CPU usage and sends the records to the standard output. You can see the outgoing data in your `/var/log/messages` file.
71+
The default Fluent Bit configuration collect metrics of CPU usage and sends the records to the standard output. You can see the outgoing data in your `/var/log/messages` file.

installation/downloads/linux/debian.md

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,7 @@ The following architectures are supported
88
- `aarch64`
99
- `arm64v8`
1010

11-
## Single line install
12-
13-
Fluent Bit provides an installation script to use for most Linux targets. This will always install the most recently released version.
14-
15-
```shell
16-
curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh
17-
```
18-
19-
This is a convenience helper and should always be validated prior to use. The recommended secure deployment approach is to use the following instructions:
11+
The recommended secure deployment approach is to use the following instructions:
2012

2113
## Server GPG key
2214

@@ -28,27 +20,6 @@ Follow the official [Debian wiki guidance](https://wiki.debian.org/DebianReposit
2820
sudo sh -c 'curl https://packages.fluentbit.io/fluentbit.key | gpg --dearmor > /usr/share/keyrings/fluentbit-keyring.gpg'
2921
```
3022

31-
### Updated key from March 2022
32-
33-
For the 1.9.0 and 1.8.15 and later releases, the [GPG key has been updated](https://packages.fluentbit.io/fluentbit.key). Ensure this new one is added.
34-
35-
The GPG Key fingerprint of the new key is:
36-
37-
```text
38-
C3C0 A285 34B9 293E AF51 FABD 9F9D DC08 3888 C1CD
39-
Fluentbit releases (Releases signing key) <[email protected]>
40-
```
41-
42-
The previous key is [still available](https://packages.fluentbit.io/fluentbit-legacy.key) and might be required to install previous versions.
43-
44-
The GPG Key fingerprint of the old key is:
45-
46-
```text
47-
F209 D876 2A60 CD49 E680 633B 4FF8 368B 6EA0 722A
48-
```
49-
50-
Refer to the [supported platform documentation](../supported-platforms.md) to see which platforms are supported in each release.
51-
5223
## Update your sources lists
5324

5425
For Debian, you must add the Fluent Bit APT server entry to your sources lists.
@@ -80,6 +51,8 @@ Fluent Bit recommends upgrading your system (`sudo apt-get upgrade`). This could
8051

8152
## Install Fluent Bit
8253

54+
1. Ensure your [GPG key](../linux.md#gpg-key-updates) is up to date.
55+
8356
1. Use the following `apt-get` command to install the latest Fluent Bit:
8457

8558
```shell
@@ -109,4 +82,6 @@ $ sudo service fluent-bit status
10982
...
11083
```
11184

112-
The default Fluent Bit configuration collect metrics of CPU usage and sends the records to the standard output. You can see the outgoing data in your `/var/log/messages` file.
85+
The default Fluent Bit configuration collect metrics of CPU usage and sends the
86+
records to the standard output. You can see the outgoing data in your
87+
`/var/log/messages` file.

installation/downloads/linux/raspbian-raspberry-pi.md

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,6 @@ The first step is to add the Fluent Bit server GPG key to your keyring so you ca
1414
sudo sh -c 'curl https://packages.fluentbit.io/fluentbit.key | sudo apt-key add - '
1515
```
1616

17-
### Updated key from March 2022
18-
19-
For the 1.9.0 and 1.8.15 and later releases, the [GPG key has been updated](https://packages.fluentbit.io/fluentbit.key). Ensure this new one is added.
20-
21-
The GPG Key fingerprint of the new key is:
22-
23-
```text
24-
C3C0 A285 34B9 293E AF51 FABD 9F9D DC08 3888 C1CD
25-
Fluentbit releases (Releases signing key) <[email protected]>
26-
```
27-
28-
The previous key is [still available](https://packages.fluentbit.io/fluentbit-legacy.key) and might be required to install previous versions.
29-
30-
The GPG Key fingerprint of the old key is:
31-
32-
```text
33-
F209 D876 2A60 CD49 E680 633B 4FF8 368B 6EA0 722A
34-
```
35-
36-
Refer to the [supported platform documentation](./../supported-platforms.md) to see which platforms are supported in each release.
37-
3817
## Update your sources lists
3918

4019
On Debian and derivative systems such as Raspbian, you need to add the Fluent Bit APT server entry to your sources lists.
@@ -75,6 +54,8 @@ Fluent Bit recommends upgrading your system (`sudo apt-get upgrade`) to avoid po
7554

7655
## Install Fluent Bit
7756

57+
1. Ensure your [GPG key](../linux.md#gpg-key-updates) is up to date.
58+
7859
1. Use the following `apt-get` command to install the latest Fluent Bit:
7960

8061
```shell
@@ -104,4 +85,6 @@ $ sudo service fluent-bit status
10485
...
10586
```
10687

107-
The default configuration of Fluent Bit collects metrics for CPU usage and sends the records to the standard output. You can see the outgoing data in your `/var/log/syslog` file.
88+
The default configuration of Fluent Bit collects metrics for CPU usage and sends the
89+
records to the standard output. You can see the outgoing data in your
90+
`/var/log/syslog` file.

installation/downloads/linux/redhat-centos.md

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,7 @@ Fluent Bit supports the following architectures:
1010

1111
For CentOS 9 and later, Fluent Bit uses [CentOS Stream](https://www.centos.org/centos-stream/) as the canonical base system.
1212

13-
## Single line install
14-
15-
Fluent Bit provides an installation script to use for most Linux targets. This will always install the most recently released version.
16-
17-
```shell
18-
curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh
19-
```
20-
21-
This is a convenience helper and should always be validated prior to use. The recommended secure deployment approach is to use the following instructions:
13+
The recommended secure deployment approach is to use the following instructions:
2214

2315
## CentOS 8
2416

@@ -60,29 +52,10 @@ The`fluent-bit` package is provided through a Yum repository. To add the reposit
6052

6153
1. As a best practice, enable `gpgcheck` and `repo_gpgcheck` for security reasons. Fluent Bit signs its repository metadata and all Fluent Bit packages.
6254

63-
### Updated key from March 2022
64-
65-
For the 1.9.0 and 1.8.15 and later releases, the [GPG key has been updated](https://packages.fluentbit.io/fluentbit.key). Ensure this new one is added.
66-
67-
The GPG Key fingerprint of the new key is:
68-
69-
```text
70-
C3C0 A285 34B9 293E AF51 FABD 9F9D DC08 3888 C1CD
71-
Fluentbit releases (Releases signing key) <[email protected]>
72-
```
73-
74-
The previous key is [still available](https://packages.fluentbit.io/fluentbit-legacy.key) and might be required to install previous versions.
75-
76-
The GPG Key fingerprint of the old key is:
77-
78-
```text
79-
F209 D876 2A60 CD49 E680 633B 4FF8 368B 6EA0 722A
80-
```
81-
82-
Refer to the [supported platform documentation](../supported-platforms.md) to see which platforms are supported in each release.
83-
8455
### Install
8556

57+
1. Ensure your [GPG key](../linux.md#gpg-key-updates) is up to date.
58+
8659
1. After your repository is configured, run the following command to install it:
8760

8861
```shell

installation/downloads/linux/ubuntu.md

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,18 @@
22

33
Fluent Bit is distributed as the `fluent-bit` package and is available for long-term support releases of Ubuntu. The latest officially supported version is Noble Numbat (24.04).
44

5-
## Single line install
6-
7-
An installation script is provided for most Linux targets. This will always install the most recent version released.
8-
9-
```shell
10-
curl https://raw.githubusercontent.com/fluent/fluent-bit/master/install.sh | sh
11-
```
12-
13-
This is purely a convenience helper and should always be validated prior to use. The recommended secure deployment approach is to use the following instructions.
5+
The recommended secure deployment approach is to use the following instructions.
146

157
## Server GPG key
168

17-
The first step is to add the Fluent Bit server GPG key to your keyring to ensure you can get the correct signed packages.
9+
Add the Fluent Bit server GPG key to your keyring to ensure you can get the correct signed packages.
1810

1911
Follow the official [Debian wiki guidance](https://wiki.debian.org/DebianRepository/UseThirdParty#OpenPGP_Key_distribution).
2012

2113
```shell
2214
sudo sh -c 'curl https://packages.fluentbit.io/fluentbit.key | gpg --dearmor > /usr/share/keyrings/fluentbit-keyring.gpg'
2315
```
2416

25-
### Updated key from March 2022
26-
27-
For releases 1.9.0 and 1.8.15 and later, the [GPG key has been updated](https://packages.fluentbit.io/fluentbit.key). Ensure the new key is added.
28-
29-
The GPG Key fingerprint of the new key is:
30-
31-
```text
32-
C3C0 A285 34B9 293E AF51 FABD 9F9D DC08 3888 C1CD
33-
Fluentbit releases (Releases signing key) <[email protected]>
34-
```
35-
36-
The previous key is [still available](https://packages.fluentbit.io/fluentbit-legacy.key) and might be required to install previous versions.
37-
38-
The GPG Key fingerprint of the old key is:
39-
40-
```text
41-
F209 D876 2A60 CD49 E680 633B 4FF8 368B 6EA0 722A
42-
```
43-
44-
Refer to the [supported platform documentation](../supported-platforms.md) to see which platforms are supported in each release.
45-
4617
## Update your sources lists
4718

4819
On Ubuntu, you need to add the Fluent Bit APT server entry to your sources lists.
@@ -80,6 +51,8 @@ If you receive the error `Certificate verification failed`, check if the package
8051

8152
## Install Fluent Bit
8253

54+
1. Ensure your [GPG key](../linux.md#gpg-key-updates) is up to date.
55+
8356
1. Use the following `apt-get` command to install the latest Fluent Bit:
8457

8558
```shell
@@ -109,4 +82,6 @@ $ systemctl status fluent-bit
10982
...
11083
```
11184

112-
The default configuration of `fluent-bit` is collecting metrics of CPU usage and sending the records to the standard output. You can see the outgoing data in your `/var/log/syslog` file.
85+
The default configuration of `fluent-bit` is collecting metrics of CPU usage and
86+
sending the records to the standard output. You can see the outgoing data in your
87+
`/var/log/syslog` file.

0 commit comments

Comments
 (0)