Skip to content

Commit 0cd56a2

Browse files
Merge pull request #2026 from fluent/alexakreizinger/sc-143164/final-sweep-through-pipeline-outputs
2 parents b8d2911 + 6105c38 commit 0cd56a2

File tree

12 files changed

+40
-32
lines changed

12 files changed

+40
-32
lines changed

pipeline/outputs/azure_blob.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The Fluent Bit plugin works with the official Azure Service and can be configure
1010

1111
## Azure Storage account
1212

13-
Ensure you have an Azure Storage account. [Azure Blob Storage Tutorial \(Video\)](https://www.youtube.com/watch?v=-sCKnOm8G_g) explains how to set up your account.
13+
Ensure you have an Azure Storage account. [Azure Blob Storage Tutorial (video)](https://www.youtube.com/watch?v=-sCKnOm8G_g) explains how to set up your account.
1414

1515
## Configuration parameters
1616

@@ -49,7 +49,7 @@ Fluent Bit exposes the following configuration properties.
4949

5050
Fluent Bit can deliver records to the official service or an emulator.
5151

52-
### Configuration for Azure Storage Service
52+
### Configuration for Azure Storage
5353

5454
The following configuration example generates a random message with a custom tag:
5555

@@ -212,4 +212,4 @@ Azurite Queue service is successfully listening at http://127.0.0.1:10001
212212
127.0.0.1 - - [03/Sep/2020:17:40:03 +0000] "PUT /devstoreaccount1/logs/kubernetes/var.log.containers.app-default-96cbdef2340.log?comp=appendblock HTTP/1.1" 404 -
213213
127.0.0.1 - - [03/Sep/2020:17:40:03 +0000] "PUT /devstoreaccount1/logs/kubernetes/var.log.containers.app-default-96cbdef2340.log HTTP/1.1" 201 -
214214
127.0.0.1 - - [03/Sep/2020:17:40:04 +0000] "PUT /devstoreaccount1/logs/kubernetes/var.log.containers.app-default-96cbdef2340.log?comp=appendblock HTTP/1.1" 201 -
215-
```
215+
```

pipeline/outputs/azure_kusto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ By default, Kusto will insert incoming ingestion data into a table by inferring
7070
| `buffering_enabled` | Optional. Enable buffering into disk before ingesting into Azure Kusto. | `Off` |
7171
| `buffer_dir` | Optional. When buffering is `On`, specifies the location of directory where the buffered data will be stored. | `/tmp/fluent-bit/azure-kusto/` |
7272
| `upload_timeout` | Optional. When buffering is `On`, specifies a timeout for uploads. Fluent Bit will start ingesting buffer files which have been created more than x minutes and haven't reached `upload_file_size` limit. | `30m` |
73-
| `upload_file_size`| Optional. When buffering is `On`, specifies the size of files to be uploaded in MBs. | `200MB` |
73+
| `upload_file_size`| Optional. When buffering is `On`, specifies the size of files to be uploaded in megabytes. | `200MB` |
7474
| `azure_kusto_buffer_key` | Optional. When buffering is `On`, set the Azure Kusto buffer key which must be specified when using multiple instances of Azure Kusto output plugin and buffering is enabled. | `key` |
7575
| `store_dir_limit_size` | Optional. When buffering is `On`, set the max size of the buffer directory. | `8GB` |
7676
| `buffer_file_delete_early` | Optional. When buffering is `On`, whether to delete the buffered file early after successful blob creation. | `Off` |

pipeline/outputs/cloudwatch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Send logs and metrics to Amazon CloudWatch
44

55
# Amazon CloudWatch
66

7-
![](<../../.gitbook/assets/image (3) (2) (2) (4) (4) (3) (1).png>)
7+
![Amazon CloudWatch](<../../.gitbook/assets/image (3) (2) (2) (4) (4) (3) (1).png>)
88

99
The _Amazon CloudWatch_ output plugin lets you ingest your records into the [CloudWatch Logs](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/WhatIsCloudWatchLogs.html) service. Support for CloudWatch Metrics is also provided using [Embedded Metric Format (EMF)](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch_Embedded_Metric_Format_Specification.html).
1010

pipeline/outputs/dynatrace.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,12 @@ To get started with sending logs to Dynatrace:
7878

7979
## References
8080

81+
<!-- vale FluentBit.Simplicity = NO -->
82+
8183
- [Dynatrace Fluent Bit documentation](https://docs.dynatrace.com/docs/shortlink/lma-stream-logs-with-fluent-bit)
8284
- [Fluent Bit integration in Dynatrace Hub](https://www.dynatrace.com/hub/detail/fluent-bit/?filter=log-management-and-analytics)
8385
- [Video: Stream a Log File to Dynatrace using Fluent Bit](https://www.youtube.com/watch?v=JJJNxhtJ6R0)
8486
- [Blog: Easily stream logs from Fluent Bit to
8587
Dynatrace](https://www.dynatrace.com/news/blog/easily-stream-logs-with-fluent-bit-to-dynatrace/)
88+
89+
<!-- vale FluentBit.Simplicity = YES -->

pipeline/outputs/gelf.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Graylog Extended Log Format (GELF
1+
# Graylog Extended Log Format (GELF)
22

33
The _[Graylog](https://www.graylog.org) Extended Log Format (GELF)_ output plugin lets you send logs in GELF format directly to a Graylog input using TLS, TCP, or UDP protocols.
44

@@ -26,7 +26,7 @@ According to the [GELF Payload Specification](https://go2docs.graylog.org/5-0/ge
2626

2727
### TLS / SSL
2828

29-
The GELF output plugin supports TLS/SSL. For iformation about the properties available and general configuration, see [TLS/SSL](../../administration/transport-security.md).
29+
The GELF output plugin supports TLS/SSL. For information about the properties available and general configuration, see [TLS/SSL](../../administration/transport-security.md).
3030

3131
## Notes
3232

pipeline/outputs/logdna.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ When the login processes a record or log, it searches for specific key names tha
2828

2929
| Key | Description |
3030
| :--- | :--- |
31-
| `level` | If the record contains a key called `level` or `severity`, it will populate the context `level` key with that value. If not found, the context key is not set. |
31+
| `level` | If the record contains a key called `level` or `severity`, Fluent Bit will populate the context `level` key with that value. If not found, Fluent Bit won't set the context key. |
3232
| `file` | If the record contains a key called `file`, it will populate the context `file` with the value found. Otherwise, if the plugin configuration provided a `file` property, that value will be used instead. |
3333
| `app` | If the record contains a key called `app`, it will populate the context `app` with the value found, otherwise it will use the value set for `app` in the configuration property. |
3434
| `meta` | If the record contains a key called `meta`, it will populate the context `meta` with the value found. |

pipeline/outputs/loki.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ There is a separate Golang output plugin provided by [Grafana](https://grafana.c
2222
| `labels` | Stream labels for API request. It can be multiple comma separated of strings specifying `key=value` pairs. Allows fixed parameters, or adding custom record keys (similar to the `label_keys` property). See the Labels section. | `job=fluent-bit` |
2323
| `label_keys` | (Optional.) List of record keys that will be placed as stream labels. This configuration property is for records key only. See the Labels section. | _none_ |
2424
| `label_map_path` | Specify the label map path. The file defines how to extract labels from each record. See the Labels section. | _none_ |
25-
| `structured_metadata` | (Optional.) Comma-separated list of `key=value` strings specifying structured metadata for the log line. Like the `labels` parameter, values can reference record keys using record accessors. See [Structured metadata](#structured_metadata). | _none_ |
26-
| `structured_metadata_map_keys` | (Optional.) Comma-separated list of record key strings specifying record values of type `map`, used to dynamically populate structured metadata for the log line. Values can only reference record keys using record accessors, which should reference map values. Each entry from the referenced map will be used to add an entry to the structured metadata. See [Structured metadata](#structured_metadata). | _none_ |
25+
| `structured_metadata` | (Optional.) Comma-separated list of `key=value` strings specifying structured metadata for the log line. Like the `labels` parameter, values can reference record keys using record accessors. See [Use `structured_metadata`.](#use-structured_metadata). | _none_ |
26+
| `structured_metadata_map_keys` | (Optional.) Comma-separated list of record key strings specifying record values of type `map`, used to dynamically populate structured metadata for the log line. Values can only reference record keys using record accessors, which should reference map values. Each entry from the referenced map will be used to add an entry to the structured metadata. See [Use `structured_metadata`.](#use-structured_metadata). | _none_ |
2727
| `remove_keys` | (Optional.) List of keys to remove. | _none_ |
2828
| `drop_single_key` | When set to `true` and after extracting labels only a single key remains, the log line sent to Loki will be the value of that key in `line_format`. If set to `raw` and the log line is a string, the log line will be sent unquoted. | `off` |
2929
| `line_format` | Format to use when flattening the record to a log line. Valid values are `json` or `key_value`. If set to `json`, the log line sent to Loki will be the Fluent Bit record dumped as JSON. If set to `key_value`, the log line will be each item in the record concatenated together (separated by a single space) in the format. | `json` |
@@ -272,7 +272,7 @@ job="fluentbit", stream="stdout"
272272

273273
#### Kubernetes and labels
274274

275-
If you're running in a Kubernetes environment, consider enabling the `auto_kubernetes_labels` option, which autopopulates the streams with the Pod labels for you. Consider the following configuration:
275+
If you're running in a Kubernetes environment, consider enabling the `auto_kubernetes_labels` option, which populates the streams with the Pod labels for you. Consider the following configuration:
276276

277277
{% tabs %}
278278
{% tab title="fluent-bit.yaml" %}
@@ -479,7 +479,7 @@ pipeline:
479479
{% endtab %}
480480
{% endtabs %}
481481

482-
## Networking and TLS Configuration
482+
## Networking and TLS configuration
483483

484484
This plugin inherits core Fluent Bit features to customize the network behavior and optionally enable TLS in the communication channel. For more details about the specific options available, refer to the following articles:
485485

@@ -492,7 +492,7 @@ All options mentioned in these articles must be enabled in the plugin configurat
492492

493493
Fluent Bit supports sending logs and metrics to [Grafana Cloud](https://grafana.com/products/cloud/) by providing the appropriate URL and ensuring TLS is enabled.
494494

495-
Below is an example configuration, be sure to set the credentials (shown here with XXX) and ensure the host URL matches the correct one for your deployment:
495+
The following samples show example configurations. Be sure to set the credentials (shown here with `XXX`) and ensure the host URL matches the correct one for your deployment:
496496

497497
{% tabs %}
498498
{% tab title="fluent-bit.yaml" %}
@@ -529,9 +529,9 @@ pipeline:
529529
{% endtab %}
530530
{% endtabs %}
531531

532-
## Get Started
532+
## Get started
533533

534-
The following configuration example emits a dummy example record and ingests it on Loki. Copy and paste the corresponding content below into a file `out_loki.yaml` or `out_loki.conf`:
534+
The following configuration example emits a dummy example record and ingests it on Loki. Copy and paste the following content into a file `out_loki.yaml` or `out_loki.conf`:
535535

536536
{% tabs %}
537537
{% tab title="out-loki.yaml" %}

pipeline/outputs/opensearch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ becomes
150150
{"cpu0_p_cpu"=>17.000000}
151151
```
152152

153-
## FAQ
153+
## Frequently asked questions
154154

155155
### `Logstash_Prefix_Key`
156156

pipeline/outputs/stackdriver_special_fields.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ For the special fields that map to `LogEntry` prototypes, add them as objects wi
6262
}
6363
```
6464

65-
Adding special fields to logs is best done through the [`modify` filter](https://docs.fluentbit.io/manual/pipeline/filters/modify) for simple fields, or [a Lua script using the `lua` filter](https://docs.fluentbit.io/manual/pipeline/filters/lua) for more complex fields.
65+
Adding special fields to logs is best done through the [`modify` filter](https://docs.fluentbit.io/manual/pipeline/filters/modify) for basic fields, or [a Lua script using the `lua` filter](https://docs.fluentbit.io/manual/pipeline/filters/lua) for more complex fields.
6666

67-
## Simple type special fields
67+
## Basic type special fields
6868

69-
Special fields with simple types (except for the [`logging.googleapis.com/insertId` field](#insert-id)) will follow this pattern (demonstrated with the `logging.googleapis.com/logName` field):
69+
Special fields with basic types (except for the [`logging.googleapis.com/insertId` field](#insert-id)) will follow this pattern (demonstrated with the `logging.googleapis.com/logName` field):
7070

7171
1. If the special field matches the type, it will be moved to the corresponding LogEntry field. For example:
7272

@@ -111,7 +111,7 @@ Special fields with simple types (except for the [`logging.googleapis.com/insert
111111
}
112112
```
113113

114-
### Exceptions
114+
### Exceptions [#exceptions-basic]
115115

116116
#### Insert ID
117117

@@ -244,9 +244,9 @@ the `logEntry will be:
244244
}
245245
```
246246

247-
### Exceptions
247+
### Exceptions [#exceptions-proto]
248248

249-
#### Monitored Resource ID
249+
#### `MonitoredResource` ID
250250

251251
The `logging.googleapis.com/monitored_resource` field is parsed in a special way, meaning it has some important exceptions:
252252

vale-styles/FluentBit/FluentBitCasing.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ ignorecase: false
55
scope: text
66
tokens:
77
# Matches incorrect variants in plain prose but excludes filenames, links, quotes, and code
8-
- '(?<![".\w:/\]])\bfluent bit\b(?![".\w:/\]])'
9-
- '(?<![".\w:/\]])\bfluentbit\b(?![".\w:/\]])'
10-
- '(?<![".\w:/\]])\bFluent bit\b(?![".\w:/\]])'
11-
- '(?<![".\w:/\]])\bfluent Bit\b(?![".\w:/\]])'
12-
- '(?<![".\w:/\]])\bfluent-bit\b(?![".\w:/\]])'
13-
- '(?<![".\w:/\]])\bFluent-Bit\b(?![".\w:/\]])'
14-
- '(?<![".\w:/\]])\bfluent\-Bit\b(?![".\w:/\]])'
15-
- '(?<![".\w:/\]])\bFLUENT BIT\b(?![".\w:/\]])'
16-
- '(?<![".\w:/\]])\bFLUENT-BIT\b(?![".\w:/\]])'
8+
- '(?<![-[".\w:/\]])\bfluent bit\b(?![-\]".\w:/\]])'
9+
- '(?<![-[".\w:/\]])\bfluentbit\b(?![-\]".\w:/\]])'
10+
- '(?<![-[".\w:/\]])\bFluent bit\b(?![-\]".\w:/\]])'
11+
- '(?<![-[".\w:/\]])\bfluent Bit\b(?![-\]".\w:/\]])'
12+
- '(?<![-[".\w:/\]])\bfluent-bit\b(?![-\]".\w:/\]])'
13+
- '(?<![-[".\w:/\]])\bFluent-Bit\b(?![-\]".\w:/\]])'
14+
- '(?<![-[".\w:/\]])\bfluent\-Bit\b(?![-\]".\w:/\]])'
15+
- '(?<![-[".\w:/\]])\bFLUENT BIT\b(?![-\]".\w:/\]])'
16+
- '(?<![-[".\w:/\]])\bFLUENT-BIT\b(?![-\]".\w:/\]])'

0 commit comments

Comments
 (0)