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.

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

[collectd 6] src/memory.c: bring to feature parity with main branch #4076

Merged
merged 4 commits into from
Feb 10, 2023

Conversation

hnez
Copy link
Contributor

@hnez hnez commented Jan 11, 2023

ChangeLog: memory plugin: bring to feature parity with main branch

The memory plugin is already ported to the v6 API but some new features have been added in the main branch in the meantime.

This PR should bring the memory plugin in the collectd-6 branch to feature parity with the main branch by:

hnez and others added 3 commits December 14, 2022 08:03
…td#3916)

This ports "Report MemAvailable when present in meminfo (collectd#3916)" (848b239)
from the main branch to collectd-6.0.
This ports "Do not account reclaimable slab as used" (77e2fcd)
from the main branch to collectd-6.0

ChangeLog: memory plugin: do not account reclaimable slab as used.

Align this counter with free(1).
https://gitlab.com/procps-ng/procps/-/blob/v3.3.17/proc/sysinfo.c#L789
This ports "add laundry and user wired pages (collectd#3962)" (de33b26)
from the main branch to collectd-6.0.

Changelog: memory: report for laundry and user_wire pages on FreeBSD

Add the `vm.stats.vm.v_laundry_count` and
`vm.stats.vm.v_user_wire_count`  which have been present on FreeBSD for
a little while now.
@eero-t
Copy link
Contributor

eero-t commented Jan 11, 2023

I did not try the plugin, but it seems to support both BSD & Linux. @hnez On which one you tested it?

@mrunge I reviewed the commits. Collectd v6 plugin changes are somewhat different (due to plugin differences), but correspond to indicated v5 branch changes.

Copy link
Member

@mrunge mrunge left a comment

Choose a reason for hiding this comment

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

Thank you, this looks good to me

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants