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

collector/cpu: s/cpu_ticks*/cpu_nsec* for solaris #2963

Merged
merged 1 commit into from
May 15, 2024
Merged

collector/cpu: s/cpu_ticks*/cpu_nsec* for solaris #2963

merged 1 commit into from
May 15, 2024

Conversation

rexagod
Copy link
Contributor

@rexagod rexagod commented Mar 19, 2024

Replace all cpu_ticks_* with cpu_nsec_*, since the former was off my a magnitude of 10e6, and showed incorrect values for node_cpu_seconds_total.

Fixes: #1837

discordianfish
discordianfish approved these changes Mar 21, 2024
View reviewed changes
Copy link
Member

@discordianfish discordianfish left a comment

Choose a reason for hiding this comment

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

LGTM

SuperQ
SuperQ reviewed Apr 21, 2024
View reviewed changes
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.

Hmm, it doesn't look like we're converting nanoseconds to seconds. Shouldn't the kstatValue be divided?

@rexagod
collector/cpu: s/cpu_ticks*/cpu_nsec* for solaris
9245efd 
Replace all cpu_ticks_* with cpu_nsec_*, since the former was off my a
magnitude of 10e6, and showed incorrect values for
node_cpu_seconds_total.

Fixes: prometheus#1837

Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
@rexagod rexagod requested a review from SuperQ May 14, 2024 22:41
@SuperQ SuperQ merged commit 66fab10 into prometheus:master May 15, 2024
7 checks passed
SuperQ added a commit that referenced this pull request May 16, 2024
@SuperQ
Release v1.8.1
fad5454 
* [BUGFIX] Fix CPU seconds on Solaris #2963
* [BUGFIX] Fix pressure collector nil reference #3016
* [BUGFIX] Sign Darwin/MacOS binaries #3008

Signed-off-by: Ben Kochie <superq@gmail.com>
@SuperQ SuperQ mentioned this pull request May 16, 2024
Merged
SuperQ added a commit that referenced this pull request May 16, 2024
@SuperQ
Release v1.8.1
dbda33d 
* [BUGFIX] Fix CPU seconds on Solaris #2963
* [BUGFIX] Sign Darwin/MacOS binaries #3008
* [BUGFIX] Fix pressure collector nil reference #3016

Signed-off-by: Ben Kochie <superq@gmail.com>
SuperQ added a commit that referenced this pull request May 21, 2024
@SuperQ
Release v1.8.1 (#3018)
0d3400e 
* [BUGFIX] Fix CPU seconds on Solaris #2963
* [BUGFIX] Sign Darwin/MacOS binaries #3008
* [BUGFIX] Fix pressure collector nil reference #3016

Signed-off-by: Ben Kochie <superq@gmail.com>
SuperQ pushed a commit that referenced this pull request May 21, 2024
@rexagod @SuperQ
collector/cpu: s/cpu_ticks*/cpu_nsec* for solaris (#2963)
892b696 
Replace all cpu_ticks_* with cpu_nsec_*, since the former was off my a
magnitude of 10e6, and showed incorrect values for
node_cpu_seconds_total.

Fixes: #1837

Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
SuperQ added a commit that referenced this pull request May 21, 2024
@SuperQ
Release v1.8.1 (#3018)
3fa877a 
* [BUGFIX] Fix CPU seconds on Solaris #2963
* [BUGFIX] Sign Darwin/MacOS binaries #3008
* [BUGFIX] Fix pressure collector nil reference #3016

Signed-off-by: Ben Kochie <superq@gmail.com>
@SuperQ SuperQ mentioned this pull request May 21, 2024
Merged
SuperQ pushed a commit that referenced this pull request May 21, 2024
@rexagod @SuperQ
collector/cpu: s/cpu_ticks*/cpu_nsec* for solaris (#2963)
fa63422 
Replace all cpu_ticks_* with cpu_nsec_*, since the former was off my a
magnitude of 10e6, and showed incorrect values for
node_cpu_seconds_total.

Fixes: #1837

Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
SuperQ added a commit that referenced this pull request May 21, 2024
@SuperQ
Release v1.8.1 (#3018)
81b00bb 
* [BUGFIX] Fix CPU seconds on Solaris #2963
* [BUGFIX] Sign Darwin/MacOS binaries #3008
* [BUGFIX] Fix pressure collector nil reference #3016

Signed-off-by: Ben Kochie <superq@gmail.com>
SuperQ pushed a commit that referenced this pull request May 21, 2024
@rexagod @SuperQ
collector/cpu: s/cpu_ticks*/cpu_nsec* for solaris (#2963)
e824cde 
Replace all cpu_ticks_* with cpu_nsec_*, since the former was off my a
magnitude of 10e6, and showed incorrect values for
node_cpu_seconds_total.

Fixes: #1837

Signed-off-by: Pranshu Srivastava <rexagod@gmail.com>
SuperQ added a commit that referenced this pull request May 21, 2024
@SuperQ
Release v1.8.1 (#3018)
400c397 
* [BUGFIX] Fix CPU seconds on Solaris #2963
* [BUGFIX] Sign Darwin/MacOS binaries #3008
* [BUGFIX] Fix pressure collector nil reference #3016

Signed-off-by: Ben Kochie <superq@gmail.com>
rexagod pushed a commit to rexagod/node_exporter that referenced this pull request May 23, 2024
@SuperQ @rexagod
Release v1.8.1 (prometheus#3018)
a173825 
* [BUGFIX] Fix CPU seconds on Solaris prometheus#2963
* [BUGFIX] Sign Darwin/MacOS binaries prometheus#3008
* [BUGFIX] Fix pressure collector nil reference prometheus#3016

Signed-off-by: Ben Kochie <superq@gmail.com>
rexagod pushed a commit to rexagod/node_exporter that referenced this pull request May 23, 2024
@SuperQ @rexagod
Release v1.8.1 (prometheus#3018)
af4b388 
* [BUGFIX] Fix CPU seconds on Solaris prometheus#2963
* [BUGFIX] Sign Darwin/MacOS binaries prometheus#3008
* [BUGFIX] Fix pressure collector nil reference prometheus#3016

Signed-off-by: Ben Kochie <superq@gmail.com>
rexagod pushed a commit to rexagod/node_exporter that referenced this pull request May 23, 2024
@SuperQ @rexagod
Release v1.8.1 (prometheus#3018)
ded42c7 
* [BUGFIX] Fix CPU seconds on Solaris prometheus#2963
* [BUGFIX] Sign Darwin/MacOS binaries prometheus#3008
* [BUGFIX] Fix pressure collector nil reference prometheus#3016

Signed-off-by: Ben Kochie <superq@gmail.com>
rexagod pushed a commit to rexagod/node_exporter that referenced this pull request May 23, 2024
@SuperQ @rexagod
Release v1.8.1 (prometheus#3018)
8aa9574 
* [BUGFIX] Fix CPU seconds on Solaris prometheus#2963
* [BUGFIX] Sign Darwin/MacOS binaries prometheus#3008
* [BUGFIX] Fix pressure collector nil reference prometheus#3016

Signed-off-by: Ben Kochie <superq@gmail.com>
rexagod pushed a commit to rexagod/node_exporter that referenced this pull request May 24, 2024
@SuperQ @rexagod
Release v1.8.1 (prometheus#3018)
679c906 
* [BUGFIX] Fix CPU seconds on Solaris prometheus#2963
* [BUGFIX] Sign Darwin/MacOS binaries prometheus#3008
* [BUGFIX] Fix pressure collector nil reference prometheus#3016

Signed-off-by: Ben Kochie <superq@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@discordianfish discordianfish discordianfish approved these changes

@SuperQ SuperQ SuperQ approved these changes

Assignees

@SuperQ SuperQ

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

illumos/solaris CPU usage is reported in ticks, not seconds
3 participants
@rexagod @discordianfish @SuperQ