Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[collectd 6] Swap plugin: Migrate to collectd 6 data structures. #4190

Merged
merged 15 commits into from
Jan 26, 2024
Merged

[collectd 6] Swap plugin: Migrate to collectd 6 data structures. #4190

merged 15 commits into from
Jan 26, 2024

Conversation

octo
Copy link
Member

@octo octo commented Dec 14, 2023

This is a replacement for #3815.

ChangeLog: swap plugin: Migration to v6.0.

@octo octo requested a review from a team as a code owner December 14, 2023 19:56
@collectd-bot collectd-bot added this to the 6.0 milestone Dec 14, 2023
@octo octo changed the title [collectd 6] swap: migration to v6.0 [collectd 6] Swap plugin: Migrate to collectd 6 data structures. Dec 14, 2023
@octo octo mentioned this pull request Dec 14, 2023
Open
5 tasks
@octo octo linked an issue Dec 14, 2023 that may be closed by this pull request
[collectd 6] Migrate the swap plugin #3715
Open
5 tasks
@eero-t
Copy link
Contributor

eero-t commented Dec 15, 2023

@mrunge could you check this one?

@octo octo mentioned this pull request Dec 19, 2023
Open
@octo octo force-pushed the 6/swap branch 2 times, most recently from 5baa427 to 305b92b Compare December 27, 2023 09:24
@eero-t
Copy link
Contributor

eero-t commented Dec 27, 2023 •
edited

I think it would be better to merge #4198 first.

@octo octo force-pushed the 6/swap branch 3 times, most recently from 8f6ee5c to e02789e Compare January 15, 2024 19:42
@octo octo added this to In progress in collectd 6 via automation Jan 15, 2024
@octo octo added the Feature label Jan 15, 2024
@octo
Copy link
Member Author

octo commented Jan 23, 2024

I think it would be better to merge #4198 first.

That PR has been merged. PTAL.

eero-t
eero-t requested changes Jan 26, 2024
View reviewed changes
Copy link
Contributor

@eero-t eero-t left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks ok, but swap_submit_* functions do not submit (or dispatch) metrics, they only append them => maybe the function names should change also in addition to their signature?

src/collectd.conf.pod Outdated Show resolved Hide resolved
src/collectd.conf.in Outdated Show resolved Hide resolved
@octo
Copy link
Member Author

octo commented Jan 26, 2024

Code looks ok, but swap_submit_* functions do not submit (or dispatch) metrics, they only append them => maybe the function names should change also in addition to their signature?

Thanks for the review! I have renamed swap_submit_* to swap_append_* to better describe what these functions are doing.

manuelluis and others added 10 commits January 26, 2024 14:32
@manuelluis @octo
ChangeLog: swap: plugin: migration to v6.0
404bdb3
@manuelluis @octo
Fix error message
5029473
@manuelluis @octo
Declare metric families as an array
f6a9078
@octo
swap plugin: Group metrics into fewer metric families.
9f90a34 
This should align this plugin with the OpenTelemetry semantic conventions:
https://opentelemetry.io/docs/specs/semconv/system/system-metrics/#pagingswap-metrics
@octo
swap plugin: Use different metric families for I/O reporting in bytes.
555ef57 
Depending on the "ReportIO" setting, the plugin may emit paging operations
or bytes. Use a different metric family for these two metrics.

This also moves the decision whether or not to report I/O to the
`swap_submit_io`. This fixes a bug on NetBSD where I/O was reported
even if "ReportIO" was set to false.
@octo
swap plugin: Use constants for label names and well-known label values.
c4454f3
@octo
swap plugin: Add descriptions to metric families.
886ea28
@octo
swap plugin: Add the ReportUsage and ReportUtilization config opt…
1c14499 
…ions.
@octo
swap plugin: Populate the unit field.
8b831b3
@octo
swap plugin: Report utilization as fraction of one.
72fa4c9
@octo octo added the Automerge Labels PRs to be merged by a bot once approved label Jan 26, 2024
eero-t
eero-t requested changes Jan 26, 2024
View reviewed changes
src/swap.c Outdated Show resolved Hide resolved
@octo octo merged commit 08a2a01 into collectd:collectd-6.0 Jan 26, 2024
27 checks passed
collectd 6 automation moved this from In progress to Done Jan 26, 2024
@octo octo deleted the 6/swap branch January 26, 2024 15:04
@octo octo changed the title [collectd 6] Swap plugin: Migrate to collectd 6 data structures. [collectd 6] Swap plugin: Migrate to collectd 6 data structures. Jan 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eero-t eero-t eero-t approved these changes

Assignees
No one assigned
Labels
Automerge Labels PRs to be merged by a bot once approved Feature
Projects
collectd 6
  
Done
Milestone
6.0
Development

Successfully merging this pull request may close these issues.

[collectd 6] Migrate the swap plugin
4 participants
@octo @eero-t @collectd-bot @manuelluis