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

cpu collector: guest_nice #554

Merged
merged 1 commit into from
Apr 15, 2017
Merged

cpu collector: guest_nice #554

merged 1 commit into from
Apr 15, 2017

Conversation

knweiss
Copy link
Contributor

@knweiss knweiss commented Apr 12, 2017

This commit fixes #553.

Please notice that the commit may change the default behavior of the cpu collector as it adds a 10th cpu "mode" label (guest_nice) if available.

@grobie
Copy link
Member

grobie commented Apr 12, 2017

Besides fixing the end to end tests, this needs to be coordinated with #548.

@SuperQ
Copy link
Member

SuperQ commented Apr 12, 2017

I would prefer to auto-detect the number of fields, rather than have a flag for this.

'guest_nice' is available since Linux 2.6.33.
@knweiss knweiss changed the title cpu collector: guest_nice and collector.cpu.modes flag cpu collector: guest_nice Apr 14, 2017
@knweiss
Copy link
Contributor Author

knweiss commented Apr 15, 2017

I've removed the collector.cpu.modes flag commit in favour of drop actions (see #553).

What's left is the trivial guest_nice commit with fixed end2end test.

Copy link
Member

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

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

LGTM

@grobie grobie merged commit 2e7ac47 into prometheus:master Apr 15, 2017
@knweiss knweiss deleted the guest_nice branch August 14, 2017 09:11
tamcore pushed a commit to gitgrave/node_exporter that referenced this pull request Oct 22, 2024
Only aix, darwin, dragonfly freebsd and linux GOOS have a Type member in
their syscall.Statfs_t struct. However, since the isRealProc compares
that Type to a magic number (PROC_SUPER_MAGIC, 0x9fa0) which is only
relevant to Linux (and possibly FreeBSD with Linux compatibility),
adjust build tags accordingly.

This drops the previous nostatfs build tag workaround, since the
"tamago" GOOS for which it was originally added won't match the updated
build tags.

Fixes: prometheus#554.

Signed-off-by: Daniel Swarbrick <daniel.swarbrick@gmail.com>
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.

cpu collector: guest_nice and collector.cpu.modes flag
3 participants