Skip to content

Commit 40c7c09

Browse files
authored
Adjusted amazon outputs code examples to use 2 space indentations. Fixes #1890. (#1906)
* Adjusted cloudwatch examples to use 2 space indents. Part of issue #1890. Signed-off-by: Eric D. Schabell <[email protected]> * Adjusted amazone kinesis data firehose examples to use 2 space indents. Part of issue #1890. Signed-off-by: Eric D. Schabell <[email protected]> * Adjusted amazone kinesis data streams examples to use 2 space indents. Part of issue #1890. Signed-off-by: Eric D. Schabell <[email protected]> * Adjusted amazone s3 examples to use 2 space indents. Part of issue #1890. Signed-off-by: Eric D. Schabell <[email protected]> --------- Signed-off-by: Eric D. Schabell <[email protected]>
1 parent 0245c86 commit 40c7c09

File tree

4 files changed

+337
-337
lines changed

4 files changed

+337
-337
lines changed

pipeline/outputs/cloudwatch.md

Lines changed: 133 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,26 @@ In your main configuration file append the following:
5959
```yaml
6060
pipeline:
6161

62-
outputs:
63-
- name: cloudwatch_logs
64-
match: '*'
65-
region: us-east-1
66-
log_group_name: fluent-bit-cloudwatch
67-
log_stream_prefix: from-fluent-bit-
68-
auto_create_group: on
62+
outputs:
63+
- name: cloudwatch_logs
64+
match: '*'
65+
region: us-east-1
66+
log_group_name: fluent-bit-cloudwatch
67+
log_stream_prefix: from-fluent-bit-
68+
auto_create_group: on
6969
```
7070
7171
{% endtab %}
7272
{% tab title="fluent-bit.conf" %}
7373
7474
```text
7575
[OUTPUT]
76-
Name cloudwatch_logs
77-
Match *
78-
region us-east-1
79-
log_group_name fluent-bit-cloudwatch
80-
log_stream_prefix from-fluent-bit-
81-
auto_create_group On
76+
Name cloudwatch_logs
77+
Match *
78+
region us-east-1
79+
log_group_name fluent-bit-cloudwatch
80+
log_stream_prefix from-fluent-bit-
81+
auto_create_group On
8282
```
8383

8484
{% endtab %}
@@ -94,30 +94,30 @@ For an instance of `Localstack` running at `http://localhost:4566`, the followin
9494
```yaml
9595
pipeline:
9696

97-
outputs:
98-
- name: cloudwatch_logs
99-
match: '*'
100-
region: us-east-1
101-
log_group_name: fluent-bit-cloudwatch
102-
log_stream_prefix: from-fluent-bit-
103-
auto_create_group: on
104-
endpoint: localhost
105-
port: 4566
97+
outputs:
98+
- name: cloudwatch_logs
99+
match: '*'
100+
region: us-east-1
101+
log_group_name: fluent-bit-cloudwatch
102+
log_stream_prefix: from-fluent-bit-
103+
auto_create_group: on
104+
endpoint: localhost
105+
port: 4566
106106
```
107107
108108
{% endtab %}
109109
{% tab title="fluent-bit.conf" %}
110110
111111
```text
112112
[OUTPUT]
113-
Name cloudwatch_logs
114-
Match *
115-
region us-east-1
116-
log_group_name fluent-bit-cloudwatch
117-
log_stream_prefix from-fluent-bit-
118-
auto_create_group On
119-
endpoint localhost
120-
port 4566
113+
Name cloudwatch_logs
114+
Match *
115+
region us-east-1
116+
log_group_name fluent-bit-cloudwatch
117+
log_stream_prefix from-fluent-bit-
118+
auto_create_group On
119+
endpoint localhost
120+
port 4566
121121
```
122122

123123
{% endtab %}
@@ -131,16 +131,16 @@ The following AWS IAM permissions are required to use this plugin:
131131

132132
```json
133133
{
134-
"Version": "2012-10-17",
135-
"Statement": [{
136-
"Effect": "Allow",
137-
"Action": [
138-
"logs:CreateLogStream",
139-
"logs:CreateLogGroup",
140-
"logs:PutLogEvents"
141-
],
142-
"Resource": "*"
143-
}]
134+
"Version": "2012-10-17",
135+
"Statement": [{
136+
"Effect": "Allow",
137+
"Action": [
138+
"logs:CreateLogStream",
139+
"logs:CreateLogGroup",
140+
"logs:PutLogEvents"
141+
],
142+
"Resource": "*"
143+
}]
144144
}
145145
```
146146

@@ -154,20 +154,20 @@ Recall that the kubernetes filter can add metadata which will look like the foll
154154

155155
```text
156156
kubernetes: {
157-
annotations: {
158-
"kubernetes.io/psp": "eks.privileged"
159-
},
160-
container_hash: "<some hash>",
161-
container_name: "myapp",
162-
docker_id: "<some id>",
163-
host: "ip-10-1-128-166.us-east-2.compute.internal",
164-
labels: {
165-
app: "myapp",
166-
"pod-template-hash": "<some hash>"
167-
},
168-
namespace_name: "my-namespace",
169-
pod_id: "198f7dd2-2270-11ea-be47-0a5d932f5920",
170-
pod_name: "myapp-5468c5d4d7-n2swr"
157+
annotations: {
158+
"kubernetes.io/psp": "eks.privileged"
159+
},
160+
container_hash: "<some hash>",
161+
container_name: "myapp",
162+
docker_id: "<some id>",
163+
host: "ip-10-1-128-166.us-east-2.compute.internal",
164+
labels: {
165+
app: "myapp",
166+
"pod-template-hash": "<some hash>"
167+
},
168+
namespace_name: "my-namespace",
169+
pod_id: "198f7dd2-2270-11ea-be47-0a5d932f5920",
170+
pod_name: "myapp-5468c5d4d7-n2swr"
171171
}
172172
```
173173

@@ -181,30 +181,30 @@ Here is our configuration:
181181
```yaml
182182
pipeline:
183183

184-
outputs:
185-
- name: cloudwatch_logs
186-
match: '*'
187-
region: us-east-1
188-
log_group_name: fallback-group
189-
log_stream_prefix: fallback-stream
190-
auto_create_group: on
191-
log_group_template: application-logs-$kubernetes['host'].$kubernetes['namespace_name']
192-
log_stream_template: $kubernetes['pod_name'].$kubernetes['container_name']
184+
outputs:
185+
- name: cloudwatch_logs
186+
match: '*'
187+
region: us-east-1
188+
log_group_name: fallback-group
189+
log_stream_prefix: fallback-stream
190+
auto_create_group: on
191+
log_group_template: application-logs-$kubernetes['host'].$kubernetes['namespace_name']
192+
log_stream_template: $kubernetes['pod_name'].$kubernetes['container_name']
193193
```
194194
195195
{% endtab %}
196196
{% tab title="fluent-bit.conf" %}
197197
198198
```text
199199
[OUTPUT]
200-
Name cloudwatch_logs
201-
Match *
202-
region us-east-1
203-
log_group_name fallback-group
204-
log_stream_prefix fallback-stream
205-
auto_create_group On
206-
log_group_template application-logs-$kubernetes['host'].$kubernetes['namespace_name']
207-
log_stream_template $kubernetes['pod_name'].$kubernetes['container_name']
200+
Name cloudwatch_logs
201+
Match *
202+
region us-east-1
203+
log_group_name fallback-group
204+
log_stream_prefix fallback-stream
205+
auto_create_group On
206+
log_group_template application-logs-$kubernetes['host'].$kubernetes['namespace_name']
207+
log_stream_template $kubernetes['pod_name'].$kubernetes['container_name']
208208
```
209209

210210
{% endtab %}
@@ -254,54 +254,54 @@ For using the `mem` input plugin and sending memory usage metrics to CloudWatch,
254254

255255
```yaml
256256
service:
257-
log_level: info
257+
log_level: info
258258

259259
pipeline:
260-
inputs:
261-
- name: mem
262-
tag: mem
260+
inputs:
261+
- name: mem
262+
tag: mem
263263

264-
filters:
265-
- name: aws
266-
match: '*'
264+
filters:
265+
- name: aws
266+
match: '*'
267267

268-
outputs:
269-
- name: cloudwatch_logs
270-
match: '*'
271-
region: us-west-2
272-
log_stream_name: fluent-bit-cloudwatch
273-
log_group_name: fluent-bit-cloudwatch
274-
log_format: json/emf
275-
metric_namespace: fluent-bit-metrics
276-
metric_dimensions: ec2_instance_id
277-
auto_create_group: true
268+
outputs:
269+
- name: cloudwatch_logs
270+
match: '*'
271+
region: us-west-2
272+
log_stream_name: fluent-bit-cloudwatch
273+
log_group_name: fluent-bit-cloudwatch
274+
log_format: json/emf
275+
metric_namespace: fluent-bit-metrics
276+
metric_dimensions: ec2_instance_id
277+
auto_create_group: true
278278
```
279279
280280
{% endtab %}
281281
{% tab title="fluent-bit.conf" %}
282282
283283
```text
284284
[SERVICE]
285-
Log_Level info
285+
Log_Level info
286286

287287
[INPUT]
288-
Name mem
289-
Tag mem
288+
Name mem
289+
Tag mem
290290

291291
[FILTER]
292-
Name aws
293-
Match *
292+
Name aws
293+
Match *
294294

295295
[OUTPUT]
296-
Name cloudwatch_logs
297-
Match *
298-
region us-west-2
299-
log_stream_name fluent-bit-cloudwatch
300-
log_group_name fluent-bit-cloudwatch
301-
log_format json/emf
302-
metric_namespace fluent-bit-metrics
303-
metric_dimensions ec2_instance_id
304-
auto_create_group true
296+
Name cloudwatch_logs
297+
Match *
298+
region us-west-2
299+
log_stream_name fluent-bit-cloudwatch
300+
log_group_name fluent-bit-cloudwatch
301+
log_format json/emf
302+
metric_namespace fluent-bit-metrics
303+
metric_dimensions ec2_instance_id
304+
auto_create_group true
305305
```
306306

307307
{% endtab %}
@@ -314,54 +314,54 @@ The following config will set two dimensions to all of our metrics- `ec2_instanc
314314

315315
```yaml
316316
service:
317-
log_level: info
317+
log_level: info
318318

319319
pipeline:
320-
inputs:
321-
- name: mem
322-
tag: mem
320+
inputs:
321+
- name: mem
322+
tag: mem
323323

324-
filters:
325-
- name: aws
326-
match: '*'
324+
filters:
325+
- name: aws
326+
match: '*'
327327

328-
outputs:
329-
- name: cloudwatch_logs
330-
match: '*'
331-
region: us-west-2
332-
log_stream_name: fluent-bit-cloudwatch
333-
log_group_name: fluent-bit-cloudwatch
334-
log_format: json/emf
335-
metric_namespace: fluent-bit-metrics
336-
metric_dimensions: ec2_instance_id,az
337-
auto_create_group: true
328+
outputs:
329+
- name: cloudwatch_logs
330+
match: '*'
331+
region: us-west-2
332+
log_stream_name: fluent-bit-cloudwatch
333+
log_group_name: fluent-bit-cloudwatch
334+
log_format: json/emf
335+
metric_namespace: fluent-bit-metrics
336+
metric_dimensions: ec2_instance_id,az
337+
auto_create_group: true
338338
```
339339
340340
{% endtab %}
341341
{% tab title="fluent-bit.conf" %}
342342
343343
```text
344344
[SERVICE]
345-
Log_Level info
345+
Log_Level info
346346

347347
[INPUT]
348-
Name mem
349-
Tag mem
348+
Name mem
349+
Tag mem
350350

351351
[FILTER]
352-
Name aws
353-
Match *
352+
Name aws
353+
Match *
354354

355355
[OUTPUT]
356-
Name cloudwatch_logs
357-
Match *
358-
region us-west-2
359-
log_stream_name fluent-bit-cloudwatch
360-
log_group_name fluent-bit-cloudwatch
361-
log_format json/emf
362-
metric_namespace fluent-bit-metrics
363-
metric_dimensions ec2_instance_id,az
364-
auto_create_group true
356+
Name cloudwatch_logs
357+
Match *
358+
region us-west-2
359+
log_stream_name fluent-bit-cloudwatch
360+
log_group_name fluent-bit-cloudwatch
361+
log_format json/emf
362+
metric_namespace fluent-bit-metrics
363+
metric_dimensions ec2_instance_id,az
364+
auto_create_group true
365365
```
366366

367367
{% endtab %}

0 commit comments

Comments
 (0)