Skip to content

Commit 5d07709

Browse files
author
kaiyan-sheng
authored
Add max_number_of_messages into aws filebeat fileset vars (#22057)
1 parent daed8f9 commit 5d07709

15 files changed

Lines changed: 144 additions & 0 deletions

File tree

‎x-pack/filebeat/filebeat.reference.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,12 @@ filebeat.modules:
142142
# AWS IAM Role to assume
143143
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
144144

145+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
146+
#var.fips_enabled: false
147+
148+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
149+
#var.max_number_of_messages: 5
150+
145151
cloudwatch:
146152
enabled: false
147153

@@ -176,6 +182,12 @@ filebeat.modules:
176182
# AWS IAM Role to assume
177183
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
178184

185+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
186+
#var.fips_enabled: false
187+
188+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
189+
#var.max_number_of_messages: 5
190+
179191
ec2:
180192
enabled: false
181193

@@ -210,6 +222,12 @@ filebeat.modules:
210222
# AWS IAM Role to assume
211223
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
212224

225+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
226+
#var.fips_enabled: false
227+
228+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
229+
#var.max_number_of_messages: 5
230+
213231
elb:
214232
enabled: false
215233

@@ -244,6 +262,12 @@ filebeat.modules:
244262
# AWS IAM Role to assume
245263
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
246264

265+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
266+
#var.fips_enabled: false
267+
268+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
269+
#var.max_number_of_messages: 5
270+
247271
s3access:
248272
enabled: false
249273

@@ -278,6 +302,12 @@ filebeat.modules:
278302
# AWS IAM Role to assume
279303
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
280304

305+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
306+
#var.fips_enabled: false
307+
308+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
309+
#var.max_number_of_messages: 5
310+
281311
vpcflow:
282312
enabled: false
283313

@@ -312,6 +342,12 @@ filebeat.modules:
312342
# AWS IAM Role to assume
313343
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
314344

345+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
346+
#var.fips_enabled: false
347+
348+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
349+
#var.max_number_of_messages: 5
350+
315351
#-------------------------------- Azure Module --------------------------------
316352
- module: azure
317353
# All logs

‎x-pack/filebeat/module/aws/_meta/config.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
# AWS IAM Role to assume
4646
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
4747

48+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
49+
#var.fips_enabled: false
50+
51+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
52+
#var.max_number_of_messages: 5
53+
4854
cloudwatch:
4955
enabled: false
5056

@@ -79,6 +85,12 @@
7985
# AWS IAM Role to assume
8086
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
8187

88+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
89+
#var.fips_enabled: false
90+
91+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
92+
#var.max_number_of_messages: 5
93+
8294
ec2:
8395
enabled: false
8496

@@ -113,6 +125,12 @@
113125
# AWS IAM Role to assume
114126
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
115127

128+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
129+
#var.fips_enabled: false
130+
131+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
132+
#var.max_number_of_messages: 5
133+
116134
elb:
117135
enabled: false
118136

@@ -147,6 +165,12 @@
147165
# AWS IAM Role to assume
148166
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
149167

168+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
169+
#var.fips_enabled: false
170+
171+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
172+
#var.max_number_of_messages: 5
173+
150174
s3access:
151175
enabled: false
152176

@@ -181,6 +205,12 @@
181205
# AWS IAM Role to assume
182206
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
183207

208+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
209+
#var.fips_enabled: false
210+
211+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
212+
#var.max_number_of_messages: 5
213+
184214
vpcflow:
185215
enabled: false
186216

@@ -214,3 +244,9 @@
214244

215245
# AWS IAM Role to assume
216246
#var.role_arn: arn:aws:iam::123456789012:role/test-mb
247+
248+
# Enabling this option changes the service name from `s3` to `s3-fips` for connecting to the correct service endpoint.
249+
#var.fips_enabled: false
250+
251+
# The maximum number of messages to return from SQS. Valid values: 1 to 10.
252+
#var.max_number_of_messages: 5

‎x-pack/filebeat/module/aws/cloudtrail/config/s3.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ role_arn: {{ .role_arn }}
5555
fips_enabled: {{ .fips_enabled }}
5656
{{ end }}
5757

58+
{{ if .max_number_of_messages }}
59+
max_number_of_messages: {{ .max_number_of_messages }}
60+
{{ end }}
61+
5862
tags: {{.tags | tojson}}
5963
publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}
6064

‎x-pack/filebeat/module/aws/cloudtrail/manifest.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ var:
2121
default: true
2222
- name: process_insight_logs
2323
default: true
24+
- name: fips_enabled
25+
- name: max_number_of_messages
2426

2527
ingest_pipeline: ingest/pipeline.yml
2628
input: config/{{.input}}.yml

‎x-pack/filebeat/module/aws/cloudwatch/config/s3.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ role_arn: {{ .role_arn }}
4141
fips_enabled: {{ .fips_enabled }}
4242
{{ end }}
4343

44+
{{ if .max_number_of_messages }}
45+
max_number_of_messages: {{ .max_number_of_messages }}
46+
{{ end }}
47+
4448
tags: {{.tags | tojson}}
4549
publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}
4650

‎x-pack/filebeat/module/aws/cloudwatch/manifest.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ var:
1515
- name: role_arn
1616
- name: tags
1717
default: [forwarded]
18+
- name: fips_enabled
19+
- name: max_number_of_messages
1820

1921
ingest_pipeline: ingest/pipeline.yml
2022
input: config/{{.input}}.yml

‎x-pack/filebeat/module/aws/ec2/config/s3.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ role_arn: {{ .role_arn }}
4141
fips_enabled: {{ .fips_enabled }}
4242
{{ end }}
4343

44+
{{ if .max_number_of_messages }}
45+
max_number_of_messages: {{ .max_number_of_messages }}
46+
{{ end }}
47+
4448
tags: {{.tags | tojson}}
4549
publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}
4650

‎x-pack/filebeat/module/aws/ec2/manifest.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ var:
1515
- name: role_arn
1616
- name: tags
1717
default: [forwarded]
18+
- name: fips_enabled
19+
- name: max_number_of_messages
1820

1921
ingest_pipeline: ingest/pipeline.yml
2022
input: config/{{.input}}.yml

‎x-pack/filebeat/module/aws/elb/config/s3.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ role_arn: {{ .role_arn }}
4141
fips_enabled: {{ .fips_enabled }}
4242
{{ end }}
4343

44+
{{ if .max_number_of_messages }}
45+
max_number_of_messages: {{ .max_number_of_messages }}
46+
{{ end }}
47+
4448
tags: {{.tags | tojson}}
4549
publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}
4650

‎x-pack/filebeat/module/aws/elb/manifest.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ var:
1515
- name: role_arn
1616
- name: tags
1717
default: [forwarded]
18+
- name: fips_enabled
19+
- name: max_number_of_messages
1820

1921
ingest_pipeline: ingest/pipeline.yml
2022
input: config/{{.input}}.yml

0 commit comments

Comments
 (0)