Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
86 changes: 86 additions & 0 deletions .github/workflows/publish-version-6.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: Publish version 6.0

env:
doc_versionnumber: "6.0"

on:
push:
branches:
- release-6.0
workflow_dispatch:

jobs:
build:
name: Build
runs-on: ubuntu-latest

permissions:
contents: write
pages: write
id-token: write

concurrency:
group: "pages"
cancel-in-progress: false

environment:
name: github-pages-test
url: ${{ steps.deployment.outputs.page_url }}

steps:
- name: Checkout code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: release-6.0
submodules: 'recursive'

- name: Set up Pages
id: pages
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0

- name: Set up Hugo
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
with:
hugo-version: '0.110.0'
extended: true

- name: Set up Node
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
with:
node-version: 18

- name: Install dependencies
run: |
cd themes/docsy
npm install

- name: Set up PostCSS
run: npm install --save-dev autoprefixer postcss-cli postcss

- name: Build
run: hugo --environment production --baseURL ${{ steps.pages.outputs.base_url }}/${{ env.doc_versionnumber }}/

# - name: Upload artifact
# uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187 # v1.0.8
# with:
# path: ./public/

- name: Checkout code to update
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: 'gh-pages-test'
path: 'tmp/gh-pages'
# - name: Display file structure
# run: ls -R
- name: Copy built site to GH pages
run: |
rm -rf tmp/gh-pages/${{ env.doc_versionnumber }}
mkdir -p tmp/gh-pages/${{ env.doc_versionnumber }}
mv public/* tmp/gh-pages/${{ env.doc_versionnumber }}
- name: Commit & Push changes
uses: actions-js/push@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
message: 'Publish updated docs for ${{ env.doc_versionnumber }}, ${{ github.event.repository.pushed_at}}'
branch: 'gh-pages-test'
directory: 'tmp/gh-pages'
6 changes: 5 additions & 1 deletion config/_default/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,13 @@ twitter = "AxoflowIO"
#######################
# Add your release versions here
[[params.versions]]
version = "latest (5.4)"
version = "latest (6.0)"
githubbranch = "master"
url = ""
[[params.versions]]
version = "5.4"
githubbranch = "release-5.4"
url = "/5.4/"
[[params.versions]]
version = "5.3"
githubbranch = "release-5.3"
Expand Down
1 change: 0 additions & 1 deletion content/docs/configuration/crds/v1beta1/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ For more information please click on the name
| **[FluentdSpec](fluentd_types/)** | FluentdSpec defines the desired state of Fluentd | v1beta1 |
| **[Logging](logging_types/)** | Logging system configuration | v1beta1 |
| **[LoggingRouteSpec](loggingroute_types/)** | LoggingRouteSpec defines the desired state of LoggingRoute | v1beta1 |
| **[NodeAgent](node_agent_types/)** | | v1beta1 |
| **[OutputSpec](output_types/)** | OutputSpec defines the desired state of Output | v1beta1 |
| **[SyslogNGClusterFlow](syslogng_clusterflow_types/)** | SyslogNGClusterFlow is the Schema for the syslog-ng clusterflows API | v1beta1 |
| **[SyslogNGClusterOutput](syslogng_clusteroutput_types/)** | SyslogNGClusterOutput is the Schema for the syslog-ng clusteroutputs API | v1beta1 |
Expand Down
4 changes: 2 additions & 2 deletions content/docs/configuration/crds/v1beta1/fluentbit_types.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ Default: 1

### forceHotReloadAfterGrace (bool, optional) {#fluentbitspec-forcehotreloadaftergrace}

HotReload pauses all inputs and waits until they finish. In certain situations this is unacceptable, for example if an output is down for a longer time. An undocumented option called "Hot_Reload.Ensure_Thread_Safety Off" can be used at the [SERVICE] config to force hotreload after the grace period. Please note that it might result in a SIGSEGV, but worst case kubelet will restart the container. See https://github.com/fluent/fluent-bit/pull/7509
HotReload pauses all inputs and waits until they finish. In certain situations this is unacceptable, for example, if an output is down for a longer time. An undocumented option called "Hot_Reload.Ensure_Thread_Safety Off" can be used at the [SERVICE] config to force hotreload after the grace period. Note that it might result in a SIGSEGV, but worst case kubelet will restart the container. See https://github.com/fluent/fluent-bit/pull/7509


### forwardOptions (*ForwardOptions, optional) {#fluentbitspec-forwardoptions}
Expand Down Expand Up @@ -609,7 +609,7 @@ Default: Off

### storage.pause_on_chunks_overlimit (string, optional) {#inputtail-storage.pause_on_chunks_overlimit}

Specifies whether to pause or drop data when the buffer is full. This helps to make sure we apply backpressure on the input if enabled, see https://docs.fluentbit.io/manual/administration/backpressure
Specifies whether to pause or drop data when the buffer is full. This helps to make sure we apply backpressure on the input if enabled, see https://docs.fluentbit.io/manual/administration/backpressure

Default: on

Expand Down
8 changes: 1 addition & 7 deletions content/docs/configuration/crds/v1beta1/logging_types.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ Override generated config. This is a *raw* configuration string for troubleshoot

### fluentbit (*FluentbitSpec, optional) {#loggingspec-fluentbit}

FluentbitAgent daemonset configuration. Deprecated, will be removed with next major version Migrate to the standalone NodeAgent resource

FluentbitAgent daemonset configuration. Deprecated, migrate to [FluentbitAgent]({{< relref "/docs/configuration/crds/v1beta1/fluentbit_types.md" >}}), or to the [Telemetry Controller](https://github.com/kube-logging/telemetry-controller)

### fluentd (*FluentdSpec, optional) {#loggingspec-fluentd}

Expand All @@ -83,11 +82,6 @@ Global filters to apply on logs before any match or filter mechanism.
Reference to the logging system. Each of the `loggingRef`s can manage a fluentbit daemonset and a fluentd statefulset.


### nodeAgents ([]*InlineNodeAgent, optional) {#loggingspec-nodeagents}

InlineNodeAgent Configuration Deprecated, will be removed with next major version


### routeConfig (*RouteConfig, optional) {#loggingspec-routeconfig}

RouteConfig determines whether to use loggingRoutes or to create resources based on the logging resource that can be managed by the Telemetry Controller.
Expand Down
188 changes: 0 additions & 188 deletions content/docs/configuration/crds/v1beta1/node_agent_types.md

This file was deleted.

17 changes: 17 additions & 0 deletions content/docs/image-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,23 @@ weight: 750

Logging operator uses the following image versions.

## Logging operator version 6.0

| Image repository | GitHub repository | Version |
| -------- | --- | -- |
| ghcr.io/kube-logging/logging-operator/node-exporter | https://github.com/kube-logging/logging-operator/tree/master/images/node-exporter | 6.0.0 |
| ghcr.io/kube-logging/logging-operator/config-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/config-reloader | 6.0.0 |
| ghcr.io/kube-logging/logging-operator/fluentd-drain-watch | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd-drain-watch | 6.0.0 |
| registry.k8s.io/pause | https://github.com/kubernetes/registry.k8s.io | 3.9 |
| docker.io/library/busybox | https://github.com/docker-library/busybox | latest |
| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.13.0 |
| ghcr.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 4.0.3 |
| ghcr.io/kube-logging/logging-operator/fluentd | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd | 6.0.0-full |
| ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.9 |
| ghcr.io/kube-logging/logging-operator/syslog-ng-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/syslog-ng-reloader | 6.0.0 |
| ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | 0.4.0 |
| rubygems.org/gems/fluentd/versions/ | | 1.18.0 |

## Logging operator version 5.4

| Image repository | GitHub repository | Version |
Expand Down
1 change: 0 additions & 1 deletion content/docs/install/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ To verify that the installation was successful, complete the following steps.
fluentbitagents.logging.banzaicloud.io 2023-08-10T12:05:04Z
hosttailers.logging-extensions.banzaicloud.io 2023-08-10T12:05:04Z
loggings.logging.banzaicloud.io 2023-08-10T12:05:05Z
nodeagents.logging.banzaicloud.io 2023-08-10T12:05:05Z
outputs.logging.banzaicloud.io 2023-08-10T12:05:05Z
syslogngclusterflows.logging.banzaicloud.io 2023-08-10T12:05:05Z
syslogngclusteroutputs.logging.banzaicloud.io 2023-08-10T12:05:05Z
Expand Down
Loading