fix(inputs.zfs): Parse metrics correctly on FreeBSD 14#14176
Merged
powersj merged 1 commit intoinfluxdata:masterfrom Oct 25, 2023
Merged
fix(inputs.zfs): Parse metrics correctly on FreeBSD 14#14176powersj merged 1 commit intoinfluxdata:masterfrom
powersj merged 1 commit intoinfluxdata:masterfrom
Conversation
This was referenced Oct 24, 2023
Closed
Contributor
|
Download PR build artifacts for linux_amd64.tar.gz, darwin_amd64.tar.gz, and windows_amd64.zip. 📦 Click here to get additional PR build artifactsArtifact URLs |
powersj
approved these changes
Oct 25, 2023
powersj
pushed a commit
that referenced
this pull request
Nov 13, 2023
(cherry picked from commit 57eb716)
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
2 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.
resolves #14151
resolves #11089
This PR handles newer versions of FreeBSD (i.e. 14+) correctly where the
vdev_cache_statsmetric is no longer available and zfs outputs-signs instead of numbers when run with-p. Anyway, the PR makes the parsing more robust by treating dashes as zero values and by monitoring the success of sysctl calls. If the later is not successful, a warning is issued and the metric is removed from the set of collectable metrics.