Skip to content

Commit 15444ac

Browse files
author
Robert Fekete
committed
Sync generated docs
1 parent fe796e8 commit 15444ac

File tree

3 files changed

+38
-1
lines changed

3 files changed

+38
-1
lines changed

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.

0 commit comments

Comments
 (0)