You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/11/25 02:08:42 UTC
[skywalking] branch master updated: Add trace association for FAAS dashboards (#10024)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 8185589ac6 Add trace association for FAAS dashboards (#10024)
8185589ac6 is described below
commit 8185589ac6063cd3c4a6d973aa084f0b65015a18
Author: zhang-wei <zh...@apache.org>
AuthorDate: Fri Nov 25 10:08:29 2022 +0800
Add trace association for FAAS dashboards (#10024)
---
docs/en/changes/changes.md | 1 +
.../faas/faas-function-relation.json | 34 ++++++++++-
.../faas/faas-function.json | 19 ++++++-
.../faas/faas-instance-relation.json | 30 ++++++++++
.../faas/faas-instance.json | 65 +++++++++++++---------
5 files changed, 117 insertions(+), 32 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index cff0a10d93..bbbadf7ba9 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -177,6 +177,7 @@
* Enhance tags component to search tags with the input value.
* Fix topology loading style.
* Fix update metric processor for the readRecords and remove readSampledRecords from metrics selector.
+* Add trace association for FAAS dashboards.
#### Documentation
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json
index 8dac795c06..8bbcf7c0cf 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function-relation.json
@@ -84,6 +84,9 @@
"filters": {
"dataIndex": 15,
"sourceId": "0-0-1"
+ },
+ "relatedTrace": {
+ "enableRelate": true
}
},
{
@@ -140,7 +143,11 @@
{
"widgetId": "0-0-7"
}
- ]
+ ],
+ "relatedTrace": {
+ "enableRelate": true,
+ "status": "ERROR"
+ }
},
{
"x": 12,
@@ -202,6 +209,10 @@
"filters": {
"dataIndex": 15,
"sourceId": "0-0-1"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -257,6 +268,10 @@
"filters": {
"dataIndex": 15,
"sourceId": "0-0-1"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -312,6 +327,10 @@
"filters": {
"dataIndex": 15,
"sourceId": "0-0-1"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -374,6 +393,10 @@
"filters": {
"dataIndex": 15,
"sourceId": "0-0-1"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -434,6 +457,10 @@
"filters": {
"dataIndex": 15,
"sourceId": "0-0-1"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "status": "ERROR"
}
},
{
@@ -461,8 +488,6 @@
"metricTypes": [
"readMetricsValues"
],
- "value": "0-0-7",
- "label": "Load_Client",
"associate": [
{
"widgetId": "0-0-1"
@@ -489,6 +514,9 @@
"filters": {
"dataIndex": 15,
"sourceId": "0-0-1"
+ },
+ "relatedTrace": {
+ "enableRelate": true
}
}
]
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json
index 31aa98d4a9..aa1ecaf5d0 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-function.json
@@ -163,6 +163,10 @@
"filters": {
"dataIndex": 5,
"sourceId": "4-0-5"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -208,7 +212,11 @@
{
"widgetId": "4-0-7"
}
- ]
+ ],
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
+ }
},
{
"x": 12,
@@ -256,6 +264,10 @@
"filters": {
"dataIndex": 5,
"sourceId": "4-0-5"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "status": "ERROR"
}
},
{
@@ -300,6 +312,9 @@
"filters": {
"dataIndex": 5,
"sourceId": "4-0-5"
+ },
+ "relatedTrace": {
+ "enableRelate": true
}
},
{
@@ -549,4 +564,4 @@
"isRoot": false
}
}
-]
+]
\ No newline at end of file
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json
index db2253120e..5ecbddb2cb 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance-relation.json
@@ -80,6 +80,10 @@
"filters": {
"dataIndex": 27,
"sourceId": "4"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -140,6 +144,10 @@
"filters": {
"dataIndex": 27,
"sourceId": "4"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "status": "ERROR"
}
},
{
@@ -195,6 +203,9 @@
"filters": {
"dataIndex": 27,
"sourceId": "4"
+ },
+ "relatedTrace": {
+ "enableRelate": true
}
},
{
@@ -250,6 +261,10 @@
"filters": {
"dataIndex": 15,
"sourceId": "8"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -312,6 +327,10 @@
"filters": {
"dataIndex": 27,
"sourceId": "4"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
},
{
@@ -372,6 +391,10 @@
"filters": {
"dataIndex": 27,
"sourceId": "4"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "status": "ERROR"
}
},
{
@@ -427,6 +450,9 @@
"filters": {
"dataIndex": 27,
"sourceId": "4"
+ },
+ "relatedTrace": {
+ "enableRelate": true
}
},
{
@@ -482,6 +508,10 @@
"filters": {
"dataIndex": 27,
"sourceId": "4"
+ },
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
}
}
],
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json
index 9a5ad9c9b8..355871453c 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-instance.json
@@ -65,7 +65,11 @@
{
"widgetId": "0-0-3"
}
- ]
+ ],
+ "relatedTrace": {
+ "enableRelate": true,
+ "latency": true
+ }
},
{
"x": 0,
@@ -106,7 +110,11 @@
{
"widgetId": "0-0-3"
}
- ]
+ ],
+ "relatedTrace": {
+ "enableRelate": true,
+ "status": "ERROR"
+ }
},
{
"x": 0,
@@ -143,7 +151,10 @@
{
"widgetId": "0-0-0"
}
- ]
+ ],
+ "relatedTrace": {
+ "enableRelate": true
+ }
}
]
},
@@ -175,7 +186,7 @@
},
{
"name": "Golang",
- "children": [
+ "children": [
{
"x": 0,
"y": 0,
@@ -395,7 +406,7 @@
},
{
"name": "PVM",
- "children": [
+ "children": [
{
"x": 0,
"y": 0,
@@ -407,10 +418,10 @@
"title": "Host CPU Utilization / PVM CPU Utilization (%)"
},
"graph": {
- "type":"Area",
- "opacity":0.4,
- "showXAxis":true,
- "showYAxis":true
+ "type": "Area",
+ "opacity": 0.4,
+ "showXAxis": true,
+ "showYAxis": true
},
"metrics": [
"meter_instance_pvm_total_cpu_utilization",
@@ -433,12 +444,12 @@
"title": "PVM Thread Count"
},
"graph": {
- "type":"Line",
- "step":false,
- "smooth":false,
- "showSymbol":false,
- "showXAxis":true,
- "showYAxis":true
+ "type": "Line",
+ "step": false,
+ "smooth": false,
+ "showSymbol": false,
+ "showXAxis": true,
+ "showYAxis": true
},
"metrics": [
"meter_instance_pvm_thread_active_count"
@@ -459,8 +470,8 @@
"title": "PVM GC Count"
},
"graph": {
- "type":"Bar",
- "showBackground":true
+ "type": "Bar",
+ "showBackground": true
},
"metrics": [
"meter_instance_pvm_gc_g0",
@@ -485,10 +496,10 @@
"title": "Host Mem Utilization / PVM Mem Utilization (%)"
},
"graph": {
- "type":"Area",
- "opacity":0.4,
- "showXAxis":true,
- "showYAxis":true
+ "type": "Area",
+ "opacity": 0.4,
+ "showXAxis": true,
+ "showYAxis": true
},
"metrics": [
"meter_instance_pvm_total_mem_utilization",
@@ -511,12 +522,12 @@
"title": "PVM GC Time (ms)"
},
"graph": {
- "type":"Line",
- "step":false,
- "smooth":false,
- "showSymbol":false,
- "showXAxis":true,
- "showYAxis":true
+ "type": "Line",
+ "step": false,
+ "smooth": false,
+ "showSymbol": false,
+ "showXAxis": true,
+ "showYAxis": true
},
"metrics": [
"meter_instance_pvm_gc_time"