Skip to content

Fix CPU%#3262

Merged
DL6ER merged 6 commits into
developmentfrom
fix/load_not_cpu
Mar 6, 2025
Merged

Fix CPU%#3262
DL6ER merged 6 commits into
developmentfrom
fix/load_not_cpu

Conversation

@DL6ER

@DL6ER DL6ER commented Feb 27, 2025

Copy link
Copy Markdown
Member

What does this implement/fix?

Two changes:

  • Show load instead of CPU % in info box as this (a) is more meaningful (naturally includes IOWait, etc.) and (b) is what we have shown in v5 as well so users are used to seeing these values even if they are less intuitive than CPU % at first
  • Still show total CPU % on settings / system info tab for easy contrasting to the CPU % used by FTL

grafik

Needs FTL branch new/total_cpu to work pi-hole/FTL#2297


Related issue or feature (if applicable): Fixes #3261

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from a team February 27, 2025 05:08
Comment thread scripts/js/footer.js Outdated
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Dominik <DL6ER@users.noreply.github.com>
@DL6ER DL6ER requested a review from rdwebdesign February 27, 2025 18:37
rdwebdesign
rdwebdesign previously approved these changes Feb 27, 2025
@DL6ER

DL6ER commented Mar 1, 2025

Copy link
Copy Markdown
Member Author

Still awaiting approval on pi-hole/FTL#2297 - I removed the commit @yubiuser wanted me to revert this morning

@github-actions

github-actions Bot commented Mar 4, 2025

Copy link
Copy Markdown
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@PromoFaux

Copy link
Copy Markdown
Member

@DL6ER merge conflicts

DL6ER added 3 commits March 6, 2025 04:24
…dashboard's top lists

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@github-actions

github-actions Bot commented Mar 6, 2025

Copy link
Copy Markdown
Contributor

Conflicts have been resolved.

@DL6ER

DL6ER commented Mar 6, 2025

Copy link
Copy Markdown
Member Author

Assuming approval holds over minor merge conflict resolution...

@rdwebdesign

Copy link
Copy Markdown
Member

Re-approved

@DL6ER DL6ER merged commit 97d3a22 into development Mar 6, 2025
@DL6ER DL6ER deleted the fix/load_not_cpu branch March 6, 2025 16:45
@DL6ER DL6ER mentioned this pull request Mar 6, 2025
5 tasks
@PromoFaux PromoFaux mentioned this pull request Mar 29, 2025
@yubiuser yubiuser linked an issue Mar 29, 2025 that may be closed by this pull request
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.

Wrong (?) cpu use reported in web interface

3 participants