Refactor diskstats #2141
Merged
Refactor diskstats #2141
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
added 3 commits
September 14, 2021 17:02
Signed-off-by: W. Andrew Denton <git@flying-snail.net>
Signed-off-by: W. Andrew Denton <git@flying-snail.net>
Signed-off-by: W. Andrew Denton <git@flying-snail.net>
| ) | ||
|
|
||
| func TestDiskStats(t *testing.T) { | ||
| file, err := os.Open("fixtures/proc/diskstats") | ||
| type testDiskStatsCollector struct { |
There was a problem hiding this comment.
Might make sense to have a package for this style of testing that works for other collectors as well, but that's all good for now I'd say.
There was a problem hiding this comment.
I realized I had mostly reimplemented testutil.GatherAndCompare(), so I dropped most of this code in favor of that. My plan is to refactor at least ethtool_linux_test to use this method, I'll include a common mechanism then. It doesn't belong in e.g. exporter-toolkit though because most of this code is just a wrapper for node_exporter's Collector type (Update()) to make it compatible with prometheus' Collector type (Describe() and Collect()).
discordianfish
approved these changes
Sep 17, 2021
added 2 commits
September 17, 2021 11:17
Signed-off-by: W. Andrew Denton <git@flying-snail.net>
…most of what was here before. Signed-off-by: W. Andrew Denton <git@flying-snail.net>
oblitorum
pushed a commit
to shatteredsilicon/node_exporter
that referenced
this pull request
Apr 9, 2024
* Refactor diskstats_linux to use procfs. * Add `node_disk_info` metric. Signed-off-by: W. Andrew Denton <git@flying-snail.net> Co-authored-by: W. Andrew Denton <git@flying-snail.net>
oblitorum
pushed a commit
to shatteredsilicon/node_exporter
that referenced
this pull request
Apr 9, 2024
* Refactor diskstats_linux to use procfs. * Add `node_disk_info` metric. Signed-off-by: W. Andrew Denton <git@flying-snail.net> Co-authored-by: W. Andrew Denton <git@flying-snail.net>
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 refactors diskstats to use procfs. It is laying the groundwork for adding device-mapper metadata from #885 using prometheus/procfs/pull/412.
There is no user-visible change except for the addition of a new node_disk_info metric. I'm undecided if this should even be here at this point. Major/minor numbers aren't very useful. And maybe it should be
{dev="252:2"}instead? Opinions?Also of note, the tests have been rewritten in a way I'm finally happy with. What do you think of the approach to fully render all the metrics to text and assert that the strings match?
Signed-off-by: W. Andrew Denton git@flying-snail.net