You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wa...@apache.org on 2026/04/15 08:16:41 UTC
(skywalking-showcase) 01/01: update OAP/UI and Grafana trace templates
This is an automated email from the ASF dual-hosted git repository.
wankai pushed a commit to branch traceql-vars
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
commit 5809ed975f8c9790bc98691f778fde0c534e6673
Author: wankai123 <wa...@foxmail.com>
AuthorDate: Wed Apr 15 16:14:36 2026 +0800
update OAP/UI and Grafana trace templates
---
Makefile.in | 4 +-
.../dashboards/{ => 10.4.0}/trace-skywalking.json | 0
.../dashboards/{ => 10.4.0}/trace-zipkin.json | 0
.../grafana/dashboards/trace-skywalking.json | 243 +++++++++++++++++++--
.../config/grafana/dashboards/trace-zipkin.json | 198 +++++++++++++++--
5 files changed, 401 insertions(+), 44 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index f8cb944..f738315 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,10 +33,10 @@ ES_IMAGE ?= docker.elastic.co/elasticsearch/elasticsearch-oss
ES_IMAGE_TAG ?= 7.10.2
SW_OAP_IMAGE ?= ghcr.io/apache/skywalking/oap
-SW_OAP_IMAGE_TAG ?= c6a07a24c6adabaae99dad675a2b08676681c5a2
+SW_OAP_IMAGE_TAG ?= 9ea3bab32f8344ece2949f640a2baf52d7c6d465
SW_UI_IMAGE ?= ghcr.io/apache/skywalking/ui
-SW_UI_IMAGE_TAG ?= c6a07a24c6adabaae99dad675a2b08676681c5a2
+SW_UI_IMAGE_TAG ?= 9ea3bab32f8344ece2949f640a2baf52d7c6d465
SW_CLI_IMAGE ?= ghcr.io/apache/skywalking-cli/skywalking-cli:bce7faaabbd57ed1f40156af8a8eb6c3eccea4ae
SW_EVENT_EXPORTER_IMAGE ?= ghcr.io/apache/skywalking-kubernetes-event-exporter/skywalking-kubernetes-event-exporter:8a012a3f968cb139f817189afb9b3748841bba22
diff --git a/deploy/platform/config/grafana/dashboards/trace-skywalking.json b/deploy/platform/config/grafana/dashboards/10.4.0/trace-skywalking.json
similarity index 100%
copy from deploy/platform/config/grafana/dashboards/trace-skywalking.json
copy to deploy/platform/config/grafana/dashboards/10.4.0/trace-skywalking.json
diff --git a/deploy/platform/config/grafana/dashboards/trace-zipkin.json b/deploy/platform/config/grafana/dashboards/10.4.0/trace-zipkin.json
similarity index 100%
copy from deploy/platform/config/grafana/dashboards/trace-zipkin.json
copy to deploy/platform/config/grafana/dashboards/10.4.0/trace-zipkin.json
diff --git a/deploy/platform/config/grafana/dashboards/trace-skywalking.json b/deploy/platform/config/grafana/dashboards/trace-skywalking.json
index 3183db4..6d26754 100644
--- a/deploy/platform/config/grafana/dashboards/trace-skywalking.json
+++ b/deploy/platform/config/grafana/dashboards/trace-skywalking.json
@@ -78,7 +78,7 @@
"cellHeight": "sm",
"showHeader": true
},
- "pluginVersion": "12.4.2",
+ "pluginVersion": "12.4.0",
"targets": [
{
"datasource": {
@@ -88,8 +88,14 @@
"filters": [
{
"id": "8e32cbaf",
+ "isCustomValue": false,
"operator": "=",
- "scope": "span"
+ "scope": "resource",
+ "tag": "instance",
+ "value": [
+ "$service_instance"
+ ],
+ "valueType": "string"
},
{
"id": "service-name",
@@ -98,9 +104,48 @@
"scope": "resource",
"tag": "service.name",
"value": [
- "$service_name"
+ "$service"
],
"valueType": "string"
+ },
+ {
+ "id": "879358e5",
+ "operator": "=",
+ "scope": "span"
+ },
+ {
+ "id": "span-name",
+ "isCustomValue": false,
+ "operator": "=",
+ "scope": "span",
+ "tag": "name",
+ "value": [
+ "$endpoint"
+ ],
+ "valueType": "string"
+ },
+ {
+ "id": "status",
+ "isCustomValue": false,
+ "operator": "=",
+ "scope": "intrinsic",
+ "tag": "status",
+ "value": "$status",
+ "valueType": "string"
+ },
+ {
+ "id": "min-duration",
+ "operator": ">",
+ "tag": "duration",
+ "value": "$min_duration",
+ "valueType": "duration"
+ },
+ {
+ "id": "max-duration",
+ "operator": "<",
+ "tag": "duration",
+ "value": "$max_duration",
+ "valueType": "duration"
}
],
"limit": 20,
@@ -122,21 +167,61 @@
"list": [
{
"current": {
- "text": "agent::app",
- "value": "agent::app"
+ "text": "SkywalkingTraceQL",
+ "value": "dfhlc7zdaoutcd"
+ },
+ "hide": 2,
+ "name": "DS_SW_Tempo",
+ "options": [],
+ "query": "tempo",
+ "refresh": 1,
+ "regex": "SkywalkingTraceQL",
+ "type": "datasource"
+ },
+ {
+ "current": {
+ "text": "SkyWalkingPromQL",
+ "value": "cfed3ic1yzsaod"
+ },
+ "hide": 2,
+ "name": "DS_SW_Prometheus",
+ "options": [],
+ "query": "prometheus",
+ "refresh": 1,
+ "regex": "SkyWalkingPromQL",
+ "type": "datasource"
+ },
+ {
+ "current": {
+ "text": "GENERAL",
+ "value": "GENERAL"
+ },
+ "hide": 2,
+ "label": "Layer",
+ "name": "layer",
+ "query": "GENERAL",
+ "skipUrlSync": true,
+ "type": "constant"
+ },
+ {
+ "allValue": "*",
+ "current": {
+ "text": "All",
+ "value": "$__all"
},
"datasource": {
- "type": "tempo",
- "uid": "${DS_SW_Tempo}"
+ "type": "prometheus",
+ "uid": "${DS_SW_Prometheus}"
},
- "definition": "",
- "label": "Service Name",
- "name": "service_name",
+ "definition": "label_values(service_traffic{layer=\"$layer\"},service)",
+ "includeAll": true,
+ "label": "Service",
+ "name": "service",
"options": [],
"query": {
- "label": "service",
- "refId": "TempoDatasourceVariableQueryEditor-VariableQuery",
- "type": 1
+ "qryType": 1,
+ "query": "label_values(service_traffic{layer=\"$layer\"},service)",
+ "refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
@@ -144,17 +229,133 @@
"type": "query"
},
{
+ "allValue": "*",
"current": {
- "text": "SkywalkingTraceQL",
- "value": "PA28E3BB23B19F252"
+ "text": "All",
+ "value": "$__all"
},
- "hide": 2,
- "name": "DS_SW_Tempo",
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_SW_Prometheus}"
+ },
+ "definition": "label_values(instance_traffic{layer=\"$layer\", service=\"$service\"},service_instance)",
+ "includeAll": true,
+ "label": "Service Instance",
+ "name": "service_instance",
"options": [],
- "query": "tempo",
+ "query": {
+ "qryType": 1,
+ "query": "label_values(instance_traffic{layer=\"$layer\", service=\"$service\"},service_instance)",
+ "refId": "PrometheusVariableQueryEditor-VariableQuery"
+ },
"refresh": 1,
- "regex": "SkywalkingTraceQL",
- "type": "datasource"
+ "regex": "",
+ "regexApplyTo": "value",
+ "type": "query"
+ },
+ {
+ "allValue": "*",
+ "current": {
+ "text": "All",
+ "value": "$__all"
+ },
+ "datasource": {
+ "type": "prometheus",
+ "uid": "cfed3ic1yzsaod"
+ },
+ "definition": "label_values(endpoint_traffic{layer=\"$layer\", service=\"$service\", keyword=\"$endpoint_keyword\", limit=\"$endpoint_limit\"},endpoint)",
+ "includeAll": true,
+ "label": "Endpoint",
+ "name": "endpoint",
+ "options": [],
+ "query": {
+ "qryType": 1,
+ "query": "label_values(endpoint_traffic{layer=\"$layer\", service=\"$service\", keyword=\"$endpoint_keyword\", limit=\"$endpoint_limit\"},endpoint)",
+ "refId": "PrometheusVariableQueryEditor-VariableQuery"
+ },
+ "refresh": 1,
+ "regex": "",
+ "regexApplyTo": "value",
+ "type": "query"
+ },
+ {
+ "current": {
+ "text": "",
+ "value": ""
+ },
+ "label": "Endpoint Keyword",
+ "name": "endpoint_keyword",
+ "options": [
+ {
+ "selected": true,
+ "text": "",
+ "value": ""
+ }
+ ],
+ "query": "",
+ "type": "textbox"
+ },
+ {
+ "current": {
+ "text": "20",
+ "value": "20"
+ },
+ "label": "Endpoint Limit",
+ "name": "endpoint_limit",
+ "options": [],
+ "query": "20,50,100",
+ "type": "custom",
+ "valuesFormat": "csv"
+ },
+ {
+ "allValue": "*",
+ "current": {
+ "text": "$__all",
+ "value": "$__all"
+ },
+ "includeAll": true,
+ "label": "Status",
+ "name": "status",
+ "options": [],
+ "query": "ok,error",
+ "type": "custom",
+ "valuesFormat": "csv"
+ },
+ {
+ "current": {
+ "text": "",
+ "value": ""
+ },
+ "description": "Examples\n10s (Seconds)\n10ms (Milliseconds)\n10us (Microseconds)",
+ "label": "Min Duration",
+ "name": "min_duration",
+ "options": [
+ {
+ "selected": true,
+ "text": "",
+ "value": ""
+ }
+ ],
+ "query": "",
+ "type": "textbox"
+ },
+ {
+ "current": {
+ "text": "",
+ "value": ""
+ },
+ "description": "Examples\n10s (Seconds)\n10ms (Milliseconds)\n10us (Microseconds)",
+ "label": "Max Duration",
+ "name": "max_duration",
+ "options": [
+ {
+ "selected": true,
+ "text": "",
+ "value": ""
+ }
+ ],
+ "query": "",
+ "type": "textbox"
}
]
},
@@ -166,6 +367,6 @@
"timezone": "browser",
"title": "SkyWalking Trace",
"uid": "ggmb2l",
- "version": 1,
+ "version": 29,
"weekStart": ""
}
\ No newline at end of file
diff --git a/deploy/platform/config/grafana/dashboards/trace-zipkin.json b/deploy/platform/config/grafana/dashboards/trace-zipkin.json
index eb8bb50..222d73a 100644
--- a/deploy/platform/config/grafana/dashboards/trace-zipkin.json
+++ b/deploy/platform/config/grafana/dashboards/trace-zipkin.json
@@ -71,7 +71,7 @@
}
]
},
- "pluginVersion": "12.4.2",
+ "pluginVersion": "12.4.0",
"targets": [
{
"datasource": {
@@ -81,8 +81,14 @@
"filters": [
{
"id": "9e1b9c94",
+ "isCustomValue": false,
"operator": "=",
- "scope": "span"
+ "scope": "resource",
+ "tag": "remote.service",
+ "value": [
+ "$remote_service"
+ ],
+ "valueType": "string"
},
{
"id": "service-name",
@@ -91,9 +97,43 @@
"scope": "resource",
"tag": "service.name",
"value": [
- "$service_name"
+ "$service"
],
"valueType": "string"
+ },
+ {
+ "id": "span-name",
+ "isCustomValue": false,
+ "operator": "=",
+ "scope": "span",
+ "tag": "name",
+ "value": [
+ "$span_name"
+ ],
+ "valueType": "string"
+ },
+ {
+ "id": "status",
+ "isCustomValue": false,
+ "operator": "=",
+ "scope": "intrinsic",
+ "tag": "status",
+ "value": "$status",
+ "valueType": "string"
+ },
+ {
+ "id": "min-duration",
+ "operator": ">",
+ "tag": "duration",
+ "value": "$min_duration",
+ "valueType": "duration"
+ },
+ {
+ "id": "max-duration",
+ "operator": "<",
+ "tag": "duration",
+ "value": "$max_duration",
+ "valueType": "duration"
}
],
"limit": 20,
@@ -115,21 +155,49 @@
"list": [
{
"current": {
- "text": "app.sample-services",
- "value": "app.sample-services"
+ "text": "SkyWalkingPromQL",
+ "value": "cfed3ic1yzsaod"
+ },
+ "hide": 2,
+ "name": "DS_SW_Prometheus",
+ "options": [],
+ "query": "prometheus",
+ "refresh": 1,
+ "regex": "SkyWalkingPromQL",
+ "type": "datasource"
+ },
+ {
+ "current": {
+ "text": "ZipkinTraceQL",
+ "value": "dfibz35ad1gqob"
+ },
+ "hide": 2,
+ "name": "DS_ZK_Tempo",
+ "options": [],
+ "query": "tempo",
+ "refresh": 1,
+ "regex": "ZipkinTraceQL",
+ "type": "datasource"
+ },
+ {
+ "allValue": "*",
+ "current": {
+ "text": "All",
+ "value": "$__all"
},
"datasource": {
- "type": "tempo",
- "uid": "${DS_ZK_Tempo}"
+ "type": "prometheus",
+ "uid": "${DS_SW_Prometheus}"
},
- "definition": "",
- "label": "Service Name",
- "name": "service_name",
+ "definition": "label_values(zipkin_service_traffic,service)",
+ "includeAll": true,
+ "label": "Service",
+ "name": "service",
"options": [],
"query": {
- "label": "service",
- "refId": "TempoDatasourceVariableQueryEditor-VariableQuery",
- "type": 1
+ "qryType": 1,
+ "query": "label_values(zipkin_service_traffic,service)",
+ "refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
@@ -137,17 +205,105 @@
"type": "query"
},
{
+ "allValue": "*",
"current": {
- "text": "ZipkinTraceQL",
- "value": "PB0E497C724A9970E"
+ "text": "All",
+ "value": "$__all"
},
- "hide": 2,
- "name": "DS_ZK_Tempo",
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_SW_Prometheus}"
+ },
+ "definition": "label_values(zipkin_service_relation_traffic{service=\"$service\"},remote_service)",
+ "includeAll": true,
+ "label": "Remote Service",
+ "name": "remote_service",
"options": [],
- "query": "tempo",
+ "query": {
+ "qryType": 1,
+ "query": "label_values(zipkin_service_relation_traffic{service=\"$service\"},remote_service)",
+ "refId": "PrometheusVariableQueryEditor-VariableQuery"
+ },
"refresh": 1,
- "regex": "ZipkinTraceQL",
- "type": "datasource"
+ "regex": "",
+ "regexApplyTo": "value",
+ "type": "query"
+ },
+ {
+ "allValue": "*",
+ "current": {
+ "text": "All",
+ "value": "$__all"
+ },
+ "datasource": {
+ "type": "prometheus",
+ "uid": "${DS_SW_Prometheus}"
+ },
+ "definition": "label_values(zipkin_service_span_traffic{service=\"$service\"},span_name)",
+ "includeAll": true,
+ "label": "Span Name",
+ "name": "span_name",
+ "options": [],
+ "query": {
+ "qryType": 1,
+ "query": "label_values(zipkin_service_span_traffic{service=\"$service\"},span_name)",
+ "refId": "PrometheusVariableQueryEditor-VariableQuery"
+ },
+ "refresh": 1,
+ "regex": "",
+ "regexApplyTo": "value",
+ "type": "query"
+ },
+ {
+ "allValue": "*",
+ "current": {
+ "text": "$__all",
+ "value": "$__all"
+ },
+ "description": "",
+ "includeAll": true,
+ "label": "Status",
+ "name": "status",
+ "options": [],
+ "query": "error",
+ "type": "custom",
+ "valuesFormat": "csv"
+ },
+ {
+ "current": {
+ "text": "",
+ "value": ""
+ },
+ "description": "Examples\n10s (Seconds)\n10ms (Milliseconds)\n10us (Microseconds)",
+ "label": "Min Duration",
+ "name": "min_duration",
+ "options": [
+ {
+ "selected": true,
+ "text": "",
+ "value": ""
+ }
+ ],
+ "query": "",
+ "type": "textbox"
+ },
+ {
+ "current": {
+ "text": "",
+ "value": ""
+ },
+ "description": "Examples\n10s (Seconds)\n10ms (Milliseconds)\n10us (Microseconds)",
+ "label": "Max Duration",
+ "name": "max_duration",
+ "options": [
+ {
+ "selected": true,
+ "text": "",
+ "value": ""
+ }
+ ],
+ "query": "",
+ "type": "textbox"
}
]
},
@@ -159,6 +315,6 @@
"timezone": "browser",
"title": "Zipkin Trace",
"uid": "gn6djx",
- "version": 1,
+ "version": 17,
"weekStart": ""
}
\ No newline at end of file