Skip to content

Commit 2eea069

Browse files
Merge pull request #302 from kube-logging/6.2.1-docs
6.2.1 docs
2 parents 878c37f + 8e7699e commit 2eea069

File tree

7 files changed

+163
-4
lines changed

7 files changed

+163
-4
lines changed
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: Publish version 6.2
2+
3+
env:
4+
doc_versionnumber: "6.2"
5+
6+
on:
7+
push:
8+
branches:
9+
- release-6.2
10+
workflow_dispatch:
11+
12+
jobs:
13+
build:
14+
name: Build
15+
runs-on: ubuntu-latest
16+
17+
permissions:
18+
contents: write
19+
pages: write
20+
id-token: write
21+
22+
concurrency:
23+
group: "pages"
24+
cancel-in-progress: false
25+
26+
environment:
27+
name: github-pages-test
28+
url: ${{ steps.deployment.outputs.page_url }}
29+
30+
steps:
31+
- name: Checkout code
32+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
33+
with:
34+
ref: release-6.2
35+
submodules: 'recursive'
36+
37+
- name: Set up Pages
38+
id: pages
39+
uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
40+
41+
- name: Set up Hugo
42+
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
43+
with:
44+
hugo-version: '0.110.0'
45+
extended: true
46+
47+
- name: Set up Node
48+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
49+
with:
50+
node-version: 18
51+
52+
- name: Install dependencies
53+
run: |
54+
cd themes/docsy
55+
npm install
56+
57+
- name: Set up PostCSS
58+
run: npm install --save-dev autoprefixer postcss-cli postcss
59+
60+
- name: Build
61+
run: hugo --environment production --baseURL ${{ steps.pages.outputs.base_url }}/${{ env.doc_versionnumber }}/
62+
63+
# - name: Upload artifact
64+
# uses: actions/upload-pages-artifact@64bcae551a7b18bcb9a09042ddf1960979799187 # v1.0.8
65+
# with:
66+
# path: ./public/
67+
68+
- name: Checkout code to update
69+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
70+
with:
71+
ref: 'gh-pages-test'
72+
path: 'tmp/gh-pages'
73+
# - name: Display file structure
74+
# run: ls -R
75+
- name: Copy built site to GH pages
76+
run: |
77+
rm -rf tmp/gh-pages/${{ env.doc_versionnumber }}
78+
mkdir -p tmp/gh-pages/${{ env.doc_versionnumber }}
79+
mv public/* tmp/gh-pages/${{ env.doc_versionnumber }}
80+
- name: Commit & Push changes
81+
uses: actions-js/push@master
82+
with:
83+
github_token: ${{ secrets.GITHUB_TOKEN }}
84+
message: 'Publish updated docs for ${{ env.doc_versionnumber }}, ${{ github.event.repository.pushed_at}}'
85+
branch: 'gh-pages-test'
86+
directory: 'tmp/gh-pages'

config/_default/config.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ weight = 1
6565
# Used in the "version-banner" partial to display a version number for the
6666
# current doc set.
6767

68-
version = "6.1"
68+
version = "6.2"
6969
version_menu = "Releases"
7070
version_menu_canonicallinks = true
7171
version_menu_pagelinks = true
@@ -162,16 +162,20 @@ weight = 1
162162

163163
[params.social]
164164
# Used as twitter:site in page metadata
165-
twitter = "AxoflowIO"
165+
#twitter = "AxoflowIO"
166166

167167
########################
168168
# Release versions
169169
#######################
170170
# Add your release versions here
171171
[[params.versions]]
172-
version = "latest (6.1)"
172+
version = "latest (6.2)"
173173
githubbranch = "master"
174174
url = ""
175+
[[params.versions]]
176+
version = "6.1"
177+
githubbranch = "release-6.1"
178+
url = "/6.1/"
175179
[[params.versions]]
176180
version = "6.0"
177181
githubbranch = "release-6.0"

content/docs/configuration/crds/v1beta1/fluentd_types.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ Fluentd port inside the container (24240 by default). The headless service port
168168
### serviceAccount (*typeoverride.ServiceAccount, optional) {#fluentdspec-serviceaccount}
169169

170170

171+
### service (*typeoverride.Service, optional) {#fluentdspec-service}
172+
173+
171174
### sidecarContainers ([]corev1.Container, optional) {#fluentdspec-sidecarcontainers}
172175

173176
Available in Logging operator version 4.5 and later. Configure sidecar container in Fluentd pods, for example: [https://github.com/kube-logging/logging-operator/config/samples/logging_logging_fluentd_sidecars.yaml](https://github.com/kube-logging/logging-operator/config/samples/logging_logging_fluentd_sidecars.yaml).
@@ -229,7 +232,7 @@ ExtraVolume defines the fluentd extra volumes
229232

230233
## FluentdScaling
231234

232-
FluentdScaling enables configuring the scaling behaviour of the fluentd statefulset
235+
FluentdScaling enables configuring the scaling behavior of the fluentd statefulset
233236

234237
### drain (FluentdDrainConfig, optional) {#fluentdscaling-drain}
235238

content/docs/configuration/crds/v1beta1/output_types.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ OutputSpec defines the desired state of Output
7777
### opensearch (*output.OpenSearchOutput, optional) {#outputspec-opensearch}
7878

7979

80+
### rabbitmq (*output.RabbitMQOutputConfig, optional) {#outputspec-rabbitmq}
81+
82+
8083
### redis (*output.RedisOutputConfig, optional) {#outputspec-redis}
8184

8285

content/docs/configuration/plugins/syslog-ng-outputs/s3.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ Enable or disable compression.
6868

6969
Default: false
7070

71+
### content_type (string, optional) {#s3output-content_type}
72+
73+
Available in Logging operator version 6.2 and later.
74+
75+
The content-type of the HTTP request. Defaults to `application/octet-stream`.
76+
7177
### disk_buffer (*DiskBuffer, optional) {#s3output-disk_buffer}
7278

7379
This option enables putting outgoing messages into the disk buffer of the destination to avoid message loss in case of a system failure on the destination side. For details, see the [Syslog-ng DiskBuffer options](../disk_buffer/).
@@ -80,6 +86,17 @@ Set the number of seconds for flush period.
8086

8187
Default: 60
8288

89+
### kms_key (string, optional) {#s3output-kms_key}
90+
91+
Available in Logging operator version 6.2 and later.
92+
93+
The kms-key used for server-side encryption. The value of the `kms_key` parameter must be one of the following:
94+
95+
- The ID of a key.
96+
- An alias of a key. In that case, make sure to add the alias/prefix, for example: `kms_key: "alias/log-archive"`
97+
- The ARN of a key.
98+
99+
83100
### log-fifo-size (int, optional) {#s3output-log-fifo-size}
84101

85102
The number of messages that the output queue can store.
@@ -122,11 +139,25 @@ Set the region option.
122139
The number of times syslog-ng OSE attempts to send a message to this destination. If syslog-ng OSE could not send a message, it will try again until the number of attempts reaches retries, then drops the message.
123140

124141

142+
### role (string, optional) {#s3output-role}
143+
144+
Available in Logging operator version 6.2 and later.
145+
146+
The role for the S3 server.
147+
148+
125149
### secret_key (*secret.Secret, optional) {#s3output-secret_key}
126150

127151
The secret_key for the S3 server.
128152

129153

154+
### server_side_encryption (string, optional) {#s3output-server_side_encryption}
155+
156+
Available in Logging operator version 6.2 and later.
157+
158+
You can use the server-side-encryption() and kms-key() options to configure encryption. Currently only `server-side-encryption("aws:kms")` is supported.
159+
160+
130161
### storage_class (string, optional) {#s3output-storage_class}
131162

132163
Set the storage_class option.

content/docs/image-versions.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,33 @@ weight: 750
55

66
Logging operator uses the following image versions.
77

8+
## Logging operator version 6.2.1
9+
10+
| Image repository | GitHub repository | Version |
11+
| -------- | --- | -- |
12+
| ghcr.io/kube-logging/logging-operator/node-exporter | https://github.com/kube-logging/logging-operator/tree/master/images/node-exporter | 6.2.1 |
13+
| ghcr.io/kube-logging/logging-operator/config-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/config-reloader | 6.2.1 |
14+
| ghcr.io/kube-logging/logging-operator/fluentd-drain-watch | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd-drain-watch | 6.2.1 |
15+
| ghcr.io/kube-logging/logging-operator/fluentd | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd | 6.2.1-full |
16+
| ghcr.io/kube-logging/logging-operator/syslog-ng-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/syslog-ng-reloader | 6.2.1 |
17+
18+
## Logging operator version 6.2.0
19+
20+
| Image repository | GitHub repository | Version |
21+
| -------- | --- | -- |
22+
| ghcr.io/kube-logging/logging-operator/node-exporter | https://github.com/kube-logging/logging-operator/tree/master/images/node-exporter | 6.2.0 |
23+
| ghcr.io/kube-logging/logging-operator/config-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/config-reloader | 6.2.0 |
24+
| ghcr.io/kube-logging/logging-operator/fluentd-drain-watch | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd-drain-watch | 6.2.0 |
25+
| registry.k8s.io/pause | https://github.com/kubernetes/registry.k8s.io | 3.9 |
26+
| docker.io/library/busybox | https://github.com/docker-library/busybox | latest |
27+
| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.20.0 |
28+
| ghcr.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 4.2.0 |
29+
| ghcr.io/kube-logging/logging-operator/fluentd | https://github.com/kube-logging/logging-operator/tree/master/images/fluentd | 6.2.0-full |
30+
| ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.14 |
31+
| ghcr.io/kube-logging/logging-operator/syslog-ng-reloader | https://github.com/kube-logging/logging-operator/tree/master/images/syslog-ng-reloader | 6.2.0 |
32+
| ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | 0.4.0 |
33+
| rubygems.org/gems/fluentd/versions/ | | 1.19.1 |
34+
835
## Logging operator version 6.1
936

1037
| Image repository | GitHub repository | Version |

content/docs/whats-new/_index.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ title: What's new
33
weight: 50
44
---
55

6+
## Version 6.2
7+
8+
- Logging operator now uses a custom Elasticsearch gem that supports older Elasticsearch major versions besides the latest (version 9).
9+
- Added additional paths to performance profiling (pprof).
10+
611
## Version 6.1
712

813
- New Fluentd output to send logs into {{% xref "/docs/configuration/plugins/outputs/rabbitmq.md" %}}.

0 commit comments

Comments
 (0)