Skip to content

Commit 4a2c999

Browse files
authored
Merge pull request #183 from kube-logging/updates-for-4.4
Updates for 4.4
2 parents b3c5231 + 59173e3 commit 4a2c999

File tree

33 files changed

+1279
-70
lines changed

33 files changed

+1279
-70
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.3
2+
3+
env:
4+
doc_versionnumber: "4.3"
5+
6+
on:
7+
push:
8+
branches:
9+
- release-4.3
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@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
33+
with:
34+
ref: release-4.3
35+
submodules: 'recursive'
36+
37+
- name: Set up Pages
38+
id: pages
39+
uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382 # v3.0.6
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@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
49+
with:
50+
node-version: 16
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@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.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: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ twitter = "calisti12"
6969
# Used in the "version-banner" partial to display a version number for the
7070
# current doc set.
7171

72-
version = "4.3.0"
72+
version = "4.4.0"
7373
version_menu = "Releases"
7474
version_menu_canonicallinks = true
7575
version_menu_pagelinks = true
@@ -169,9 +169,13 @@ twitter = "calisti12"
169169
#######################
170170
# Add your release versions here
171171
[[params.versions]]
172-
version = "latest (4.3.0)"
172+
version = "latest (4.4.0)"
173173
githubbranch = "master"
174174
url = ""
175+
[[params.versions]]
176+
version = "4.3"
177+
githubbranch = "release-4.3"
178+
url = "/4.3/"
175179
[[params.versions]]
176180
version = "4.2"
177181
githubbranch = "release-4.2"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ Default: -
202202

203203
Default: -
204204

205+
### bufferVolumeResources (corev1.ResourceRequirements, optional) {#fluentbitspec-buffervolumeresources}
206+
207+
Default: -
208+
205209
### customConfigSecret (string, optional) {#fluentbitspec-customconfigsecret}
206210

207211
Default: -
@@ -607,7 +611,7 @@ Default: "0"
607611
608612
### Kube_URL (string, optional) {#filterkubernetes-kube_url}
609613
610-
API Server end-point (default: `https://kubernetes.default.svc:443`)
614+
API Server end-point.
611615
612616
Default: `https://kubernetes.default.svc:443`
613617

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ Default: -
132132

133133
Default: -
134134

135+
### bufferVolumeResources (corev1.ResourceRequirements, optional) {#fluentdspec-buffervolumeresources}
136+
137+
Default: -
138+
135139
### security (*Security, optional) {#fluentdspec-security}
136140

137141
Default: -
@@ -299,6 +303,10 @@ Container image to use for the drain watch sidecar
299303

300304
Default: -
301305

306+
### labels (map[string]string, optional) {#fluentddrainconfig-labels}
307+
308+
Labels to use for the drain watch sidecar on top of labels added by the operator by default. Default values can be overwritten.
309+
302310
### deleteVolume (bool, optional) {#fluentddrainconfig-deletevolume}
303311

304312
Should persistent volume claims be deleted after draining is done

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ Override generated config. This is a *raw* configuration string for troubleshoot
3232

3333
Default: -
3434

35+
### configCheck (ConfigCheck, optional) {#loggingspec-configcheck}
36+
37+
ConfigCheck settings that apply to both fluentd and syslog-ng
38+
39+
Default: -
40+
3541
### fluentbit (*FluentbitSpec, optional) {#loggingspec-fluentbit}
3642

3743
FluentbitAgent daemonset configuration. Deprecated, will be removed with next major version Migrate to the standalone NodeAgent resource
@@ -84,7 +90,7 @@ Default: -
8490

8591
Cluster domain name to be used when templating URLs to services .
8692

87-
Default: "cluster.local"
93+
Default: "cluster.local."
8894

8995
### controlNamespace (string, required) {#loggingspec-controlnamespace}
9096

@@ -111,6 +117,27 @@ EnableRecreateWorkloadOnImmutableFieldChange enables the operator to recreate th
111117
Default: -
112118

113119

120+
## ConfigCheck
121+
122+
### strategy (ConfigCheckStrategy, optional) {#configcheck-strategy}
123+
124+
Select the config check strategy to use. `DryRun`: parse and validate configuration `StartWithTimeout`: start with given configuration and exit after specified timeout.
125+
126+
Default: `DryRun`
127+
128+
### timeoutSeconds (int, optional) {#configcheck-timeoutseconds}
129+
130+
Configure timeout in seconds if strategy is StartWithTimeout
131+
132+
Default: -
133+
134+
### labels (map[string]string, optional) {#configcheck-labels}
135+
136+
Labels to use for the configcheck pods on top of labels added by the operator by default. Default values can be overwritten.
137+
138+
Default: -
139+
140+
114141
## LoggingStatus
115142

116143
LoggingStatus defines the observed state of Logging
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
---
2+
title: LoggingRouteSpec
3+
weight: 200
4+
generated_file: true
5+
---
6+
7+
## LoggingRouteSpec
8+
9+
LoggingRouteSpec defines the desired state of LoggingRoute
10+
11+
### source (string, required) {#loggingroutespec-source}
12+
13+
Source identifies the logging that this policy applies to
14+
15+
Default: -
16+
17+
### targets (metav1.LabelSelector, required) {#loggingroutespec-targets}
18+
19+
Targets refers to the list of logging resources specified by a label selector to forward logs to. Filtering of namespaces will happen based on the watchNamespaces and watchNamespaceSelector fields of the target logging resource
20+
21+
Default: -
22+
23+
24+
## LoggingRouteStatus
25+
26+
LoggingRouteStatus defines the actual state of the LoggingRoute
27+
28+
### tenants ([]Tenant, optional) {#loggingroutestatus-tenants}
29+
30+
Enumerate all loggings with all the destination namespaces expanded
31+
32+
Default: -
33+
34+
### problems ([]string, optional) {#loggingroutestatus-problems}
35+
36+
Enumerate problems that prohibits this route to take effect and populate the tenants field
37+
38+
Default: -
39+
40+
### problemsCount (int, optional) {#loggingroutestatus-problemscount}
41+
42+
Summarize the number of problems for the CLI output
43+
44+
Default: -
45+
46+
### notices ([]string, optional) {#loggingroutestatus-notices}
47+
48+
Enumerate non-blocker issues the user should pay attention to
49+
50+
Default: -
51+
52+
### noticesCount (int, optional) {#loggingroutestatus-noticescount}
53+
54+
Summarize the number of notices for the CLI output
55+
56+
Default: -
57+
58+
59+
## Tenant
60+
61+
### name (string, required) {#tenant-name}
62+
63+
Default: -
64+
65+
### namespaces ([]string, optional) {#tenant-namespaces}
66+
67+
Default: -
68+
69+
70+
## LoggingRoute
71+
72+
LoggingRoute (experimental)
73+
Connects a log collector with log aggregators from other logging domains and routes relevant logs based on watch namespaces
74+
75+
### (metav1.TypeMeta, required) {#loggingroute-}
76+
77+
Default: -
78+
79+
### metadata (metav1.ObjectMeta, optional) {#loggingroute-metadata}
80+
81+
Default: -
82+
83+
### spec (LoggingRouteSpec, optional) {#loggingroute-spec}
84+
85+
Default: -
86+
87+
### status (LoggingRouteStatus, optional) {#loggingroute-status}
88+
89+
Default: -
90+
91+
92+
## LoggingRouteList
93+
94+
### (metav1.TypeMeta, required) {#loggingroutelist-}
95+
96+
Default: -
97+
98+
### metadata (metav1.ListMeta, optional) {#loggingroutelist-metadata}
99+
100+
Default: -
101+
102+
### items ([]LoggingRoute, required) {#loggingroutelist-items}
103+
104+
Default: -
105+
106+

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ Default: -
2828

2929
Default: -
3030

31+
### redis (*output.RedisOutput, optional) {#syslogngoutputspec-redis}
32+
33+
Default: -
34+
35+
### mongodb (*output.MongoDB, optional) {#syslogngoutputspec-mongodb}
36+
37+
Default: -
38+
3139
### sumologic-http (*output.SumologicHTTPOutput, optional) {#syslogngoutputspec-sumologic-http}
3240

3341
Default: -
@@ -40,10 +48,22 @@ Default: -
4048

4149
Default: -
4250

51+
### elasticsearch (*output.ElasticsearchOutput, optional) {#syslogngoutputspec-elasticsearch}
52+
53+
Default: -
54+
4355
### logscale (*output.LogScaleOutput, optional) {#syslogngoutputspec-logscale}
4456

4557
Default: -
4658

59+
### splunk_hec_event (*output.SplunkHECOutput, optional) {#syslogngoutputspec-splunk_hec_event}
60+
61+
Default: -
62+
63+
### loki (*output.LokiOutput, optional) {#syslogngoutputspec-loki}
64+
65+
Default: -
66+
4767

4868
## SyslogNGOutput
4969

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,13 @@ Default: -
106106

107107
### stats (*Stats, optional) {#globaloptions-stats}
108108

109-
TODO switch to this by default
109+
See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-global-options/reference-options/#global-option-stats)
110+
111+
Default: -
112+
113+
### log_level (*string, optional) {#globaloptions-log_level}
114+
115+
See the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-global-options/reference-options/#global-options-log-level)
110116

111117
Default: -
112118

content/docs/configuration/plugins/outputs/datadog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ More info at [https://github.com/DataDog/fluent-plugin-datadog](https://github.c
1313
```yaml
1414
spec:
1515
datadog:
16-
api_key '<YOUR_API_KEY>'
16+
api_key:
17+
value: '<YOUR_API_KEY>' # for referencing a secret see https://kube-logging.dev/docs/configuration/plugins/outputs/secret/
1718
dd_source: '<INTEGRATION_NAME>'
1819
dd_tags: '<KEY1:VALUE1>,<KEY2:VALUE2>'
1920
dd_sourcecategory: '<YOUR_SOURCE_CATEGORY>'

content/docs/configuration/plugins/outputs/elasticsearch.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,4 +573,8 @@ Specify whether overwriting data stream ilm policy or not.
573573

574574
Default: -
575575

576+
### use_legacy_template (*bool, optional) {#elasticsearch-use_legacy_template}
576577

578+
If set to true, the output uses the [legacy index template format](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/indices-templates-v1.html). Otherwise, it uses the [composable index template](https://www.elastic.co/guide/en/elasticsearch/reference/7.13/index-templates.html) format.
579+
580+
Default: true

0 commit comments

Comments
 (0)