Add docker diskio stats on Windows #8126
Merged
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
jsoriano
force-pushed
the
docker-diskio-windows
branch
from
9656e4d
to
e07941c
Compare
jsoriano
force-pushed
the
docker-diskio-windows
branch
4 times, most recently
from
8b0773b
to
9f9dfed
Compare
jsoriano
force-pushed
the
docker-diskio-windows
branch
from
9f9dfed
to
67fbc42
Compare
|
I'm thinking now that it'd be better if the module collected metrics from all OSs instead of having two different metrics, as one metricbeat can be collecting from a docker server in a different OS. |
houndci-bot
reviewed
Aug 28, 2018
| type BlkioRaw struct { | ||
| Time time.Time | ||
| reads uint64 | ||
| writes uint64 | ||
| totals uint64 | ||
| } | ||
|
|
||
| func (s *BlkioRaw) Add(o *BlkioRaw) { |
There was a problem hiding this comment.
exported method BlkioRaw.Add should have comment or be unexported
| @@ -36,13 +36,28 @@ type BlkioStats struct { | |||
| servicedBytes BlkioRaw | |||
| } | |||
|
|
|||
| func (s *BlkioStats) Add(o *BlkioStats) { | |||
There was a problem hiding this comment.
exported method BlkioStats.Add should have comment or be unexported
jsoriano
added
review
and removed
in progress
exekias
approved these changes
Aug 28, 2018
ruflin
approved these changes
Aug 29, 2018
|
@jsoriano Does this need a backport label? |
|
Yes, I will backport it for 6.x |
jsoriano
added
the
needs_backport
jsoriano
added a commit
to jsoriano/beats
that referenced
this pull request
Aug 29, 2018
Docker stats use a different data structure for blkio stats in Windows, the main difference is that in posix systems (Linux at least) stats are separated by device by Major/Minor (lists of BlkioStatsEntry), and in Windows they are directly summarized by reads and writes, by operations and volume (StorageStats). This change counts the metrics of both data structures and aggregates the result. Fixes elastic#6815 (cherry picked from commit 63f25a4)
jsoriano
removed
the
needs_backport
jsoriano
added a commit
that referenced
this pull request
Aug 29, 2018
Docker stats use a different data structure for blkio stats in Windows, the main difference is that in posix systems (Linux at least) stats are separated by device by Major/Minor (lists of BlkioStatsEntry), and in Windows they are directly summarized by reads and writes, by operations and volume (StorageStats). This change counts the metrics of both data structures and aggregates the result. Fixes #6815 (cherry picked from commit 63f25a4)
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.
Docker stats use a different data structure for blkio stats in Windows, the main difference is that in posix systems (Linux at least) stats are separated by device by Major/Minor (lists of BlkioStatsEntry), and in Windows they are directly summarized by reads and writes, by operations and volume (StorageStats).
This change counts the metrics of both data structures and aggregates the result.
Fixes #6815