Skip to content

Commit 3d3b46f

Browse files
Kavindu-DodanKavindu-Dodan
committed
review suggestion
Signed-off-by: Kavindu Dodanduwa <kavindu.dodanduwa@elastic.co>
1 parent cf51943 commit 3d3b46f

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎x-pack/filebeat/_meta/config/filebeat.inputs.reference.xpack.yml.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@
144144
#log_group_name: test
145145

146146
# The prefix for a group of log group names.
147-
# You can include linked source accounts by using the property `linked_accounts_for_prefix_mode`.
147+
# You can include linked source accounts by using the property `include_linked_accounts_for_prefix_mode`.
148148
# Note: `region_name` is required when `log_group_name_prefix` is given.
149149
# `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
150150
#log_group_name_prefix: /aws/
151151

152152
# State whether to include linked source accounts when obtaining log groups matching the prefix provided through `log_group_name_prefix`
153153
# This property works together with `log_group_name_prefix` and default value (if unset) is false
154-
#linked_accounts_for_prefix_mode: true
154+
#include_linked_accounts_for_prefix_mode: true
155155

156156
# Region that the specified log group or log group prefix belongs to.
157157
#region_name: us-east-1

‎x-pack/filebeat/docs/inputs/input-aws-cloudwatch.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ Note: `region_name` is required when log_group_name is given.
5656

5757
[float]
5858
==== `log_group_name_prefix`
59-
The prefix for a group of log group names. See `linked_accounts_for_prefix_mode` option for linked source accounts behavior.
59+
The prefix for a group of log group names. See `include_linked_accounts_for_prefix_mode` option for linked source accounts behavior.
6060

6161
Note: `region_name` is required when
6262
`log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix`
6363
cannot be given at the same time. The number of workers that will process the
6464
log groups under this prefix is set through the `number_of_workers` config.
6565

6666
[float]
67-
==== `linked_accounts_for_prefix_mode`
67+
==== `include_linked_accounts_for_prefix_mode`
6868
Configure whether to include linked source accounts that contains the prefix value defined through `log_group_name_prefix`.
6969
Accepts a boolean and this is by default disabled.
7070

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3050,14 +3050,14 @@ filebeat.inputs:
30503050
#log_group_name: test
30513051

30523052
# The prefix for a group of log group names.
3053-
# You can include linked source accounts by using the property `linked_accounts_for_prefix_mode`.
3053+
# You can include linked source accounts by using the property `include_linked_accounts_for_prefix_mode`.
30543054
# Note: `region_name` is required when `log_group_name_prefix` is given.
30553055
# `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
30563056
#log_group_name_prefix: /aws/
30573057

30583058
# State whether to include linked source accounts when obtaining log groups matching the prefix provided through `log_group_name_prefix`
30593059
# This property works together with `log_group_name_prefix` and default value (if unset) is false
3060-
#linked_accounts_for_prefix_mode: true
3060+
#include_linked_accounts_for_prefix_mode: true
30613061

30623062
# Region that the specified log group or log group prefix belongs to.
30633063
#region_name: us-east-1

‎x-pack/filebeat/input/awscloudwatch/config.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ import (
1313
)
1414

1515
type config struct {
16-
harvester.ForwarderConfig `config:",inline"`
17-
LogGroupARN string `config:"log_group_arn"`
18-
LogGroupName string `config:"log_group_name"`
19-
LogGroupNamePrefix string `config:"log_group_name_prefix"`
20-
LinkedAccountsForPrefixMode *bool `config:"linked_accounts_for_prefix_mode"`
21-
RegionName string `config:"region_name"`
22-
LogStreams []*string `config:"log_streams"`
23-
LogStreamPrefix string `config:"log_stream_prefix"`
24-
StartPosition string `config:"start_position" default:"beginning"`
25-
ScanFrequency time.Duration `config:"scan_frequency" validate:"min=0,nonzero"`
26-
APITimeout time.Duration `config:"api_timeout" validate:"min=0,nonzero"`
27-
APISleep time.Duration `config:"api_sleep" validate:"min=0,nonzero"`
28-
Latency time.Duration `config:"latency"`
29-
NumberOfWorkers int `config:"number_of_workers"`
30-
AWSConfig awscommon.ConfigAWS `config:",inline"`
16+
harvester.ForwarderConfig `config:",inline"`
17+
LogGroupARN string `config:"log_group_arn"`
18+
LogGroupName string `config:"log_group_name"`
19+
LogGroupNamePrefix string `config:"log_group_name_prefix"`
20+
IncludeLinkedAccountsForPrefixMode *bool `config:"include_linked_accounts_for_prefix_mode"`
21+
RegionName string `config:"region_name"`
22+
LogStreams []*string `config:"log_streams"`
23+
LogStreamPrefix string `config:"log_stream_prefix"`
24+
StartPosition string `config:"start_position" default:"beginning"`
25+
ScanFrequency time.Duration `config:"scan_frequency" validate:"min=0,nonzero"`
26+
APITimeout time.Duration `config:"api_timeout" validate:"min=0,nonzero"`
27+
APISleep time.Duration `config:"api_sleep" validate:"min=0,nonzero"`
28+
Latency time.Duration `config:"latency"`
29+
NumberOfWorkers int `config:"number_of_workers"`
30+
AWSConfig awscommon.ConfigAWS `config:",inline"`
3131
}
3232

3333
func defaultConfig() config {

‎x-pack/filebeat/input/awscloudwatch/input.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (in *cloudwatchInput) Run(inputContext v2.Context, pipeline beat.Pipeline)
107107
if len(logGroupIDs) == 0 {
108108
// We haven't extracted group identifiers directly from the input configurations,
109109
// now fallback to provided LogGroupNamePrefix and use derived service client to derive logGroupIDs
110-
logGroupIDs, err = getLogGroupNames(svc, in.config.LogGroupNamePrefix, in.config.LinkedAccountsForPrefixMode)
110+
logGroupIDs, err = getLogGroupNames(svc, in.config.LogGroupNamePrefix, in.config.IncludeLinkedAccountsForPrefixMode)
111111
if err != nil {
112112
return fmt.Errorf("failed to get log group names from LogGroupNamePrefix: %w", err)
113113
}

0 commit comments

Comments
 (0)