fix(inputs.zfs): Gathering poolMetrics failed on zfs 2.2.0 #14280
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
|
Thanks so much for the pull request! |
delichik
changed the title
delichik
changed the title
|
!signed-cla |
srebhan
reviewed
Nov 13, 2023
plugins/inputs/zfs/zfs_linux.go
Outdated
Comment on lines
86
to
88
| func gather(lines []string, fileLines int) ([]string, []string, error) { | ||
| if len(lines) != fileLines { | ||
| return nil, nil, errors.New("expected lines in kstat does not match") | ||
| func gather(lines []string, minimalFileLines int) ([]string, []string, error) { | ||
| if len(lines) < minimalFileLines { | ||
| return nil, nil, errors.New("lines in kstat is not enough") |
There was a problem hiding this comment.
Can you please minimize the changes here by keeping the parameter-name fileLines instead of renaming it!?! The same holds true for the error message.
plugins/inputs/zfs/README.md
Outdated
Comment on lines
226
to
252
| For ZFS >= 2.2.x the format has changed significantly: | ||
|
|
||
| - zfs_pool | ||
| - writes (integer, count) | ||
| - nwritten (integer, bytes) | ||
| - reads (integer, count) | ||
| - nread (integer, bytes) | ||
| - nunlinks (integer, count) | ||
| - nunlinked (integer, count) | ||
| - zil_commit_count (integer, count) | ||
| - zil_commit_writer_count (integer, count) | ||
| - zil_itx_count (integer, count) | ||
| - zil_itx_indirect_count (integer, count) | ||
| - zil_itx_indirect_bytes (integer, bytes) | ||
| - zil_itx_copied_count (integer, count) | ||
| - zil_itx_copied_bytes (integer, bytes) | ||
| - zil_itx_needcopy_count (integer, count) | ||
| - zil_itx_needcopy_bytes (integer, bytes) | ||
| - zil_itx_metaslab_normal_count (integer, count) | ||
| - zil_itx_metaslab_normal_bytes (integer, bytes) | ||
| - zil_itx_metaslab_normal_write (integer, bytes) | ||
| - zil_itx_metaslab_normal_alloc (integer, bytes) | ||
| - zil_itx_metaslab_slog_count (integer, count) | ||
| - zil_itx_metaslab_slog_bytes (integer, bytes) | ||
| - zil_itx_metaslab_slog_write (integer, bytes) | ||
| - zil_itx_metaslab_slog_alloc (integer, bytes) | ||
|
|
There was a problem hiding this comment.
Maybe
Suggested change
| For ZFS >= 2.2.x the format has changed significantly: | |
| - zfs_pool | |
| - writes (integer, count) | |
| - nwritten (integer, bytes) | |
| - reads (integer, count) | |
| - nread (integer, bytes) | |
| - nunlinks (integer, count) | |
| - nunlinked (integer, count) | |
| - zil_commit_count (integer, count) | |
| - zil_commit_writer_count (integer, count) | |
| - zil_itx_count (integer, count) | |
| - zil_itx_indirect_count (integer, count) | |
| - zil_itx_indirect_bytes (integer, bytes) | |
| - zil_itx_copied_count (integer, count) | |
| - zil_itx_copied_bytes (integer, bytes) | |
| - zil_itx_needcopy_count (integer, count) | |
| - zil_itx_needcopy_bytes (integer, bytes) | |
| - zil_itx_metaslab_normal_count (integer, count) | |
| - zil_itx_metaslab_normal_bytes (integer, bytes) | |
| - zil_itx_metaslab_normal_write (integer, bytes) | |
| - zil_itx_metaslab_normal_alloc (integer, bytes) | |
| - zil_itx_metaslab_slog_count (integer, count) | |
| - zil_itx_metaslab_slog_bytes (integer, bytes) | |
| - zil_itx_metaslab_slog_write (integer, bytes) | |
| - zil_itx_metaslab_slog_alloc (integer, bytes) | |
| For ZFS >= 2.2.x the following additional fields are available: | |
| - additional fields for ZFS > 2.2.x | |
| - zil_commit_count (integer, count) | |
| - zil_commit_writer_count (integer, count) | |
| - zil_itx_count (integer, count) | |
| - zil_itx_indirect_count (integer, count) | |
| - zil_itx_indirect_bytes (integer, bytes) | |
| - zil_itx_copied_count (integer, count) | |
| - zil_itx_copied_bytes (integer, bytes) | |
| - zil_itx_needcopy_count (integer, count) | |
| - zil_itx_needcopy_bytes (integer, bytes) | |
| - zil_itx_metaslab_normal_count (integer, count) | |
| - zil_itx_metaslab_normal_bytes (integer, bytes) | |
| - zil_itx_metaslab_normal_write (integer, bytes) | |
| - zil_itx_metaslab_normal_alloc (integer, bytes) | |
| - zil_itx_metaslab_slog_count (integer, count) | |
| - zil_itx_metaslab_slog_bytes (integer, bytes) | |
| - zil_itx_metaslab_slog_write (integer, bytes) | |
| - zil_itx_metaslab_slog_alloc (integer, bytes) | |
srebhan
added
area/agent
plugin/input
you are right. thanks a lot |
srebhan
added
the
ready for final review
powersj
reviewed
Nov 13, 2023
powersj
approved these changes
Nov 13, 2023
|
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 |
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.
resolves #14279