This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new da43c415cc more specific some type of metric. (#6824)
da43c415cc is described below
commit da43c415cc30cf0672e36e0b0de64e05535b4165
Author: ZhangHongYin <[email protected]>
AuthorDate: Sun Jul 31 19:43:42 2022 +0800
more specific some type of metric. (#6824)
---
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 22 +++++++++++-----------
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 6 +++---
.../iotdb/db/engine/memtable/AbstractMemTable.java | 16 ++++++++++++----
.../org/apache/iotdb/db/metadata/MManager.java | 8 ++++++--
4 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/docs/UserGuide/Maintenance-Tools/Metric-Tool.md
b/docs/UserGuide/Maintenance-Tools/Metric-Tool.md
index 34522ae3e4..ba67f58320 100644
--- a/docs/UserGuide/Maintenance-Tools/Metric-Tool.md
+++ b/docs/UserGuide/Maintenance-Tools/Metric-Tool.md
@@ -87,14 +87,14 @@ Next, we will choose Prometheus format data as samples to
describe each kind of
| thrift_connections | name="{{thriftService}}" | core | current number
of thrift connections | thrift_connections{name="RPC",} 1.0 |
#### 4.3.2. Task
-| Metric | Tag
| level | Description
| Sample
|
-| ----------------------- |
----------------------------------------------------------------------------- |
--------- | -------------------------------------------------------- |
---------------------------------------------------------------------------------------
|
-| queue | name="compaction_inner/compaction_cross/flush",<br
/>status="running/waiting" | important | The count of current tasks in running
and waiting status | queue{name="flush",status="waiting",}
0.0<br/>queue{name="flush",status="running",} 0.0 |
-| cost_task_seconds_count | name="compaction/flush"
| important | The total count of tasks occurs till
now | cost_task_seconds_count{name="flush",} 1.0
|
-| cost_task_seconds_max | name="compaction/flush"
| important | The seconds of the longest task takes
till now | cost_task_seconds_max{name="flush",} 0.363
|
-| cost_task_seconds_sum | name="compaction/flush"
| important | The total cost seconds of all tasks
till now | cost_task_seconds_sum{name="flush",} 0.363
|
-| data_written | name="compaction", <br
/>type="aligned/not-aligned/total" | important | The size
of data written in compaction |
data_written{name="compaction",type="total",} 10240
|
-| data_read | name="compaction"
| important | The size of data read in compaction
| data_read={name="compaction",} 10240
|
+| Metric | Tag
| level | Description
| Sample
|
+| ----------------------- |
---------------------------------------------------------------------------- |
--------- | -------------------------------------------------------- |
---------------------------------------------------------------------------------------
|
+| queue |
name="compaction_inner/compaction_cross/flush",<br/>status="running/waiting" |
important | The count of current tasks in running and waiting status |
queue{name="flush",status="waiting",}
0.0<br/>queue{name="flush",status="running",} 0.0 |
+| cost_task_seconds_count | name="compaction/flush"
| important | The total count of tasks occurs till
now | cost_task_seconds_count{name="flush",} 1.0
|
+| cost_task_seconds_max | name="compaction/flush"
| important | The seconds of the longest task takes
till now | cost_task_seconds_max{name="flush",} 0.363
|
+| cost_task_seconds_sum | name="compaction/flush"
| important | The total cost seconds of all tasks
till now | cost_task_seconds_sum{name="flush",} 0.363
|
+| data_written | name="compaction", <br
/>type="aligned/not-aligned/total" | important | The size of
data written in compaction |
data_written{name="compaction",type="total",} 10240
|
+| data_read | name="compaction"
| important | The size of data read in compaction
| data_read={name="compaction",} 10240
|
#### 4.3.3. Memory Usage
@@ -110,9 +110,9 @@ Next, we will choose Prometheus format data as samples to
describe each kind of
#### 4.3.5. Business Data
-| Metric | Tag | level | Description
| Sample
|
-| -------- | ------------------------------------- | --------- |
------------------------------------------------------------- |
-------------------------------- |
-| quantity | name="storageGroup/device";<br/>name="timeSeries",
type="normal/template" | important | The current count of
timeSeries/storageGroup/devices in IoTDB |
quantity{name="timeSeries",type="normal"} 1.0 |
+| Metric | Tag
| level | Description |
Sample |
+| -------- |
------------------------------------------------------------------- | ---------
| ------------------------------------------------------------- |
--------------------------------------------- |
+| quantity | name="timeSeries/storageGroup/device",
type="total/normal/template" | important | The current count of
timeSeries/storageGroup/devices in IoTDB |
quantity{name="timeSeries",type="normal"} 1.0 |
#### 4.3.6. Cluster
diff --git a/docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md
b/docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md
index fa7f9ae3be..3b2104b552 100644
--- a/docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md
+++ b/docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md
@@ -109,9 +109,9 @@ IoTDB对外提供JMX和Prometheus格式的监控指标，对于JMX，可以通
#### 4.3.5. 业务数据
-| Metric | Tag | level | 说明
| 示例 |
-| -------- | ------------------------------------- | --------- |
-------------------------------------------- | --------------------------------
|
-| quantity | name="timeSeries/storageGroup/device";<br/>name="timeSeries",
type="normal/template" | important | 当前时间timeSeries/storageGroup/device的数量 |
quantity{name="timeSeries",type="normal"} 1.0 |
+| Metric | Tag
| level | 说明 | 示例
|
+| -------- |
------------------------------------------------------------------- | ---------
| -------------------------------------------- |
--------------------------------------------- |
+| quantity | name="timeSeries/storageGroup/device",
type="total/normal/template" | important |
当前时间timeSeries/storageGroup/device的数量 |
quantity{name="timeSeries",type="normal"} 1.0 |
#### 4.3.6. 集群
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index ab8d6b6f4d..b95a14b94f 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -190,7 +190,9 @@ public abstract class AbstractMemTable implements IMemTable
{
Metric.QUANTITY.toString(),
MetricLevel.IMPORTANT,
Tag.NAME.toString(),
- METRIC_POINT_IN);
+ METRIC_POINT_IN,
+ Tag.TYPE.toString(),
+ "insertRow");
}
}
@@ -239,7 +241,9 @@ public abstract class AbstractMemTable implements IMemTable
{
Metric.QUANTITY.toString(),
MetricLevel.IMPORTANT,
Tag.NAME.toString(),
- METRIC_POINT_IN);
+ METRIC_POINT_IN,
+ Tag.TYPE.toString(),
+ "insertAlignedRow");
}
}
@@ -262,7 +266,9 @@ public abstract class AbstractMemTable implements IMemTable
{
Metric.QUANTITY.toString(),
MetricLevel.IMPORTANT,
Tag.NAME.toString(),
- METRIC_POINT_IN);
+ METRIC_POINT_IN,
+ Tag.TYPE.toString(),
+ "insertTablet");
}
} catch (RuntimeException e) {
throw new WriteProcessException(e);
@@ -288,7 +294,9 @@ public abstract class AbstractMemTable implements IMemTable
{
Metric.QUANTITY.toString(),
MetricLevel.IMPORTANT,
Tag.NAME.toString(),
- METRIC_POINT_IN);
+ METRIC_POINT_IN,
+ Tag.TYPE.toString(),
+ "insertAlignedTablet");
}
} catch (RuntimeException e) {
throw new WriteProcessException(e);
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index 6996430acc..9f56254623 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -355,7 +355,9 @@ public class MManager {
return 0;
},
Tag.NAME.toString(),
- "device");
+ "device",
+ Tag.TYPE.toString(),
+ "total");
MetricsService.getInstance()
.getMetricManager()
@@ -372,7 +374,9 @@ public class MManager {
return 0;
},
Tag.NAME.toString(),
- "storageGroup");
+ "storageGroup",
+ Tag.TYPE.toString(),
+ "total");
}
private void forceMlog() {
