Use golang.org/x/sys/unix instead of syscall in diskio #3384
Conversation
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
danielnelson
commented
Oct 24, 2017
plugins/inputs/system/disk.go
Outdated
| @@ -166,14 +167,13 @@ func (s *DiskIOStats) Gather(acc telegraf.Accumulator) error { | |||
| var varRegex = regexp.MustCompile(`\$(?:\w+|\{\w+\})`) | |||
|
|
|||
| func (s *DiskIOStats) diskName(devName string) string { | |||
| // if len(s.NameTemplates) == 0 { | |||
There was a problem hiding this comment.
Commented out so that the diskInfo code will still be exercised as before, will skip it when not using this option.
danielnelson
commented
Oct 24, 2017
plugins/inputs/system/disk.go
Outdated
| @@ -200,14 +200,13 @@ func (s *DiskIOStats) diskName(devName string) string { | |||
| } | |||
|
|
|||
| func (s *DiskIOStats) diskTags(devName string) map[string]string { | |||
| // if len(s.DeviceTags) == 0 { | |||
|
@jackzampolin Can you retest with this code? |
|
Just built it and pushing up to server |
|
It's hard to type but my fingers are crossed. |
|
Still no panics, and since the bug tended to present quickly I'm going to go ahead and say MERGE IT! |
danielnelson
added a commit
that referenced
this pull request
Oct 24, 2017
(cherry picked from commit 9a06249)
maxunt
pushed a commit
that referenced
this pull request
Jun 26, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pull request is currently for testing only, it might fix the crash reported in #3373, #3299.
Required for all PRs: