-
Notifications
You must be signed in to change notification settings - Fork 5.8k
feat(agent): Add structured_log_add_input_tags. Adds the input tags into the logger JSON output.
#18611
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
Closed
Closed
feat(agent): Add structured_log_add_input_tags. Adds the input tags into the logger JSON output.
#18611
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
40fba61
Added tags into log output
60f9f18
Changed variables to a better naming convention
2f44f03
Fixed issue with config parsing order
c354cf1
Added documentation for structured_log_add_input_tags
6e9ff99
Merge branch 'influxdata:master' into master
Zegorax ab0e424
Fixed identation in CONFIGURATION.md
20829eb
Fixed linting issues in CONFIGURATION.md
162b414
Fixed trailing spaces
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,6 +54,9 @@ func NewRunningInput(input telegraf.Input, config *InputConfig) *RunningInput { | |
| if err := logger.SetLogLevel(config.LogLevel); err != nil { | ||
| logger.Error(err) | ||
| } | ||
| if config.AddTagsToStructuredLogs && len(config.Tags) > 0 { | ||
| logger.AddAttribute("tags", config.Tags) | ||
| } | ||
| SetLoggerOnPlugin(input, logger) | ||
| SetStatisticsOnPlugin(input, logger, tags) | ||
|
|
||
|
|
@@ -110,6 +113,10 @@ type InputConfig struct { | |
| Filter Filter | ||
| AlwaysIncludeLocalTags bool | ||
| AlwaysIncludeGlobalTags bool | ||
|
|
||
| // When true and using logformat = "structured", the input's tags are | ||
| // added to the log output as a "tags" JSON field. | ||
| AddTagsToStructuredLogs bool | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This means it is configurable per input? Then it needs to be documented in the Input Plugins section of CONFIGURATION.md as well. |
||
| } | ||
|
|
||
| func (*RunningInput) metricFiltered(metric telegraf.Metric) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.