[collectd 6] disk: migration to v6.0 #4075
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
git cherry-pick f703a4a ("disk: add utilization (collectd#3967)") from the collectd 5 branch on top of the collectd 6 version of the plugin. Original commit message: * added disk utilization * fix disk utilization * fix interval back to ms
…ated in favor of `IOMainPort`"
git cherry-pick 2711ebe7d671c ("In macOS 12, `IOMasterPort` is deprecated in favor of `IOMainPort`")
from the collectd 5 branch on top of the collectd 6 version of the plugin.
Original commit message:
In macOS 12, `IOMasterPort` is deprecated in favor of `IOMainPort`
```
src/battery.c:250:7: error: 'kIOMasterPortDefault' is deprecated: first deprecated in macOS 12.0 [-Werror,-Wdeprecated-declarations]
kIOMasterPortDefault, IOServiceNameMatching("battery"), &iterator);
^~~~~~~~~~~~~~~~~~~~
kIOMainPortDefault
```
|
I didn't read through this so carefully, but couldn't correct types be used for the variables instead of casting them? (Add also clang-format commit.) |
|
Hi @eero-t, I've been busy with other things/on vacation, but I am back at work now and will look into it. |
mrunge
approved these changes
Feb 11, 2023
|
thank you very much! |
5 tasks
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.
ChangeLog: disk plugin: migration to v6.0
This PR takes up the work by @manuelluis in #3809, rebases it on top of the most recent
collectd-6-branch and cherry-picks the two commits affecting this plugin from themainbranch that were added in the meantime (#3967 and #4025).This should bring the plugin to feature parity with the
mainbranch.Issue #3620 tracks the
diskplugin migration progress. As far as I can tell this PR should tick the Update the exec plugin to produce a metric_family_t check mark.