Skip to content

meminfo: Fix the size mismatch in the swapTotal check mib for BSD.#1345

Merged
SuperQ merged 1 commit intoprometheus:masterfrom
phyber:bsd-meminfo-collector-size-fix
May 14, 2019
Merged

meminfo: Fix the size mismatch in the swapTotal check mib for BSD.#1345
SuperQ merged 1 commit intoprometheus:masterfrom
phyber:bsd-meminfo-collector-size-fix

Conversation

@phyber
Copy link
Contributor

@phyber phyber commented May 14, 2019

This PR fixes #1344

The size of the sysctl call during the MIB name check was wrong, causing this check to fail on FreeBSD (and probably on DragonFly too, failure was expected there, but probably not this failure).

This PR fixes things so that the size of the sysctl call matches the documented dataType of bsdSysctlTypeUint64 from the array of sysctls.

@phyber phyber force-pushed the bsd-meminfo-collector-size-fix branch from 041ad0a to d35ded0 Compare May 14, 2019 10:16
@SuperQ
Copy link
Member

SuperQ commented May 14, 2019

Good find, thanks for the fix. Would you please add a [BUGFIX] CHANGELOG.md entry to the top?

Signed-off-by: David O'Rourke <david.orourke@gmail.com>
@phyber phyber force-pushed the bsd-meminfo-collector-size-fix branch from d35ded0 to b9d47c6 Compare May 14, 2019 16:10
@phyber
Copy link
Contributor Author

phyber commented May 14, 2019

Done! 👍

@SuperQ SuperQ added this to the v0.18.1 milestone May 14, 2019
@SuperQ SuperQ merged commit 814ef06 into prometheus:master May 14, 2019
SuperQ pushed a commit that referenced this pull request Jun 4, 2019
…1345)

Signed-off-by: David O'Rourke <david.orourke@gmail.com>
@SuperQ SuperQ mentioned this pull request Jun 4, 2019
SuperQ pushed a commit that referenced this pull request Jun 4, 2019
…1345)

Signed-off-by: David O'Rourke <david.orourke@gmail.com>
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
oblitorum pushed a commit to shatteredsilicon/node_exporter that referenced this pull request Apr 9, 2024
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.

meminfo collector broken on FreeBSD

2 participants