Skip to content

mgr/cephadm: mount grafana dashboards from the path#55615

Merged
adk3798 merged 2 commits intoceph:mainfrom
rhcs-dashboard:grafana-mount-dashboards
Mar 19, 2024
Merged

mgr/cephadm: mount grafana dashboards from the path#55615
adk3798 merged 2 commits intoceph:mainfrom
rhcs-dashboard:grafana-mount-dashboards

Conversation

@nizamial09
Copy link
Member

@nizamial09 nizamial09 commented Feb 16, 2024 •
edited
Loading

For this, the grafana dashboards are installed directly to the containers and later, cephadm picks it up to mount those to the grafana container.

We have to provide a providers.yml file to the grafana and put it inside provisioning/dashboards as default.yml file. Grafana uses the path which is provided inside this folder to pick the dashboards and show them.

Contribution Guidelines

  • To sign and title your commits, please refer to Submitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

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
  • jenkins test rook e2e

@nizamial09
Copy link
Member Author

nizamial09 commented Feb 16, 2024 •
edited
Loading

shaman triggered

@nizamial09 nizamial09 force-pushed the grafana-mount-dashboards branch 4 times, most recently from fe00669 to 27dd943 Compare February 19, 2024 05:02
@epuertat epuertat requested a review from ktdreyer February 19, 2024 10:07
adk3798
adk3798 reviewed Feb 19, 2024
View reviewed changes
@aaSharma14 aaSharma14 mentioned this pull request Feb 26, 2024
Merged
14 tasks
@aaSharma14 aaSharma14 force-pushed the grafana-mount-dashboards branch from e850eae to 83d056a Compare February 27, 2024 05:27
@nizamial09 nizamial09 mentioned this pull request Feb 27, 2024
Merged
14 tasks
@nizamial09 nizamial09 force-pushed the grafana-mount-dashboards branch 3 times, most recently from 00d63b9 to d1c8287 Compare February 28, 2024 06:04
@nizamial09
Copy link
Member Author

nizamial09 commented Feb 28, 2024 •
edited
Loading

shaman ongoing

@nizamial09 nizamial09 force-pushed the grafana-mount-dashboards branch 2 times, most recently from 9c67f55 to 683d461 Compare March 1, 2024 06:46
nizamial09
nizamial09 commented Mar 1, 2024
View reviewed changes
@nizamial09 nizamial09 force-pushed the grafana-mount-dashboards branch from 683d461 to 4fbc519 Compare March 6, 2024 05:29
@nizamial09 nizamial09 marked this pull request as ready for review March 6, 2024 13:43
@nizamial09 nizamial09 requested a review from a team as a code owner March 6, 2024 13:43
@nizamial09 nizamial09 mentioned this pull request Mar 8, 2024
Merged
14 tasks
@nizamial09
mgr/cephadm: mount grafana dashboards from the path
2a112ac 
For this, the grafana dashboards are installed directly to the
containers and later, cephadm picks it up to mount the dashboards to the
grafana container

Signed-off-by: Nizamudeen A <nia@redhat.com>
@nizamial09
mgr/cephadm: adapting unit tests to include provider file
057f09e 
Signed-off-by: Nizamudeen A <nia@redhat.com>
@nizamial09 nizamial09 force-pushed the grafana-mount-dashboards branch from 4fbc519 to 057f09e Compare March 8, 2024 10:22
@nizamial09
Copy link
Member Author

nizamial09 commented Mar 8, 2024

@adk3798 i've updated the unit tests as well. please have a look, thanks.

@nizamial09 nizamial09 requested a review from adk3798 March 8, 2024 10:25
@nizamial09
Copy link
Member Author

nizamial09 commented Mar 12, 2024

jenkins test make check

adk3798
adk3798 approved these changes Mar 13, 2024
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.

Code seems good from what I can tell

@nizamial09 nizamial09 requested review from a team, avanthakkar and ivoalmeida and removed request for a team March 13, 2024 05:41
Pegonzal
Pegonzal approved these changes Mar 14, 2024
View reviewed changes
Copy link
Contributor

@Pegonzal Pegonzal left a comment

Choose a reason for hiding this comment

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

Tested it locally, grafana was running and the dashboards present, thanks @nizamial09

@adk3798
Copy link
Contributor

adk3798 commented Mar 19, 2024

https://pulpito.ceph.com/adking-2024-03-16_05:03:17-orch:cephadm-wip-adk-testing-2024-03-15-1513-distro-default-smithi/

Tons of cluster log failures, not a problem for now. Other than that, it was just the mds_upgrade_sequence, staggered upgrade with agent (both of which are known problems), some failures installing things at the beginning of tests (known to happen occasionally), and a failure in the test_cephadm test related to idmap overrides for nfs, which I missed when we tested that PR originally ERROR: required file missing from config-json: idmap.conf but is not being caused by any PRs in this run.

Nothing to block merging PRs from this run.

@adk3798 adk3798 removed the needs-qa label Mar 19, 2024
@adk3798 adk3798 merged commit 920886a into ceph:main Mar 19, 2024
@adk3798 adk3798 mentioned this pull request Mar 19, 2024
Merged
mkogan1 pushed a commit to mkogan1/ceph that referenced this pull request Jul 9, 2024
@aaSharma14
mgr/dashboard: replace piechart plugin charts with native pie chart p…
08b2556 
…anel

Since we have this PR - ceph#55615 from Nizam where we are moving to mount grafana dashboards from path, there is a requirement to remove the pie-chart plugin usage from grafana dashboards and replace it with the native piechart panel

Resolves: rhbz#2270744

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@guits guits guits left review comments

@adk3798 adk3798 adk3798 approved these changes

@Pegonzal Pegonzal Pegonzal approved these changes

@ktdreyer ktdreyer Awaiting requested review from ktdreyer

@ivoalmeida ivoalmeida Awaiting requested review from ivoalmeida ivoalmeida was automatically assigned from ceph/dashboard

@avanthakkar avanthakkar Awaiting requested review from avanthakkar avanthakkar was automatically assigned from ceph/dashboard

Assignees

No one assigned

Labels

build/ops cephadm dashboard monitoring pybind wip-adk-testing

Projects

Ceph-Dashboard
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nizamial09 @adk3798 @guits @Pegonzal