Merge branch 'main' into dependabot/cargo/bytes-1.5.0

risingwavelabs · Sep 8, 2023 · a74e0b6 · a74e0b6
2 parents f615cb3 + df0af3d
commit a74e0b6
Show file tree

Hide file tree

Showing 68 changed files with 8,428 additions and 902 deletions.
diff --git a/.github/workflows/cherry-pick-to-release-branch.yml b/.github/workflows/cherry-pick-to-release-branch.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
     branches:
       - main
-    types: ["closed"]
+    types: ["closed", "labeled"]
 
 jobs:
   release_pull_request_1_1:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker/dashboards/risingwave-dev-dashboard.json b/docker/dashboards/risingwave-dev-dashboard.json
diff --git a/grafana/common.py b/grafana/common.py
@@ -56,6 +56,7 @@
         ]
     )
 
+
 class Layout:
 
     def __init__(self):
@@ -198,10 +199,10 @@ def timeseries_latency(self,
         )
 
     def timeseries_latency_ms(self,
-                           title,
-                           description,
-                           targets,
-                           legendCols=["mean"]):
+                              title,
+                              description,
+                              targets,
+                              legendCols=["mean"]):
         gridPos = self.layout.next_half_width_graph()
         return TimeSeries(
             title=title,
@@ -525,7 +526,8 @@ def metric(name, filter=None, node_filter_enabled=True, table_id_filter_enabled=
     if risingwave_name_filter_enabled:
         filters.append("risingwave_name=~\"$instance\"")
     if table_id_filter_enabled:
-        filters.append("table_id=~\"$table\"")
+        # We use "%table|" instead of "%table" here to match empty string for the table_id filter
+        filters.append("table_id=~\"$table|\"")
     if node_filter_enabled:
         filters.append("job=~\"$job\"")
         filters.append("instance=~\"$node\"")
@@ -534,6 +536,7 @@ def metric(name, filter=None, node_filter_enabled=True, table_id_filter_enabled=
     else:
         return name
 
+
 def table_metric(name, filter=None):
     return metric(name, filter, True, True)