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

Jump to bottom

mgr/dashboard: introduce memory and cpu usage for daemons #45808

Merged
merged 2 commits into from May 10, 2022
Merged

mgr/dashboard: introduce memory and cpu usage for daemons #45808

merged 2 commits into from May 10, 2022

Conversation

avanthakkar
Copy link
Contributor

@avanthakkar avanthakkar commented Apr 7, 2022 •
edited by aaSharma14

Fixes: https://tracker.ceph.com/issues/55218
Signed-off-by: Avan Thakkar athakkar@redhat.com
Co-authored-by: Aashish Sharma aasharma@redhat.com

Introducing 2 new columns(Memory Usage, CPU %) in Cluster->Host->Daemons table for Memory and CPU usage.
Remove container stats from the Daemons table.
Screenshot from 2022-04-29 14-18-33

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@avanthakkar avanthakkar requested review from sunilangadi2 and a team April 7, 2022 11:05
@avanthakkar avanthakkar requested a review from a team as a code owner April 7, 2022 11:05
@avanthakkar avanthakkar added this to In progress in Dashboard via automation Apr 7, 2022
mgfritch
mgfritch reviewed Apr 7, 2022
View reviewed changes
src/cephadm/cephadm Outdated Show resolved Hide resolved
src/cephadm/cephadm Outdated Show resolved Hide resolved
Dashboard automation moved this from In progress to Reviewer approved Apr 7, 2022
adk3798
adk3798 approved these changes Apr 7, 2022
View reviewed changes
Copy link
Contributor

@adk3798 adk3798 left a comment

Choose a reason for hiding this comment

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

Looks okay from cephadm side once comments from @mgfritch are addressed. Also, just want to mention to make sure this goes through the orch suite in teuthology before merging.

@Sarthak0702
Copy link
Member

jenkins test make check

@Sarthak0702
Copy link
Member

jenkins test dashboard

@aaSharma14 aaSharma14 changed the title [WIP] mgr/dashboard: introduce memory and cpu usage for daemons mgr/dashboard: introduce memory and cpu usage for daemons Apr 8, 2022
@adk3798
Copy link
Contributor

adk3798 commented Apr 8, 2022

@avanthakkar @aaSharma14

cephadm:5867:1: W293 blank line contains whitespace
cephadm:6076:1: E302 expected 2 blank lines, found 1
cephadm:6091:1: E302 expected 2 blank lines, found 1
2     E302 expected 2 blank lines, found 1
1     W293 blank line contains whitespace

sunilangadi2
sunilangadi2 approved these changes Apr 12, 2022
View reviewed changes
Copy link

@sunilangadi2 sunilangadi2 left a comment

Choose a reason for hiding this comment

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

Thanks @avanthakkar LGTM!

@aaSharma14 aaSharma14 force-pushed the add-cpu/mem-usage branch 2 times, most recently from 3ce0627 to 10e400e Compare April 18, 2022 08:01
@avanthakkar
mgr/dashboard: introduce memory and cpu usage for daemons
2639405 
Fixes: https://tracker.ceph.com/issues/55218
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>

Introducing 2 new columns in Cluster->Host->Daemons table for Memory and CPU usage.
@aaSharma14 aaSharma14 force-pushed the add-cpu/mem-usage branch 5 times, most recently from c11363b to 44ae473 Compare April 28, 2022 04:47
@avanthakkar
Copy link
Contributor Author

jenkins test api

@ceph-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@aaSharma14
Copy link
Contributor

jenkins test dashboard cephadm

@aaSharma14
Copy link
Contributor

jenkins test windows

@aaSharma14
Copy link
Contributor

jenkins test make check

@aaSharma14
Copy link
Contributor

jenkins test dashboard cephadm

2 similar comments
@aaSharma14
Copy link
Contributor

aaSharma14 commented Apr 29, 2022 •
edited

jenkins test dashboard cephadm

@aaSharma14
Copy link
Contributor

jenkins test dashboard cephadm

@aaSharma14
mgr/dashboard: fix linting errors and add test
b496f58 
Fixes: https://tracker.ceph.com/issues/55218
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
@aaSharma14
Copy link
Contributor

jenkins test dashboard

1 similar comment
@aaSharma14
Copy link
Contributor

jenkins test dashboard

@epuertat epuertat moved this from Reviewer approved to Ready-to-merge in Dashboard May 10, 2022
@epuertat epuertat merged commit be1c083 into ceph:master May 10, 2022
13 checks passed
Dashboard automation moved this from Ready-to-merge to Done May 10, 2022
@epuertat epuertat deleted the add-cpu/mem-usage branch May 10, 2022 16:06
@avanthakkar avanthakkar mentioned this pull request May 10, 2022
Merged
@avanthakkar avanthakkar mentioned this pull request May 31, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pereman2 pereman2 pereman2 left review comments

@aaSharma14 aaSharma14 aaSharma14 left review comments

@sunilangadi2 sunilangadi2 sunilangadi2 approved these changes

@adk3798 adk3798 adk3798 approved these changes

@Sarthak0702 Sarthak0702 Sarthak0702 approved these changes

@nizamial09 nizamial09 nizamial09 approved these changes

@epuertat epuertat Awaiting requested review from epuertat

@mgfritch mgfritch Awaiting requested review from mgfritch

Assignees
No one assigned
Labels
cephadm dashboard needs-review orchestrator pybind
Projects
Ceph-Dashboard
Archived in project
Dashboard
  
Done
Milestone
No milestone
10 participants
@avanthakkar @Sarthak0702 @adk3798 @aaSharma14 @ceph-jenkins @mgfritch @sunilangadi2 @pereman2 @nizamial09 @epuertat