Add /proc/swaps collector by fabiand · Pull Request #3428 · prometheus/node_exporter

fabiand · 2025-09-24T15:02:24Z

Building on prometheus/procfs#246 this PR is introducing metrics around swap devices.

Today metrics around swap are already available, but they are on the node level. With this PR, metrics are now available per device.

The use-case is to differentiate between different swap devices exhibiting different performance characteristics.

Relates to: #1890

fabiand · 2025-09-24T15:35:26Z

Any chance to get a quick review from you @discordianfish ?

Possibly @tiraboschi from you?

collector/swap_linux.go

fabiand · 2025-09-24T15:36:37Z

@rexagod maybe from you?

Building on prometheus/procfs#246 this PR is introducing metrics around swap devices. Today metrics around swap are already available, but they are on the node level. With this PR, metrics are now available per device. Relates to: prometheus#1890 Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org> Co-authored-by: claude.ai

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

collector/swap_linux.go

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

fabiand · 2025-09-30T06:41:53Z

Morning. Is there something else that is missing?

collector/swap_linux_test.go

tiraboschi · 2025-09-30T09:10:20Z

Morning. Is there something else that is missing?

I think we have also to announce it on README.md

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

fabiand · 2025-09-30T09:13:23Z

Good point, thanks. Added to README and CHANGELOG

collector/swap_linux.go

README.md

CHANGELOG.md

collector/swap_linux.go

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

fabiand · 2025-10-06T12:00:26Z

Argh. making lint happy.

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

simonpasquier

LGTM

SuperQ

Minor nit, otherwise LGTM.

collector/swap_linux.go

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

collector/swap_linux.go

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

fabiand · 2025-10-06T15:41:15Z

Thanks a lot for the reviews!

SuperQ · 2025-10-06T17:41:39Z

Going to ignore the broken FreeBSD build, seems unrelated.

* [CHANGE] mdadm: Use sysfs for RAID metrics #3031 * [CHANGE] filesystem: Add erofs in default excluded fs #3313 * [CHANGE] tcpstat: Use std lib binary.NativeEndian #3386 * [FEATURE] pcidevice: Add new collector for PCIe devices #3339 * [FEATURE] AIX: Add more metrics #3338 * [FEATURE] systemd: Add Virtualization metrics #3254 * [FEATURE] swaps: Add new collector #3428 * [ENHANCEMENT] filesystem: Take super options into account for read-only #3387 * [ENHANCEMENT] perf: Add tlb_data metrics #3436 * [BUGFIX] interrupts: Fix OpenBSD interrupt device parsing #3288 * [BUGFIX] diskstats: Simplify condition #3290 * [BUGFIX] thermal: Sanitize darwin thermal strings #3294 * [BUGFIX] filesystem: Fix Darwin collector cgo memory leak #3315 * [BUGFIX] ethtool: Fix returning 0 for sanitized metrics #3335 * [BUGFIX] netdev: Fix Darwin netdev i/o bytes metric #3336 * [BUGFIX] systemd: Fix logging race #3364 * [BUGFIX] filesystem: Fix duplicate Darwin CGO import #3391 Signed-off-by: Ben Kochie <superq@gmail.com>

fabiand commented Sep 24, 2025

View reviewed changes

collector/swap_linux.go Show resolved Hide resolved

fabiand added 3 commits September 24, 2025 17:37

swap: Disable by default

a32e918

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Refactor and add tests

02a8a2d

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

fabiand force-pushed the add-swaps branch from 12a58ae to 02a8a2d Compare September 24, 2025 15:39

SuperQ reviewed Sep 27, 2025

View reviewed changes

collector/swap_linux.go Outdated Show resolved Hide resolved

swap: Adjust copyright date

15c6026

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

tiraboschi reviewed Sep 30, 2025

View reviewed changes

collector/swap_linux_test.go Outdated Show resolved Hide resolved

fabiand added 2 commits September 30, 2025 11:10

swap: Drop year

08b1b86

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Add to README and CHANGELOG

0361693

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

tiraboschi approved these changes Sep 30, 2025

View reviewed changes

simonpasquier reviewed Oct 6, 2025

View reviewed changes

collector/swap_linux.go Outdated Show resolved Hide resolved

collector/swap_linux.go Outdated Show resolved Hide resolved

collector/swap_linux.go Outdated Show resolved Hide resolved

machine424 reviewed Oct 6, 2025

View reviewed changes

collector/swap_linux.go Outdated Show resolved Hide resolved

fabiand force-pushed the add-swaps branch from 565997b to e5fb4aa Compare October 6, 2025 09:27

machine424 reviewed Oct 6, 2025

View reviewed changes

README.md Outdated Show resolved Hide resolved

machine424 reviewed Oct 6, 2025

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

machine424 reviewed Oct 6, 2025

View reviewed changes

collector/swap_linux.go Outdated Show resolved Hide resolved

fabiand added 7 commits October 6, 2025 12:58

swap: Provide initial length

ad75e79

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Move priority to Gauge

c774f2d

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Specify field names

aa71c94

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Ref unusual size

075c3d4

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Adjust README

1983b75

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Drop changelog

2d6e574

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Drop needless build info

2a3a3c7

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

fabiand force-pushed the add-swaps branch from c3a6fb3 to 2a3a3c7 Compare October 6, 2025 10:59

swap: Fix indentation

4386d1a

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

swap: Adjust build config

af29cfd

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

simonpasquier approved these changes Oct 6, 2025

View reviewed changes

SuperQ requested changes Oct 6, 2025

View reviewed changes

collector/swap_linux.go Outdated Show resolved Hide resolved

swap: Rename label type to swap_type

b55b4e4

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

SuperQ reviewed Oct 6, 2025

View reviewed changes

collector/swap_linux.go Outdated Show resolved Hide resolved

swap: Golanigfy

4697358

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>

SuperQ approved these changes Oct 6, 2025

View reviewed changes

SuperQ merged commit 771c3d4 into prometheus:master Oct 6, 2025
16 of 19 checks passed

SuperQ mentioned this pull request Oct 22, 2025

Release v1.10.0 #3446

Merged

Comments

Conversation

fabiand commented Sep 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fabiand commented Sep 24, 2025

Uh oh!

Uh oh!

fabiand commented Sep 24, 2025

Uh oh!

Uh oh!

fabiand commented Sep 30, 2025

Uh oh!

Uh oh!

tiraboschi commented Sep 30, 2025

Uh oh!

fabiand commented Sep 30, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fabiand commented Oct 6, 2025

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

SuperQ left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

fabiand commented Oct 6, 2025

Uh oh!

SuperQ commented Oct 6, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fabiand commented Sep 24, 2025 •

edited

Loading