Skip to content

Commit f1cc547

Browse files
Merge pull request #246 from kube-logging/4.8-doc-preparations
Docs for 4.8 release
2 parents 4587240 + 1c2d027 commit f1cc547

File tree

7 files changed

+194
-3
lines changed

7 files changed

+194
-3
lines changed
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: Publish version 4.7
2+
3+
env:
4+
doc_versionnumber: "4.7"
5+
6+
on:
7+
push:
8+
branches:
9+
- release-4.7
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
33+
with:
34+
ref: release-4.7
35+
submodules: 'recursive'
36+
37+
- name: Set up Pages
38+
id: pages
39+
uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0
40+
41+
- name: Set up Hugo
42+
uses: peaceiris/actions-hugo@16361eb4acea8698b220b76c0d4e84e1fd22c61d # v2.6.0
43+
with:
44+
hugo-version: '0.110.0'
45+
extended: true
46+
47+
- name: Set up Node
48+
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
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 = "4.7.0"
68+
version = "4.8.0"
6969
version_menu = "Releases"
7070
version_menu_canonicallinks = true
7171
version_menu_pagelinks = true
@@ -169,9 +169,13 @@ twitter = "AxoflowIO"
169169
#######################
170170
# Add your release versions here
171171
[[params.versions]]
172-
version = "latest (4.7.0)"
172+
version = "latest (4.8.0)"
173173
githubbranch = "master"
174174
url = ""
175+
[[params.versions]]
176+
version = "4.7"
177+
githubbranch = "release-4.7"
178+
url = "/4.7/"
175179
[[params.versions]]
176180
version = "4.6"
177181
githubbranch = "release-4.6"
@@ -200,7 +204,7 @@ twitter = "AxoflowIO"
200204
# Cascade version number to every doc page (needed to create sections for pagefind search)
201205
# Update this parameter when creating a new version
202206
[[cascade]]
203-
body_attribute = 'data-pagefind-filter="section:4.7"'
207+
body_attribute = 'data-pagefind-filter="section:4.8"'
204208
[cascade._target]
205209
path = '/docs/**'
206210

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ Name of the logging cluster to be attached
4343
### labels (map[string]string, optional) {#clusterselect-labels}
4444

4545

46+
### namespace_labels (map[string]string, optional) {#clusterselect-namespace_labels}
47+
48+
4649
### namespaces ([]string, optional) {#clusterselect-namespaces}
4750

4851

@@ -58,6 +61,9 @@ Name of the logging cluster to be attached
5861
### labels (map[string]string, optional) {#clusterexclude-labels}
5962

6063

64+
### namespace_labels (map[string]string, optional) {#clusterexclude-namespace_labels}
65+
66+
6167
### namespaces ([]string, optional) {#clusterexclude-namespaces}
6268

6369

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ Deprecated
7272
### labels (map[string]string, optional) {#exclude-labels}
7373

7474

75+
### namespace_labels (map[string]string, optional) {#exclude-namespace_labels}
76+
77+
7578

7679
## Filter
7780

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,11 @@ Default: iso8601
281281
282282
Default: ts
283283
284+
### Retry_Limit (string, optional) {#fluentbittcpoutput-retry_limit}
285+
286+
Available in Logging operator version 4.8 and later.
287+
288+
284289
### Workers (*int, optional) {#fluentbittcpoutput-workers}
285290
286291
Available in Logging operator version 4.4 and later.

content/docs/image-versions.md

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

66
Logging operator uses the following image versions.
77

8+
## Logging operator version 4.8
9+
10+
| Image repository | GitHub repository | Version |
11+
| -------- | --- | -- |
12+
| ghcr.io/kube-logging/node-exporter | https://github.com/kube-logging/node-exporter-image | v0.7.1 |
13+
| ghcr.io/kube-logging/config-reloader | https://github.com/kube-logging/config-reloader | v0.0.5 |
14+
| ghcr.io/kube-logging/fluentd-drain-watch | https://github.com/kube-logging/fluentd-drain-watch | v0.2.1 |
15+
| k8s.gcr.io/pause | | 3.2 |
16+
| docker.io/busybox | https://github.com/docker-library/busybox | latest |
17+
| ghcr.io/axoflow/axosyslog | https://github.com/axoflow/axosyslog/ | 4.7.1 |
18+
| docker.io/fluent/fluent-bit | https://github.com/fluent/fluent-bit | 3.0.4 |
19+
| ghcr.io/kube-logging/fluentd | https://github.com/kube-logging/fluentd-images | v1.16-4.8-full |
20+
| ghcr.io/axoflow/axosyslog-metrics-exporter | https://github.com/axoflow/axosyslog-metrics-exporter | 0.0.2 |
21+
| ghcr.io/kube-logging/syslogng-reload | https://github.com/kube-logging/syslogng-reload-image | v1.3.1 |
22+
| ghcr.io/kube-logging/eventrouter | https://github.com/kube-logging/eventrouter | 0.4.0 |
23+
824
## Logging operator version 4.7
925

1026
| Image repository | GitHub repository | Version |

content/docs/whats-new/_index.md

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

6+
## Version 4.8
7+
8+
The following are the highlights and main changes of Logging operator 4.8. For a complete list of changes and bugfixes, see the [Logging operator 4.8 releases page](https://github.com/kube-logging/logging-operator/releases/tag/4.8.0)<!-- and the [Logging operator 4.8 release blog post](https://axoflow.com/logging-operator-4.8-release-announcement)-->.
9+
10+
### Routing based on namespace labels
11+
12+
In your Fluentd ClusterFlows you can now route your messages based on namespace labels.
13+
14+
> Note: This feature requires a new fluentd image: `ghcr.io/kube-logging/fluentd:v1.16-4.8-full`. If you're using a custom Fluentd image, make sure to update it!
15+
16+
If you have [enabled namespace labeling in Fluent Bit](https://kube-logging.dev/docs/whats-new/#kubernetes-namespace-labels-and-annotations), you can use namespace labels in your selectors, for example:
17+
18+
```yaml
19+
apiVersion: logging.banzaicloud.io/v1beta1
20+
kind: ClusterFlow
21+
metadata:
22+
name: dev-logs
23+
spec:
24+
match:
25+
- select:
26+
namespace_labels:
27+
tenant: dev
28+
globalOutputRefs:
29+
- example
30+
```
31+
32+
### Breaking change
33+
34+
If you're using `hostTailer` or `eventTailer` and configured it through the helm chart's `logging.hostTailer` or `logging.eventTailer` option, note that now both components have an `enabled` flag. Set this flag to true if you used any of these components from the chart. For details, see the [pull request](https://github.com/kube-logging/logging-operator/pull/1576).
35+
36+
### Go templates in metrics-probe label values
37+
38+
You can now use go templates that resolve to destination information (`name`, `namespace`, `scope:local/global` and the `logging` name) in metrics-probe label values. For example:
39+
40+
```yaml
41+
apiVersion: logging.banzaicloud.io/v1beta1
42+
kind: SyslogNGClusterFlow
43+
metadata:
44+
name: all
45+
spec:
46+
match: {}
47+
outputMetrics:
48+
- key: custom_output
49+
labels:
50+
flow: all
51+
# define your own label for output name
52+
my-key-for-the-output: "{{ .Destination.Name }}"
53+
# do not add the output_name label to the metric
54+
output_name: ""
55+
globalOutputRefs:
56+
- http
57+
```
58+
59+
### Other changes
60+
61+
- You can set the maximal number of TCP connections Fluent Bit can open towards the aggregator to avoid overloading it.
62+
63+
```yaml
64+
spec:
65+
controlNamespace: default
66+
fluentbit:
67+
# The below network configurations allow fluentbit to retry indefinitely on a limited number of connections to avoid overloading the aggregator (syslog-ng in this case)
68+
network:
69+
maxWorkerConnections: 2
70+
syslogng_output:
71+
Workers: 2
72+
Retry_Limit: "no_limits"
73+
```
74+
75+
- In the Loggging operator helm chart you can include extra manifests to deploy together with the chart using the `extraManifests` field similar to other popular charts.
76+
677
## Version 4.7
778

879
The following are the highlights and main changes of Logging operator 4.7. For a complete list of changes and bugfixes, see the [Logging operator 4.7 releases page](https://github.com/kube-logging/logging-operator/releases/tag/4.7.0) and the [Logging operator 4.7 release blog post](https://axoflow.com/logging-operator-4.7-release-announcement).

0 commit comments

Comments
 (0)