Merged
Conversation
Signed-off-by: Hannes Körber <[email protected]>
hakoerber
force-pushed
the
enable-nfs-protocol
branch
2 times, most recently
from
66003a0 to
4abfb3b
Compare
In prometheus/procfs#100, the NFSTransportStats struct was expanded by a field called protocol that specifies the NFS protocol in use, either "tcp" or "udp". This commit adds the protocol as a label to all NFS metrics exported via the mountstats collector. Signed-off-by: Hannes Körber <[email protected]>
hakoerber
force-pushed
the
enable-nfs-protocol
branch
from
62c58d5 to
bb8023a
Compare
Signed-off-by: Hannes Körber <[email protected]>
oblitorum
pushed a commit
to shatteredsilicon/node_exporter
that referenced
this pull request
Apr 9, 2024
* vendor: Update prometheus/procfs Signed-off-by: Hannes Körber <[email protected]> * mountstats: Use new NFS protocol field In prometheus/procfs#100, the NFSTransportStats struct was expanded by a field called protocol that specifies the NFS protocol in use, either "tcp" or "udp". This commit adds the protocol as a label to all NFS metrics exported via the mountstats collector. Signed-off-by: Hannes Körber <[email protected]> * Update fixtures for UDP mount Signed-off-by: Hannes Körber <[email protected]>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 enables exporting of the NFS procotol (TCP or UDP) as a label.
In prometheus/procfs#100, the
NFSTransportStatsstruct was expanded by a field called protocol that specifies the NFS protocol in use, eithertcporudp. This pull request adds the protocol as a label to all NFS metrics exported via themountstatscollector.It also updates the deduplication logic to not only dedupe by export, but also take the protocol into consideration. This means that the same export being mounted twice, once using TCP and once UDP would be exported twice. I think this is desired behaviour.
It also updates the vendoring of prometheus/procfs from
780932d4fbbe0e69b84c34c20f5c8d0981e109ea. That includes the following commits:Also pinging @arsenakishev who did similar changes in #994. Maybe we can work together to get our changes merged?
Closes #996