-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
TCP listener for statsd input #2293
Merged
Merged
Changes from 27 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
6623b4b
test for disable tag sorting
szibis 728ba11
Add tcp listener to statsd input
szibis d0ab7cd
Readme and example config updates
szibis 4282b4a
Adding default values for new arguments in doc
szibis 589e4db
Sefl stats with tcp information in name
szibis d8b20e8
Add TCP listener tests for statsd input
szibis 4be8bf0
Revert "test for disable tag sorting"
szibis 123428d
Merge remote-tracking branch 'upstream/master'
szibis a1f11b7
Add TCP listenedr for statsd PR to Changelog
szibis 07cdccb
Merge remote-tracking branch 'upstream/master'
szibis a104281
Merge remote-tracking branch 'upstream/master'
szibis 12614ca
Move changelog line from 1.3 to 1.4 info
szibis b0b459e
test for disable tag sorting
szibis f41b247
Add tcp listener to statsd input
szibis a8121e6
Readme and example config updates
szibis 4c13754
Adding default values for new arguments in doc
szibis c2e0aa0
Sefl stats with tcp information in name
szibis aba92e3
Add TCP listener tests for statsd input
szibis 228cf6a
Revert "test for disable tag sorting"
szibis dc1d190
Add TCP listenedr for statsd PR to Changelog
szibis 60ad86d
Move changelog line from 1.3 to 1.4 info
szibis 69f21fc
Merge branch 'master' of github.com:szibis/telegraf
szibis e595a04
Merge remote-tracking branch 'upstream/master'
szibis 5dc888f
Changelog update
szibis 7eb4a0f
Just closing connection on refuse with log info
szibis 7285190
Fix test by removing info in return on refuse
szibis d7095f9
Fix test by removing info in return on refuse - remove unused variables
szibis e7b4c32
Merge remote-tracking branch 'upstream/master'
szibis 036fe5d
remove duplicate line in changelog
szibis 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 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 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 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 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
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.
This line is added twice and there is a merge conflict. Recently I have been adding the changelog updates separately to avoid these merge issues, so you can just remove all changes to this file.