From 36151085cc8961e9e4dda8da66026466aea44d42 Mon Sep 17 00:00:00 2001
From: Eric Fu <eric@singularity-data.com>
Date: Wed, 1 Nov 2023 08:41:43 +0000
Subject: [PATCH] reorder some metrics

---
 grafana/risingwave-dev-dashboard.dashboard.py | 105 +++++++++---------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/grafana/risingwave-dev-dashboard.dashboard.py b/grafana/risingwave-dev-dashboard.dashboard.py
index b3dddfea0df57..884631eeb4537 100644
--- a/grafana/risingwave-dev-dashboard.dashboard.py
+++ b/grafana/risingwave-dev-dashboard.dashboard.py
@@ -908,20 +908,6 @@ def section_streaming_actors(outer_panels):
         outer_panels.row_collapsed(
             "Streaming Actors",
             [
-                panels.timeseries_actor_rowsps(
-                    "Executor Throughput",
-                    "When enabled, this metric shows the input throughput of each executor.",
-                    [
-                        panels.target(
-                            f"sum(rate({metric('stream_executor_row_count')}[$__rate_interval])) by (executor_identity, fragment_id)",
-                            "{{executor_identity}} fragment {{fragment_id}}",
-                        ),
-                        panels.target_hidden(
-                            f"rate({metric('stream_executor_row_count')}[$__rate_interval])",
-                            "{{executor_identity}} actor {{actor_id}}",
-                        ),
-                    ],
-                ),
                 panels.timeseries_percentage(
                     "Actor Output Blocking Time Ratio (Backpressure)",
                     "We first record the total blocking duration(ns) of output buffer of each actor. It shows how "
@@ -934,45 +920,6 @@ def section_streaming_actors(outer_panels):
                         ),
                     ],
                 ),
-                panels.timeseries_bytes(
-                    "Actor Memory Usage (TaskLocalAlloc)",
-                    "The actor-level memory usage statistics reported by TaskLocalAlloc. (Disabled by default)",
-                    [
-                        panels.target(
-                            f"sum({metric('actor_memory_usage')}) by (fragment_id)",
-                            "fragment {{fragment_id}}",
-                        ),
-                        panels.target_hidden(
-                            f"{metric('actor_memory_usage')}",
-                            "actor {{actor_id}}",
-                        ),
-                    ],
-                ),
-                panels.timeseries_bytes(
-                    "Executor Memory Usage",
-                    "The operator-level memory usage statistics collected by each LRU cache",
-                    [
-                        panels.target(
-                            f"sum({metric('stream_memory_usage')}) by (table_id, desc)",
-                            "table {{table_id}} desc: {{desc}}",
-                        ),
-                        panels.target_hidden(
-                            f"{metric('stream_memory_usage')}",
-                            "table {{table_id}} actor {{actor_id}} desc: {{desc}}",
-                        ),
-                    ],
-                ),
-
-                panels.timeseries_bytes(
-                    "Materialized View Memory Usage",
-                    "Memory usage aggregated by materialized views",
-                    [
-                        panels.target(
-                            f"sum({metric('stream_memory_usage')} * on(table_id, actor_id) group_left(materialized_view_id) table_info) by (materialized_view_id)",
-                            "mview {{materialized_view_id}}",
-                        ),
-                    ],
-                ),
                 panels.timeseries_percentage(
                     "Actor Input Blocking Time Ratio",
                     "",
@@ -1011,6 +958,30 @@ def section_streaming_actors(outer_panels):
                         ),
                     ],
                 ),
+                panels.timeseries_bytes(
+                    "Executor Cache Memory Usage",
+                    "The operator-level memory usage statistics collected by each LRU cache",
+                    [
+                        panels.target(
+                            f"sum({metric('stream_memory_usage')}) by (table_id, desc)",
+                            "table {{table_id}} desc: {{desc}}",
+                        ),
+                        panels.target_hidden(
+                            f"{metric('stream_memory_usage')}",
+                            "table {{table_id}} actor {{actor_id}} desc: {{desc}}",
+                        ),
+                    ],
+                ),
+                panels.timeseries_bytes(
+                    "Executor Cache Memory Usage of Materialized Views",
+                    "Memory usage aggregated by materialized views",
+                    [
+                        panels.target(
+                            f"sum({metric('stream_memory_usage')} * on(table_id, actor_id) group_left(materialized_view_id) table_info) by (materialized_view_id)",
+                            "materialized view {{materialized_view_id}}",
+                        ),
+                    ],
+                ),
                 panels.timeseries_actor_ops(
                     "Join Executor Cache",
                     "",
@@ -1303,6 +1274,34 @@ def section_streaming_actors(outer_panels):
                                       "over window cached count | table {{table_id}} actor {{actor_id}}"),
                     ],
                 ),
+                panels.timeseries_actor_rowsps(
+                    "Executor Throughput",
+                    "When enabled, this metric shows the input throughput of each executor.",
+                    [
+                        panels.target(
+                            f"sum(rate({metric('stream_executor_row_count')}[$__rate_interval])) by (executor_identity, fragment_id)",
+                            "{{executor_identity}} fragment {{fragment_id}}",
+                        ),
+                        panels.target_hidden(
+                            f"rate({metric('stream_executor_row_count')}[$__rate_interval])",
+                            "{{executor_identity}} actor {{actor_id}}",
+                        ),
+                    ],
+                ),
+                panels.timeseries_bytes(
+                    "Actor Memory Usage (TaskLocalAlloc)",
+                    "The actor-level memory usage statistics reported by TaskLocalAlloc. (Disabled by default)",
+                    [
+                        panels.target(
+                            f"sum({metric('actor_memory_usage')}) by (fragment_id)",
+                            "fragment {{fragment_id}}",
+                        ),
+                        panels.target_hidden(
+                            f"{metric('actor_memory_usage')}",
+                            "actor {{actor_id}}",
+                        ),
+                    ],
+                ),
             ],
         )
     ]