diff --git a/docs/en/setup/backend/backend-bookkeeper-monitoring.md b/docs/en/setup/backend/backend-bookkeeper-monitoring.md
index 9f540698cf8f..88f78114a30f 100644
--- a/docs/en/setup/backend/backend-bookkeeper-monitoring.md
+++ b/docs/en/setup/backend/backend-bookkeeper-monitoring.md
@@ -32,12 +32,12 @@ the OAP. In each cluster, the nodes are represented as `Instance`.
| Bookie Ledger Writable Dirs | meter_bookkeeper_bookie_ledger_writable_dirs | The number of writable directories in the bookie. | Bookkeeper Cluster |
| Bookie Ledger Dir Usage | meter_bookkeeper_bookie_ledger_dir_data_bookkeeper_ledgers_usage | The number of successfully created connections. | Bookkeeper Cluster |
| Bookie Entries Count | meter_bookkeeper_bookie_entries_count | The number of the bookie write entries. | Bookkeeper Cluster |
-| Bookie Write Cache Size | meter_bookkeeper_bookie_write_cache_size | The size of the bookie write cache. | Bookkeeper Cluster |
+| Bookie Write Cache Size | meter_bookkeeper_bookie_write_cache_size | The size of the bookie write cache (MB). | Bookkeeper Cluster |
| Bookie Write Cache Entry Count | meter_bookkeeper_bookie_write_cache_count | The entry count in the bookie write cache. | Bookkeeper Cluster |
-| Bookie Read Cache Size | meter_bookkeeper_bookie_read_cache_size | The size of the bookie read cache. | Bookkeeper Cluster |
+| Bookie Read Cache Size | meter_bookkeeper_bookie_read_cache_size | The size of the bookie read cache (MB). | Bookkeeper Cluster |
| Bookie Read Cache Entry Count | meter_bookkeeper_bookie_read_cache_count | The entry count in the bookie read cache. | Bookkeeper Cluster |
-| Bookie Read Rate | meter_bookkeeper_bookie_read_rate | The bookie read rate. | Bookkeeper Cluster |
-| Bookie Write Rate | meter_bookkeeper_bookie_write_rate | The bookie write rate. | Bookkeeper Cluster |
+| Bookie Read Rate | meter_bookkeeper_bookie_read_rate | The bookie read rate (MB/min). | Bookkeeper Cluster |
+| Bookie Write Rate | meter_bookkeeper_bookie_write_rate | The bookie write rate (MB/min). | Bookkeeper Cluster |
### BookKeeper Node Supported Metrics
@@ -48,7 +48,7 @@ the OAP. In each cluster, the nodes are represented as `Instance`.
| JVM Threads | meter_bookkeeper_node_jvm_threads_current
meter_bookkeeper_node_jvm_threads_daemon
meter_bookkeeper_node_jvm_threads_peak
meter_bookkeeper_node_jvm_threads_deadlocked | The count of the jvm threads. | Bookkeeper Bookie |
| GC Time | meter_bookkeeper_node_jvm_gc_collection_seconds_sum | Time spent in a given JVM garbage collector in seconds. | Bookkeeper Bookie |
| GC Count | meter_bookkeeper_node_jvm_gc_collection_seconds_count | The count of a given JVM garbage. | Bookkeeper Bookie |
-| Thread Executor | meter_bookkeeper_node_thread_executor_completed | The count of the executor thread. | Bookkeeper Bookie |
+| Thread Executor Completed | meter_bookkeeper_node_thread_executor_completed | The count of the executor thread. | Bookkeeper Bookie |
| Thread Executor Tasks | meter_bookkeeper_node_thread_executor_tasks_completed
meter_bookkeeper_node_thread_executor_tasks_rejected
meter_bookkeeper_node_thread_executor_tasks_failed | The count of the executor tasks. | Bookkeeper Bookie |
| Pooled Threads | meter_bookkeeper_node_high_priority_threads
meter_bookkeeper_node_read_thread_pool_threads | The count of the pooled thread. | Bookkeeper Bookie |
| Pooled Threads Max Queue Size | meter_bookkeeper_node_high_priority_thread_max_queue_size
meter_bookkeeper_node_read_thread_pool_max_queue_size | The count of the pooled threads max queue size. | Bookkeeper Bookie |
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-cluster.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-cluster.json
index 29ca7d6f637e..24dca60dfb42 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-cluster.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-cluster.json
@@ -299,7 +299,7 @@
"metricMode": "Expression",
"moved": false,
"expressions": [
- "meter_bookkeeper_bookie_read_rate"
+ "meter_bookkeeper_bookie_read_rate/1024/1024"
],
"typesOfMQE": [
"TIME_SERIES_VALUES"
@@ -314,7 +314,7 @@
},
"widget": {
"name": "bookie_read_rate",
- "title": "Bookie Read Rate"
+ "title": "Bookie Read Rate(MB/min)"
}
},
{
@@ -330,7 +330,7 @@
"metricMode": "Expression",
"moved": false,
"expressions": [
- "meter_bookkeeper_bookie_write_rate"
+ "meter_bookkeeper_bookie_write_rate/1024/1024"
],
"metricConfig": [],
"graph": {
@@ -346,7 +346,7 @@
},
"widget": {
"name": "bookie_write_rate",
- "title": "Bookie Write Rate"
+ "title": "Bookie Write Rate(MB/min)"
},
"typesOfMQE": [
"TIME_SERIES_VALUES"
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-node.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-node.json
index b6aa4d274924..2d76bfad7ad6 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-node.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-node.json
@@ -158,7 +158,7 @@
},
"widget": {
"name": "jvm_gc_collection_seconds_sum",
- "title": "GC Time (ms/min)"
+ "title": "GC Time (s)"
}
},
{
@@ -225,7 +225,7 @@
],
"widget": {
"name": "thread_executor_completed",
- "title": "Thread Executor"
+ "title": "Thread Executor Completed"
}
},
{
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-root.json
index 34e96f752747..93caeda455d5 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/bookkeeper/bookkeeper-root.json
@@ -5,7 +5,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 3,
"w": 24,
"h": 29,
"i": "0",
@@ -17,7 +17,6 @@
"metrics": [
""
],
- "moved": false,
"graph": {
"type": "ServiceList",
"dashboardName": "BookKeeper-Cluster",
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-cluster.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-cluster.json
index 35c45b6c58d9..71003854b7ad 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-cluster.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-cluster.json
@@ -34,17 +34,15 @@
"tips": "Total number of topics.",
"name": "total_topics"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_total_topics"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-7",
"moved": false,
- "metrics": [
- "meter_pulsar_total_topics"
- ],
- "metricTypes": [
- "readLabeledMetricsValues"
- ],
+ "metrics": [],
+ "metricTypes": [],
"metricConfig": []
},
{
@@ -67,18 +65,16 @@
"tips": "Total number of subscriptions.",
"name": "total_subscriptions"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_total_subscriptions"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-8",
"moved": false,
"metricConfig": [],
- "metricTypes": [
- "readLabeledMetricsValues"
- ],
- "metrics": [
- "meter_pulsar_total_subscriptions"
- ]
+ "metricTypes": [],
+ "metrics": []
},
{
"x": 12,
@@ -100,18 +96,16 @@
"tips": "Total number of producers.",
"name": "total_producers"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_total_producers"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-9",
"moved": false,
"metricConfig": [],
- "metricTypes": [
- "readLabeledMetricsValues"
- ],
- "metrics": [
- "meter_pulsar_total_producers"
- ]
+ "metricTypes": [],
+ "metrics": []
},
{
"x": 18,
@@ -133,18 +127,16 @@
"tips": "Total number of consumers.",
"name": "total_consumers"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_total_consumers"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-10",
"moved": false,
"metricConfig": [],
- "metricTypes": [
- "readLabeledMetricsValues"
- ],
- "metrics": [
- "meter_pulsar_total_consumers"
- ]
+ "metricTypes": [],
+ "metrics": []
},
{
"x": 0,
@@ -166,9 +158,11 @@
"tips": "Incoming message rate.",
"name": "message_rate_in"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_message_rate_in"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-11",
"moved": false,
"metricConfig": [],
@@ -199,18 +193,16 @@
"tips": "Outgoing message rate.",
"name": "message_rate_out"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_message_rate_in"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-12",
"moved": false,
"metricConfig": [],
- "metricTypes": [
- "readLabeledMetricsValues"
- ],
- "metrics": [
- "meter_pulsar_message_rate_in"
- ]
+ "metricTypes": [],
+ "metrics": []
},
{
"x": 0,
@@ -232,18 +224,16 @@
"tips": "Incoming throughput.",
"name": "throughput_in"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_throughput_in"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-13",
"moved": false,
"metricConfig": [],
- "metricTypes": [
- "readLabeledMetricsValues"
- ],
- "metrics": [
- "meter_pulsar_throughput_in"
- ]
+ "metricTypes": [],
+ "metrics": []
},
{
"x": 12,
@@ -265,18 +255,16 @@
"tips": "Outgoing throughput.",
"name": "throughput_out"
},
- "expressions": [],
+ "expressions": [
+ "meter_pulsar_throughput_in"
+ ],
"typesOfMQE": [],
- "metricMode": "General",
+ "metricMode": "Expression",
"id": "16-0-14",
"moved": false,
"metricConfig": [],
- "metricTypes": [
- "readLabeledMetricsValues"
- ],
- "metrics": [
- "meter_pulsar_throughput_in"
- ]
+ "metricTypes": [],
+ "metrics": []
},
{
"x": 12,
@@ -306,7 +294,7 @@
},
"widget": {
"name": "storage_read_rate",
- "title": "Storage Read Rate"
+ "title": "Storage Read Rate (messages per second)"
}
},
{
@@ -337,7 +325,7 @@
},
"widget": {
"name": "storage_logical_size",
- "title": "Storage Logical Size"
+ "title": "Storage Logical Size (MB)"
}
},
{
@@ -368,7 +356,7 @@
},
"widget": {
"name": "storage_write_rate",
- "title": "Storage Write Rate"
+ "title": "Storage Write Rate (messages per second)"
}
},
{
@@ -402,7 +390,7 @@
},
"widget": {
"name": "storage_size",
- "title": "Storage Size"
+ "title": "Storage Size (MB)"
},
"typesOfMQE": []
}
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-root.json
index eb15751ea450..5126ecb55da5 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/pulsar/pulsar-root.json
@@ -5,7 +5,7 @@
"children": [
{
"x": 0,
- "y": 0,
+ "y": 3,
"w": 24,
"h": 29,
"i": "0",
@@ -17,7 +17,6 @@
"metrics": [
""
],
- "moved": false,
"graph": {
"type": "ServiceList",
"dashboardName": "Pulsar-Cluster",