From 402b54948cc25dd2e34934e6651e99199efa9863 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 17 Jan 2025 15:32:49 +0900 Subject: [PATCH 1/4] Grouping content about migration under "Appendix" Also update redirect configuration. Signed-off-by: Kentaro Hayashi --- .gitbook.yaml | 8 ++++---- SUMMARY.md | 7 ++++--- {quickstart => appendix}/fluent-package-v5-vs-td-agent.md | 0 {quickstart => appendix}/td-agent-v2-vs-v3-vs-v4.md | 0 {quickstart => appendix}/update-from-v0.12.md | 0 5 files changed, 8 insertions(+), 7 deletions(-) rename {quickstart => appendix}/fluent-package-v5-vs-td-agent.md (100%) rename {quickstart => appendix}/td-agent-v2-vs-v3-vs-v4.md (100%) rename {quickstart => appendix}/update-from-v0.12.md (100%) diff --git a/.gitbook.yaml b/.gitbook.yaml index 0d1380ea..f1257edb 100644 --- a/.gitbook.yaml +++ b/.gitbook.yaml @@ -9,13 +9,13 @@ redirects: # Overview v1.0/articles/support: overview/support.md - v1.0/articles/update-from-v0.12: overview/update-from-v0.12.md + v1.0/articles/update-from-v0.12: appendix/update-from-v0.12.md v1.0/articles/life-of-a-fluentd-event: overview/life-of-a-fluentd-event.md v1.0/articles/logo: overview/logo.md v1.0/articles/faq: overview/faq.md - v1.0/articles/td-agent-v2-vs-v3: overview/td-agent-v2-vs-v3-vs-v4.md - v1.0/articles/fluent-package-v5-vs-td-agent-v4: overview/fluent-package-v5-vs-td-agent.md - quickstart/td-agent-v2-vs-v3: overview/td-agent-v2-vs-v3-vs-v4.md + v1.0/articles/td-agent-v2-vs-v3: appendix/td-agent-v2-vs-v3-vs-v4.md + v1.0/articles/fluent-package-v5-vs-td-agent-v4: appendix/fluent-package-v5-vs-td-agent.md + quickstart/td-agent-v2-vs-v3: appendix/td-agent-v2-vs-v3-vs-v4.md # Install v1.0/articles/install-by-dmg: install/install-by-dmg.md diff --git a/SUMMARY.md b/SUMMARY.md index 482989d4..9b2509ab 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -3,12 +3,9 @@ * [Introduction](README.md) * [Overview](quickstart/README.md) * [Life of a Fluentd event](quickstart/life-of-a-fluentd-event.md) - * [Update from v0.12 to v1](quickstart/update-from-v0.12.md) * [Support](quickstart/support.md) * [FAQ](quickstart/faq.md) * [Logo](quickstart/logo.md) - * [td-agent v2 vs v3 vs v4](quickstart/td-agent-v2-vs-v3-vs-v4.md) - * [fluent-package v5 vs td-agent v4](quickstart/fluent-package-v5-vs-td-agent.md) * [Installation](installation/README.md) * [Before Installation](installation/before-install.md) * [Install by RPM Package \(Red Hat Linux\)](installation/install-by-rpm.md) @@ -197,4 +194,8 @@ * [Plugin Helper: Http Server](plugin-helper-overview/api-plugin-helper-http_server.md) * [Plugin Helper: Service Discovery](plugin-helper-overview/api-plugin-helper-service_discovery.md) * [Troubleshooting Guide](troubleshooting-guide.md) +* [Appendix](appendix/README.md) + * [Update from v0.12 to v1](appendix/update-from-v0.12.md) + * [td-agent v2 vs v3 vs v4](appendix/td-agent-v2-vs-v3-vs-v4.md) + * [fluent-package v5 vs td-agent v4](appendix/fluent-package-v5-vs-td-agent.md) diff --git a/quickstart/fluent-package-v5-vs-td-agent.md b/appendix/fluent-package-v5-vs-td-agent.md similarity index 100% rename from quickstart/fluent-package-v5-vs-td-agent.md rename to appendix/fluent-package-v5-vs-td-agent.md diff --git a/quickstart/td-agent-v2-vs-v3-vs-v4.md b/appendix/td-agent-v2-vs-v3-vs-v4.md similarity index 100% rename from quickstart/td-agent-v2-vs-v3-vs-v4.md rename to appendix/td-agent-v2-vs-v3-vs-v4.md diff --git a/quickstart/update-from-v0.12.md b/appendix/update-from-v0.12.md similarity index 100% rename from quickstart/update-from-v0.12.md rename to appendix/update-from-v0.12.md From 8cf680367202665131f4088a01c492c9c42c73a6 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 17 Jan 2025 16:10:27 +0900 Subject: [PATCH 2/4] Add warning and fix links Signed-off-by: Kentaro Hayashi --- appendix/fluent-package-v5-vs-td-agent.md | 4 ++++ appendix/td-agent-v2-vs-v3-vs-v4.md | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/appendix/fluent-package-v5-vs-td-agent.md b/appendix/fluent-package-v5-vs-td-agent.md index da00cc62..5bc1d1ef 100644 --- a/appendix/fluent-package-v5-vs-td-agent.md +++ b/appendix/fluent-package-v5-vs-td-agent.md @@ -1,5 +1,9 @@ # fluent-package v5 vs td-agent v4 +{% hint style='danger' %} +The series of td-agent had already reached End of Life (EOL). td-agent should not be newly installed because no support, no new release and no security updates anymore. +{% endhint %} + ## Supported Platforms [Fluentd Project](https://www.fluentd.org) maintains stable packages for Fluentd and canonical plugins as Fluent Package \(the package is called `fluent-package`\) diff --git a/appendix/td-agent-v2-vs-v3-vs-v4.md b/appendix/td-agent-v2-vs-v3-vs-v4.md index 42cc6d37..367a4c87 100644 --- a/appendix/td-agent-v2-vs-v3-vs-v4.md +++ b/appendix/td-agent-v2-vs-v3-vs-v4.md @@ -1,5 +1,9 @@ # td-agent v2 vs v3 vs v4 +{% hint style='danger' %} +The series of td-agent had already reached End of Life (EOL). td-agent should not be newly installed because no support, no new release and no security updates anymore. +{% endhint %} + ## Supported Platforms [ClearCode, Inc.](https://www.clear-code.com) maintains stable packages for Fluentd and canonical plugins as Treasure Agent \(the package is called `td-agent`\). `td-agent` has v2, v3 and v4. [Chronosphere](https://chronosphere.io/) (formerly Calyptia) maintains stable packages as Calyptia-fluentd as another option. Supported OS is the same as td-agent v4 currently. @@ -49,10 +53,10 @@ This is for v0.12 and old distribution users. We don't recommend this version fo ## How to Install -* [Ubuntu/Debian](../installation/install-by-deb.md) -* [RedHat/CentOS](../installation/install-by-rpm.md) -* [Windows](../installation/install-by-msi.md) -* [macOS](../installation/install-by-dmg.md) +* [Ubuntu/Debian](../installation/install-by-deb-td-agent-v4.md) +* [RedHat/CentOS](../installation/install-by-rpm-td-agent-v4.md) +* [Windows](../installation/install-by-msi-td-agent-v4.md) +* [macOS](../installation/install-by-dmg-td-agent-v4.md) * [RubyGems](../installation/install-by-gem.md) If this article is incorrect or outdated, or omits critical information, please [let us know](https://github.com/fluent/fluentd-docs-gitbook/issues?state=open). [Fluentd](http://www.fluentd.org/) is an open-source project under [Cloud Native Computing Foundation \(CNCF\)](https://cncf.io/). All components are available under under [the Apache License 2.0.](https://www.apache.org/licenses/LICENSE-2.0) From d2ed7fd7a79f2d24cc808995f654016ee025fd38 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 17 Jan 2025 16:15:13 +0900 Subject: [PATCH 3/4] Bump ruby runtime version NOTE: v1.18.0 still points to ruby 2.7. In a sooner or later, it will be bumped up to 3.2 in v1.19.0. Signed-off-by: Kentaro Hayashi --- installation/install-by-gem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/install-by-gem.md b/installation/install-by-gem.md index 3f210299..87d5b18a 100644 --- a/installation/install-by-gem.md +++ b/installation/install-by-gem.md @@ -8,7 +8,7 @@ Please follow the [Pre-installation Guide](before-install.md) to configure your ## Step 1: Install Ruby Interpreter -Install Ruby `>= 2.4` on your local environment. In addition, install `ruby-dev` package via Package Manager to build native extension gems. +Install Ruby `>= 2.7` on your local environment. In addition, install `ruby-dev` package via Package Manager to build native extension gems. ## Step 2: Install Fluentd Gem From 268d36877f65c68d0b37fd09bb2bed111b7d22a6 Mon Sep 17 00:00:00 2001 From: Kentaro Hayashi Date: Fri, 17 Jan 2025 18:20:47 +0900 Subject: [PATCH 4/4] Keep fluent package vs td-agent comparison again Signed-off-by: Kentaro Hayashi --- .gitbook.yaml | 2 +- SUMMARY.md | 2 +- {appendix => quickstart}/fluent-package-v5-vs-td-agent.md | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename {appendix => quickstart}/fluent-package-v5-vs-td-agent.md (94%) diff --git a/.gitbook.yaml b/.gitbook.yaml index f1257edb..cffbe24f 100644 --- a/.gitbook.yaml +++ b/.gitbook.yaml @@ -14,7 +14,7 @@ redirects: v1.0/articles/logo: overview/logo.md v1.0/articles/faq: overview/faq.md v1.0/articles/td-agent-v2-vs-v3: appendix/td-agent-v2-vs-v3-vs-v4.md - v1.0/articles/fluent-package-v5-vs-td-agent-v4: appendix/fluent-package-v5-vs-td-agent.md + v1.0/articles/fluent-package-v5-vs-td-agent-v4: quickstart/fluent-package-v5-vs-td-agent.md quickstart/td-agent-v2-vs-v3: appendix/td-agent-v2-vs-v3-vs-v4.md # Install diff --git a/SUMMARY.md b/SUMMARY.md index 9b2509ab..e4d7c904 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -6,6 +6,7 @@ * [Support](quickstart/support.md) * [FAQ](quickstart/faq.md) * [Logo](quickstart/logo.md) + * [fluent-package v5 vs td-agent v4](quickstart/fluent-package-v5-vs-td-agent.md) * [Installation](installation/README.md) * [Before Installation](installation/before-install.md) * [Install by RPM Package \(Red Hat Linux\)](installation/install-by-rpm.md) @@ -197,5 +198,4 @@ * [Appendix](appendix/README.md) * [Update from v0.12 to v1](appendix/update-from-v0.12.md) * [td-agent v2 vs v3 vs v4](appendix/td-agent-v2-vs-v3-vs-v4.md) - * [fluent-package v5 vs td-agent v4](appendix/fluent-package-v5-vs-td-agent.md) diff --git a/appendix/fluent-package-v5-vs-td-agent.md b/quickstart/fluent-package-v5-vs-td-agent.md similarity index 94% rename from appendix/fluent-package-v5-vs-td-agent.md rename to quickstart/fluent-package-v5-vs-td-agent.md index 5bc1d1ef..a555f742 100644 --- a/appendix/fluent-package-v5-vs-td-agent.md +++ b/quickstart/fluent-package-v5-vs-td-agent.md @@ -1,7 +1,8 @@ # fluent-package v5 vs td-agent v4 {% hint style='danger' %} -The series of td-agent had already reached End of Life (EOL). td-agent should not be newly installed because no support, no new release and no security updates anymore. +The series of td-agent had already reached End of Life (EOL). td-agent should not be newly installed because of no support, no new release and no security updates anymore. +Use fluent-package instead! {% endhint %} ## Supported Platforms