Skip to content

fix grafana dashboards dropdowns for data and train dashboard #52752

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+13 −13
Open

fix grafana dashboards dropdowns for data and train dashboard #52752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3fa8c1
fix grafana dashboards dropdowns for data and train dashboard
alanwguo May 2, 2025
2f73cde
fixup
alanwguo May 2, 2025
e8da443
Merge branch 'master' into fix-metrics-dropdowns
alanwguo May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions python/ray/dashboard/modules/metrics/dashboards/data_grafana_dashboard_base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"selected": false
},
"datasource": "${datasource}",
"definition": "label_values(ray_data_allocated_bytes{{{global_filters}}}, SessionName)",
"definition": "query_result(count by (SessionName)(last_over_time(ray_data_output_bytes{{{global_filters}}}[$__range])))",
"description": "Filter queries to specific ray sessions.",
"error": null,
"hide": 0,
Expand All @@ -56,11 +56,11 @@
"name": "SessionName",
"options": [],
"query": {
"query": "label_values(ray_data_allocated_bytes{{{global_filters}}}, SessionName)",
"query": "query_result(count by (SessionName)(last_over_time(ray_data_output_bytes{{{global_filters}}}[$__range])))",
"refId": "StandardVariableQuery"
},
"refresh": 2,
"regex": "",
"regex": "{SessionName=\"(?<value>.*)\".*",
"skipUrlSync": false,
"sort": 2,
"tagValuesQuery": "",
Expand All @@ -81,7 +81,7 @@
]
},
"datasource": "${datasource}",
"definition": "label_values(ray_data_allocated_bytes{{{global_filters}}}, dataset)",
"definition": "query_result(count by (dataset)(last_over_time(ray_data_output_bytes{{SessionName=~\"$SessionName\",{global_filters}}}[$__range])))",
"description": null,
"error": null,
"hide": 0,
Expand All @@ -91,11 +91,11 @@
"name": "DatasetID",
"options": [],
"query": {
"query": "label_values(ray_data_allocated_bytes{{{global_filters}}}, dataset)",
"query": "query_result(count by (dataset)(last_over_time(ray_data_output_bytes{{SessionName=~\"$SessionName\",{global_filters}}}[$__range])))",
"refId": "Prometheus-Dataset-Variable-Query"
},
"refresh": 2,
"regex": "",
"regex": "{dataset=\"(?<value>.*)\".*",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
Expand Down
12 changes: 6 additions & 6 deletions python/ray/dashboard/modules/metrics/dashboards/train_grafana_dashboard_base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"selected": false
},
"datasource": "${datasource}",
"definition": "label_values(ray_train_report_total_blocked_time_s{{{global_filters}}}, SessionName)",
"definition": "query_result(count by (SessionName)(last_over_time(ray_train_report_total_blocked_time_s{{SessionName=~\"$SessionName\",{global_filters}}}[$__range])))",
"description": "Filter queries to specific ray sessions.",
"error": null,
"hide": 0,
Expand All @@ -56,11 +56,11 @@
"name": "SessionName",
"options": [],
"query": {
"query": "label_values(ray_train_report_total_blocked_time_s{{{global_filters}}}, SessionName)",
"query": "query_result(count by (SessionName)(last_over_time(ray_train_report_total_blocked_time_s{{SessionName=~\"$SessionName\",{global_filters}}}[$__range])))",
"refId": "StandardVariableQuery"
},
"refresh": 2,
"regex": "",
"regex": "{SessionName=\"(?<value>.*)\".*",
"skipUrlSync": false,
"sort": 2,
"tagValuesQuery": "",
Expand All @@ -75,7 +75,7 @@
"selected": false
},
"datasource": "${datasource}",
"definition": "label_values(ray_train_report_total_blocked_time_s{{{global_filters}}}, ray_train_run_name)",
"definition": "query_result(count by (ray_train_run_name)(last_over_time(ray_train_report_total_blocked_time_s{{SessionName=~\"$SessionName\",{global_filters}}}[$__range])))",
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this be ray_train_run_name instead of SessionName=~\"$SessionName\"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, this is right. THis is filtering the dropdown to only show train run names that are part of the selected Session.

"description": "Filter queries to specific ray sessions.",
"error": null,
"hide": 0,
Expand All @@ -85,11 +85,11 @@
"name": "TrainRunName",
"options": [],
"query": {
"query": "label_values(ray_train_report_total_blocked_time_s{{{global_filters}}}, ray_train_run_name)",
"query": "query_result(count by (ray_train_run_name)(last_over_time(ray_train_report_total_blocked_time_s{{SessionName=~\"$SessionName\",{global_filters}}}[$__range])))",
Copy link
Contributor

Choose a reason for hiding this comment

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

I realized that ray_train_report_total_blocked_time_s may not be recorded in the case that the user does not call ray.train.report. Would it be better to use a metric that will always be recorded? E.g. right now ray_train_worker_group_start_total_time_s should always be there.

"refId": "StandardVariableQuery"
},
"refresh": 2,
"regex": "",
"regex": "{ray_train_run_name=\"(?<value>.*)\".*",
"skipUrlSync": false,
"sort": 2,
"tagValuesQuery": "",
Expand Down