Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[exporter/awsemfexporter] add tags feature for Cloudwatch Log Group #19406

Merged
merged 29 commits into from
May 11, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
52e29ba
Add set tags to config
humivo Mar 3, 2023
639d0c1
Add config to cloudwatchlogsexporter too
humivo Mar 7, 2023
e25c61f
Add unit testing to aws emf
humivo Mar 8, 2023
08215ec
Add unit testing for other code changes and update README
humivo Mar 8, 2023
fb8c6c7
Add chlog entry
humivo Mar 8, 2023
e5c93d7
Merge branch 'main' into SetTagsLogGroup
humivo Mar 8, 2023
9792497
Fix issue number
humivo Mar 8, 2023
d086990
Change naming to accountID
humivo Mar 8, 2023
a56ab0c
Add sts endpoint and fix validate func
humivo Mar 16, 2023
80c0914
Fix import
humivo Mar 16, 2023
1af294c
Merge branch 'main' into SetTagsLogGroup
humivo Mar 16, 2023
6a72fec
Add comments to client code
humivo Mar 16, 2023
0e32886
Move functions to utils.go
humivo Mar 28, 2023
2ab601c
Remove line
humivo Mar 28, 2023
37403f4
Change tags call
humivo Apr 26, 2023
aa69c3d
Merge branch 'main' into SetTagsLogGroup
humivo Apr 26, 2023
57be341
Fix code after merge
humivo Apr 26, 2023
2ac02ce
Fix spelling error
humivo Apr 26, 2023
3576ddb
gci the file
humivo Apr 26, 2023
c3acf58
gci the exporter files
humivo Apr 26, 2023
71eb45c
Add gci option prefix
humivo Apr 26, 2023
27a640a
Add comment to cwlog_client
humivo Apr 27, 2023
ed6562f
Address comments on PR
humivo Apr 27, 2023
3701061
Improve testing
humivo May 9, 2023
18dacb3
Run gci command
humivo May 9, 2023
5a64e2d
Merge branch 'main' into SetTagsLogGroup
humivo May 9, 2023
5e99c16
Fix license header
humivo May 9, 2023
71e81c3
Simplify return statement
humivo May 11, 2023
26df4c3
Run gci command on code
humivo May 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Simplify return statement
  • Loading branch information
humivo committed May 11, 2023
commit 71e81c36352299cb4401cb1d2da39c2ea8534de7
6 changes: 2 additions & 4 deletions exporter/awscloudwatchlogsexporter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,8 @@ func (config *Config) Validate() error {
if retErr := cwlogs.ValidateRetentionValue(config.LogRetention); retErr != nil {
return retErr
}
if tagInputErr := cwlogs.ValidateTagsInput(config.Tags); tagInputErr != nil {
return tagInputErr
}
return nil
return cwlogs.ValidateTagsInput(config.Tags)

}

func (config *Config) enforcedQueueSettings() exporterhelper.QueueSettings {
Expand Down
7 changes: 2 additions & 5 deletions exporter/awsemfexporter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,8 @@ func (config *Config) Validate() error {
return retErr
}

if tagInputErr := cwlogs.ValidateTagsInput(config.Tags); tagInputErr != nil {
return tagInputErr
}

return nil
return cwlogs.ValidateTagsInput(config.Tags)

}

func newEMFSupportedUnits() map[string]interface{} {
Expand Down
Loading