Label y-axis units on stress-test CPU and inode panels - #69965
Open
charzl wants to merge 3 commits into
Open
Conversation
Fixes saltstack#69944 The CPU Usage panels (Master, Minion 1-3, API) use Grafana's percentunit, a 0-1 ratio where 1.0 == 1 full CPU core -- matching rate(container_cpu_usage_seconds_total[...]) semantics from cAdvisor. Without a label, a value like 1.2 is easy to misread as "1.2% of the host" rather than 1.2 CPU cores. The Minion Inodes panels use Grafana's "short" unit (a plain count) and also had no y-axis label. render_panels.py already special-cases bytes-family units to convert to MB and label the axis; this follows the same pattern for percentunit and short so every rendered panel states what its numbers mean.
.cursor-ai/ was accidentally picked up while preparing this branch and is unrelated to the y-axis label fix.
The "short" unit covers both inode counts (Minion Inodes) and FD/process counts (Master & API Resource Usage), which had been collapsed into the same generic "count" label. Label each by what it actually counts instead.
twangboy
approved these changes
Aug 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
percentunit(0-1 ratio where 1.0 == 1 full CPU core, matchingrate(container_cpu_usage_seconds_total[...])semantics from cAdvisor). Without a label, a value like 1.2 is easy to misread as "1.2% of the host" rather than 1.2 CPU cores.shortunit and had no y-axis label. Each is now labeled by what it actually counts (inodes usedvscount (FDs vs processes)) instead of a generic "count".render_panels.pyalready special-cases bytes-family units to convert to MB and label the axis; this follows the same pattern so every rendered panel states what its numbers mean.Fixes #69944
Based on
3008.x(this repo's history diverges frommaster, so the fix is cherry-picked rather than amaster-based PR retargeted).Test plan
render_panels.pyrenders distinct y-axis labels for CPU, Inodes, and FD/process panelsResult can be seen: https://github.com/charzl/salt/actions/runs/31059232360