Skip to content

Commit 22d5a22

Browse files
committed
Merge branch 'language-and-grammar-review' of github.com:iamAzeem/fluentd-docs-gitbook into language-and-grammar-review
2 parents 9ef4f75 + bac552a commit 22d5a22

File tree

5 files changed

+39
-21
lines changed

5 files changed

+39
-21
lines changed

configuration/config-file.md

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -416,35 +416,38 @@ app.log>`), there are a number of techniques you can use to manage the data flow
416416
more efficiently.
417417

418418

419-
### Wildcards and Expansions
419+
### Wildcards, Expansions and other tips
420420

421421
The following match patterns can be used in `<match>` and `<filter>` tags:
422422

423-
- `*` matches a single tag part.
423+
- `*` matches a single tag part.
424424

425-
- For example, the pattern `a.*` matches `a.b`, but does not match `a` or
426-
`a.b.c`
425+
- For example, the pattern `a.*` matches `a.b`, but does not match `a` or `a.b.c`
427426

428-
- `**` matches zero or more tag parts.
427+
- `**` matches zero or more tag parts.
429428

430-
- For example, the pattern `a.**` matches `a`, `a.b` and `a.b.c`
429+
- For example, the pattern `a.**` matches `a`, `a.b` and `a.b.c`
431430

432-
- `{X,Y,Z}` matches X, Y, or Z, where X, Y, and Z are match patterns.
431+
- `{X,Y,Z}` matches X, Y, or Z, where X, Y, and Z are match patterns.
433432

434-
- For example, the pattern `{a,b}` matches `a` and `b`, but does not match
435-
`c`
436-
- This can be used in combination with `*` or `**` patterns. Examples
437-
include `a.{b,c}.*` and `a.{b,c.**}`.
433+
- For example, the pattern `{a,b}` matches `a` and `b`, but does not match `c`
434+
- This can be used in combination with `*` or `**` patterns. Examples
435+
include `a.{b,c}.*` and `a.{b,c.**}`.
438436

439-
- `#{...}` evaluates the string inside brackets as a Ruby expression. (See
440-
**Embedding Ruby Expressions** section below).
437+
- `/regular expression/` is for complex patterns
441438

442-
- When multiple patterns are listed inside a single tag (delimited by one or
443-
more whitespaces), it matches any of the listed patterns. For example:
439+
- For example, the pattern `/(?!a\.).*/` matches non-`a.` started tags like `b.xxx`
440+
- This feature is supported since fluentd v1.11.2
444441

445-
- The patterns `<match a b>` match `a` and `b`.
446-
- The patterns `<match a.** b.*>` match `a`, `a.b`, `a.b.c` (from the
447-
first pattern) and `b.d` (from the second pattern).
442+
- `#{...}` evaluates the string inside brackets as a Ruby expression. (See
443+
**Embedding Ruby Expressions** section below).
444+
445+
- When multiple patterns are listed inside a single tag (delimited by one or
446+
more whitespaces), it matches any of the listed patterns. For example:
447+
448+
- The patterns `<match a b>` match `a` and `b`.
449+
- The patterns `<match a.** b.*>` match `a`, `a.b`, `a.b.c` (from the
450+
first pattern) and `b.d` (from the second pattern).
448451

449452

450453
### Note on Match Order

install/install-by-msi.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ Download and install the `.msi` installer:
3030

3131
- [Download](https://td-agent-package-browser.herokuapp.com/4/windows)
3232

33+
Or, install with [winget](https://www.microsoft.com/en-us/p/app-installer/9nblggh4nns1):
34+
35+
```
36+
> winget install td-agent
37+
```
38+
3339

3440
### Step 2: Run `td-agent` from Command Prompt
3541

monitoring/monitoring-prometheus.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ Fluentd project is recommending to use Prometheus by default to monitor Fluentd.
1313
Install `fluent-plugin-prometheus` gem:
1414

1515
```shell
16-
$ fluent-gem install fluent-plugin-prometheus --version='~>1.6.1'
16+
$ fluent-gem install fluent-plugin-prometheus
1717
```
1818

1919
For `td-agent`, use `td-agent-gem` for installation:
2020

2121
```shell
22-
$ sudo td-agent-gem install fluent-plugin-prometheus --version='~>1.6.1'
22+
$ sudo td-agent-gem install fluent-plugin-prometheus
2323
```
2424

2525
This [GitHub repository](https://github.com/kzk/fluentd-prometheus-config-example)

plugins/filter/parser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ With above configuration, here is the result:
150150

151151
| type | default | version |
152152
|:-----|:--------|:--------|
153-
|bool | `false` | 0.14.9 |
153+
| bool | `false` | 0.14.9 |
154154

155155
If `true`, invalid string is replaced with safe characters and re-parse it.
156156

plugins/parser/json.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ Here is a simple comparison:
2323
- `yajl`: Mainly for stream parsing
2424
- `json`: Standard bundled library
2525

26+
### `stream_buffer_size`
27+
28+
| type | default | version |
29+
|:-----|:--------|:--------|
30+
| integer | 8192 | 1.0.0 |
31+
32+
Set the buffer size that Yajl will use when parsing streaming input.
33+
34+
See also: [Method: Yajl::Parser#parse](https://www.rubydoc.info/github/brianmario/yajl-ruby/Yajl%2FParser:parse)
2635

2736
### `time_type`
2837

0 commit comments

Comments
 (0)