Add "all" option for SessionName (ray-project#35408)

This opens as default in the Grafana page but for the Dashboard UI, the default is still scoped to the latest session.
Ransnomy · May 17, 2023 · dad924e · dad924e
1 parent f7f18b2
commit dad924e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/dashboard/modules/metrics/dashboards/default_dashboard_panels.py b/dashboard/modules/metrics/dashboards/default_dashboard_panels.py
@@ -393,6 +393,6 @@ def max_plus_pending(max_resource, pending_resource):
     name="DEFAULT",
     default_uid="rayDefaultDashboard",
     panels=DEFAULT_GRAFANA_PANELS,
-    standard_global_filters=['SessionName="$SessionName"'],
+    standard_global_filters=['SessionName=~"$SessionName"'],
     base_json_file_name="default_grafana_dashboard_base.json",
 )
diff --git a/dashboard/modules/metrics/dashboards/default_grafana_dashboard_base.json b/dashboard/modules/metrics/dashboards/default_grafana_dashboard_base.json
@@ -25,7 +25,7 @@
   "templating": {
     "list": [
       {
-        "allValue": null,
+        "allValue": ".+",
         "current": {
           "selected": false
         },
@@ -34,7 +34,7 @@
         "description": "Filter queries to specific ray sessions.",
         "error": null,
         "hide": 0,
-        "includeAll": false,
+        "includeAll": true,
         "label": null,
         "multi": false,
         "name": "SessionName",

diff --git a/python/ray/tests/test_metrics_head.py b/python/ray/tests/test_metrics_head.py
@@ -97,7 +97,7 @@ def test_metrics_folder_with_dashboard_override(
             for panel in contents["panels"]:
                 for target in panel["targets"]:
                     # Check for standard_global_filters
-                    assert 'SessionName="$SessionName"' in target["expr"]
+                    assert 'SessionName=~"$SessionName"' in target["expr"]
                     # Check for custom global_filters
                     assert global_filters in target["expr"]
             for variable in contents["templating"]["list"]: