kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add dashboards for Service/Instance Hierarchy. (#11797) 

* Add dashboards for Service/Instance Hierarchy.
Fix dashboard `K8S-Service-Root` metrics expression.
This commit is contained in:
Wan Kai 2024-01-18 18:31:19 +08:00 committed by GitHub
parent f4a8f4aa99
commit cc79bf688c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 198 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/en/changes/changes.md
View File

@ -38,6 +38,8 @@
* Add isDefault to the dashboard configuration.
* Add expressions to dashboard configurations on the dashboard list page.
* Update Kubernetes related UI templates for adapt data from eBPF access log.
* Fix dashboard `K8S-Service-Root` metrics expression.
* Add dashboards for Service/Instance Hierarchy.
#### Documentation

30
oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-instance.json
View File

@ -1,4 +1,3 @@
[
{
"id": "General-Instance",
@ -863,11 +862,11 @@
"widget": {
"title": "Instance CPU Usage (%)"
},
"metricMode":"Expression",
"expressions":[
"metricMode": "Expression",
"expressions": [
"meter_process_cpu_usage"
],
"typesOfMQE":[
"typesOfMQE": [
"TIME_SERIES_VALUES"
]
},
@ -1771,8 +1770,27 @@
"layer": "GENERAL",
"entity": "ServiceInstance",
"name": "General-Instance",
"id": "General-Instance",
"isRoot": false
"isRoot": false,
"isDefault": true,
"expressions": [
"avg(service_instance_cpm)",
"avg(service_instance_sla/100)",
"avg(service_instance_resp_time)"
],
"expressionsConfig": [
{
"unit": "calls / min",
"label": "Load"
},
{
"label": "Success Rate",
"unit": "%"
},
{
"label": "Latency",
"unit": "ms"
}
]
}
}
]

24
oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
View File

@ -1,4 +1,3 @@
[
{
"id": "General-Service",
@ -911,10 +910,29 @@
"eventAssociate": true
}
],
"name": "General-Service",
"layer": "GENERAL",
"entity": "Service",
"name": "General-Service",
"id": "General-Service"
"isDefault": true,
"expressions": [
"avg(service_cpm)",
"avg(service_sla/100)",
"avg(service_resp_time)"
],
"expressionsConfig": [
{
"unit": "calls / min",
"label": "Load"
},
{
"unit": "%",
"label": "Success Rate"
},
{
"unit": "ms",
"label": "Latency"
}
]
}
}
]

32
oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-pod.json
View File

@ -1636,8 +1636,36 @@
"layer": "K8S_SERVICE",
"entity": "ServiceInstance",
"name": "K8S-Service-Pods",
"id": "89a35b46-449d-4ef0-8297-2109f69086eb",
"isRoot": false
"isDefault": true,
"expressions": [
"avg(kubernetes_service_instance_write_package_size)/60",
"avg(kubernetes_service_instance_read_package_size)/60",
"avg(kubernetes_service_instance_http_call_cpm)",
"avg(kubernetes_service_instance_http_call_duration/kubernetes_service_instance_http_call_cpm/1000000)",
"avg(kubernetes_service_instance_http_call_success_count / kubernetes_service_instance_http_call_cpm*100)"
],
"expressionsConfig": [
{
"unit": "bytes / s",
"label": "Write"
},
{
"unit": "bytes / s",
"label": "Read"
},
{
"label": "HTTP Load",
"unit": "calls / min"
},
{
"label": "HTTP Latency",
"unit": "ms"
},
{
"label": "HTTP Success Rate",
"unit": "%"
}
]
}
}
]

30
oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-root.json
View File

@ -52,9 +52,9 @@
"TIME_SERIES_VALUES"
],
"expressions": [
"avg(k8s_service_pod_total)",
"avg(k8s_service_cpu_cores_requests)",
"avg(k8s_service_cpu_cores_limits)"
"latest(k8s_service_pod_total)",
"latest(k8s_service_cpu_cores_requests)",
"latest(k8s_service_cpu_cores_limits)"
],
"graph": {
"type": "ServiceList",
@ -141,12 +141,12 @@
},
"linkServerMetricConfig": [
{
"unit": "bytes",
"label": "Server Write Per Seconds"
"unit": "bytes / s",
"label": "Server Write"
},
{
"unit": "bytes",
"label": "Server Read Per Seconds"
"unit": "bytes / s",
"label": "Server Read"
},
{
"unit": "calls / min",
@ -159,12 +159,12 @@
],
"linkClientMetricConfig": [
{
"unit": "bytes",
"label": "Client Write Per Seconds"
"unit": "bytes / s",
"label": "Client Write"
},
{
"label": "Client Read Per Seconds",
"unit": "bytes"
"label": "Client Read",
"unit": "bytes / s"
},
{
"unit": "calls / min",
@ -177,12 +177,12 @@
],
"nodeMetricConfig": [
{
"unit": "bytes",
"label": "Write Per Seconds"
"unit": "bytes / s",
"label": "Write"
},
{
"unit": "bytes",
"label": "Read Per Seconds"
"unit": "bytes / s",
"label": "Read"
},
{
"label": "HTTP Load",

47
oap-server/server-starter/src/main/resources/ui-initialized-templates/k8s_service/k8s-service-service.json
View File

@ -1937,7 +1937,50 @@
"layer": "K8S_SERVICE",
"entity": "Service",
"name": "K8S-Service-Service",
"id": "K8S-Service-Service"
"isDefault": true,
"expressions": [
"latest(k8s_service_pod_total)",
"latest(k8s_service_cpu_cores_requests)",
"latest(k8s_service_cpu_cores_limits)",
"avg(kubernetes_service_write_package_size)/60",
"avg(kubernetes_service_read_package_size)/60",
"avg(kubernetes_service_http_call_cpm)",
"avg(kubernetes_service_http_call_duration/kubernetes_service_http_call_cpm/1000000)",
"avg(kubernetes_service_http_call_success_count / kubernetes_service_http_call_cpm*100)"
],
"expressionsConfig": [
{
"label": "Pod Total"
},
{
"unit": "m",
"label": "CPU Requests"
},
{
"unit": "m",
"label": "CPU Limits"
},
{
"unit": "bytes / s",
"label": "Write"
},
{
"unit": "bytes / s",
"label": "Read"
},
{
"label": "HTTP Load",
"unit": "calls / min"
},
{
"label": "HTTP Latency",
"unit": "ms"
},
{
"label": "HTTP Success Rate",
"unit": "%"
}
]
}
}
]
]

22
oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-instance.json
View File

@ -579,7 +579,27 @@
"layer": "MESH",
"entity": "ServiceInstance",
"name": "Mesh-Instance",
"id": "Mesh-Instance"
"isRoot": false,
"isDefault": true,
"expressions": [
"avg(service_instance_cpm)",
"avg(service_instance_sla/100)",
"avg(service_instance_resp_time)"
],
"expressionsConfig": [
{
"unit": "calls / min",
"label": "Load"
},
{
"label": "Success Rate",
"unit": "%"
},
{
"label": "Latency",
"unit": "ms"
}
]
}
}
]

21
oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
View File

@ -802,7 +802,26 @@
"layer": "MESH",
"entity": "Service",
"name": "Mesh-Service",
"id": "Mesh-Service"
"isDefault": true,
"expressions": [
"avg(service_cpm)",
"avg(service_sla/100)",
"avg(service_resp_time)"
],
"expressionsConfig": [
{
"unit": "calls / min",
"label": "Load"
},
{
"unit": "%",
"label": "Success Rate"
},
{
"unit": "ms",
"label": "Latency"
}
]
}
}
]

21
oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh_dp/mesh-data-plane-instance.json
View File

@ -332,8 +332,25 @@
"layer": "MESH_DP",
"entity": "ServiceInstance",
"name": "Mesh-Data-Plane-Instance",
"id": "Mesh-Data-Plane-Instance",
"isRoot": false
"isRoot": false,
"isDefault": true,
"expressions": [
"latest(envoy_total_connections_used)",
"latest(envoy_worker_threads)",
"avg(envoy_heap_memory_used)/1024/1024"
],
"expressionsConfig": [
{
"label": "Connections"
},
{
"label": "Worker Threads"
},
{
"label": "Heap Memory Used",
"unit": "MB"
}
]
}
}
]

2
skywalking-ui

@ -1 +1 @@
Subproject commit f809123b4f03521a23304dbe95a497a06fb9670f
Subproject commit f76500bb6e5e796171f393994f88ede62a370b02