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

Add cluster dropdown menu for grafana dashboard #4409

Merged
merged 1 commit into from
Dec 25, 2024
Merged

Conversation

lou-lan
Copy link
Collaborator

@lou-lan lou-lan commented Dec 17, 2024

Thanks for contributing!

Notice:

What issue(s) does this PR fix:

Fixes #

Special notes for your reviewer:

The cluster label is a general multi-cluster label. If a metric includes this label, it allows for the selection of different clusters. The dropdown menu will not be affected even if the user's collector is single-cluster.

case single cluster
截屏2024-12-17 17 40 42

case multi cluster
截屏2024-12-17 17 43 34

@lou-lan lou-lan added the release/feature-new release note for new feature label Dec 17, 2024
@lou-lan lou-lan force-pushed the dropdown-menu branch 2 times, most recently from 5761e4e to 7a2dd4e Compare December 17, 2024 09:47
@@ -97,7 +97,7 @@
"uid": "${datasource}"
},
"editorMode": "code",
"expr": "count(count(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\"}) by (node_name))",
"expr": "count(count(rdma_tx_vport_rdma_unicast_bytes_total{pod_name!=\"\",cluster=~\"$cluster\"}) by (node_name))",
Copy link
Collaborator

@weizhoublue weizhoublue Dec 18, 2024

Choose a reason for hiding this comment

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

Possibly it could add a new helm value , which could help turn on or off the cluster label . the off case is used for open-source case

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This will be better, but in charts/spiderpool/files/*does not support helm value (grafana dashboard json conflicted to helm vlaues, so we move it to this path).

Othewise, we need decouple grafana dashboard file, then import different file (multi cluster and classic ) in the fellow file. such we have 5*2 grafana dashboard file.

json: {{ .Files.Get "files/grafana-rdma-cluster.json" | toJson }}

@lou-lan lou-lan requested a review from weizhoublue December 18, 2024 02:08
@weizhoublue weizhoublue merged commit a54807e into main Dec 25, 2024
51 of 52 checks passed
@weizhoublue weizhoublue deleted the dropdown-menu branch December 25, 2024 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release/feature-new release note for new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants