This is an automated email from the ASF dual-hosted git repository.
wu-sheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-horizon-ui.git
The following commit(s) were added to refs/heads/main by this push:
new 75a536d Fix bundled dashboard metric scopes
75a536d is described below
commit 75a536d4a89b2369b52322075ef36b3c52994308
Author: Wu Sheng <[email protected]>
AuthorDate: Sat May 16 22:00:07 2026 +0800
Fix bundled dashboard metric scopes
---
apps/bff/src/bundled_templates/layers/aws_eks.json | 129 ++++++++++++++++-----
.../src/bundled_templates/layers/aws_gateway.json | 2 +-
apps/bff/src/bundled_templates/layers/browser.json | 1 -
apps/bff/src/bundled_templates/layers/mesh_dp.json | 46 +-------
.../bundled_templates/layers/so11y_go_agent.json | 59 +---------
.../bundled_templates/layers/so11y_java_agent.json | 59 +---------
.../src/bundled_templates/layers/so11y_oap.json | 60 +---------
7 files changed, 112 insertions(+), 244 deletions(-)
diff --git a/apps/bff/src/bundled_templates/layers/aws_eks.json
b/apps/bff/src/bundled_templates/layers/aws_eks.json
index 7be2a41..dccdeb4 100644
--- a/apps/bff/src/bundled_templates/layers/aws_eks.json
+++ b/apps/bff/src/bundled_templates/layers/aws_eks.json
@@ -5,44 +5,43 @@
"color": "var(--sw-warn)",
"documentLink":
"https://skywalking.apache.org/docs/main/next/en/setup/backend/backend-aws-eks-monitoring/";,
"aliases": {
- "services": "EKS services",
- "instances": "Nodes"
+ "services": "Clusters",
+ "instances": "Nodes",
+ "endpoints": "EKS services"
},
"components": {
"service": true,
"instances": true,
- "endpoints": false,
+ "endpoints": true,
"topology": false,
"traces": false,
"logs": false
},
"layer-header": {
- "orderBy": "podCpu",
+ "orderBy": "nodes",
"columns": [
{
- "metric": "podCpu",
- "label": "Pod CPU %",
- "unit": "%",
- "mqe": "avg(eks_cluster_service_pod_cpu_utilization)",
+ "metric": "nodes",
+ "label": "Nodes",
+ "mqe": "latest(eks_cluster_node_count)",
"aggregation": "avg"
},
{
- "metric": "podMem",
- "label": "Pod Mem %",
- "unit": "%",
- "mqe": "avg(eks_cluster_service_pod_memory_utilization)",
+ "metric": "failedNodes",
+ "label": "Failed Nodes",
+ "mqe": "latest(eks_cluster_failed_node_count)",
"aggregation": "avg"
},
{
- "metric": "txErr",
- "label": "TX Err",
- "mqe": "avg(eks_cluster_service_pod_net_tx_error)",
+ "metric": "namespaces",
+ "label": "Namespaces",
+ "mqe": "latest(eks_cluster_namespace_count)",
"aggregation": "avg"
},
{
- "metric": "rxErr",
- "label": "RX Err",
- "mqe": "avg(eks_cluster_service_pod_net_rx_error)",
+ "metric": "services",
+ "label": "Services",
+ "mqe": "latest(eks_cluster_service_count)",
"aggregation": "avg"
}
]
@@ -54,19 +53,17 @@
"size": "auto",
"metrics": [
{
- "id": "podCpu",
- "label": "Pod CPU %",
- "tip": "Service pods CPU utilization.",
- "mqe": "avg(eks_cluster_service_pod_cpu_utilization)",
- "unit": "%",
+ "id": "nodes",
+ "label": "Nodes",
+ "tip": "EKS cluster node count.",
+ "mqe": "latest(eks_cluster_node_count)",
"aggregation": "avg"
},
{
- "id": "podMem",
- "label": "Pod Mem %",
- "tip": "Service pods memory utilization.",
- "mqe": "avg(eks_cluster_service_pod_memory_utilization)",
- "unit": "%",
+ "id": "failedNodes",
+ "label": "Failed Nodes",
+ "tip": "Failed EKS nodes reported by the cluster.",
+ "mqe": "latest(eks_cluster_failed_node_count)",
"aggregation": "avg"
}
]
@@ -75,6 +72,82 @@
},
"dashboards": {
"service": [
+ {
+ "id": "node_count",
+ "title": "Node Count",
+ "type": "line",
+ "expressions": [
+ "eks_cluster_node_count"
+ ],
+ "span": 3,
+ "rowSpan": 2,
+ "format": "int"
+ },
+ {
+ "id": "failed_nodes",
+ "title": "Failed Nodes",
+ "type": "line",
+ "expressions": [
+ "eks_cluster_failed_node_count"
+ ],
+ "span": 3,
+ "rowSpan": 2,
+ "format": "int"
+ },
+ {
+ "id": "namespace_count",
+ "title": "Namespace Count",
+ "type": "line",
+ "expressions": [
+ "eks_cluster_namespace_count"
+ ],
+ "span": 3,
+ "rowSpan": 2,
+ "format": "int"
+ },
+ {
+ "id": "service_count",
+ "title": "EKS Service Count",
+ "type": "line",
+ "expressions": [
+ "eks_cluster_service_count"
+ ],
+ "span": 3,
+ "rowSpan": 2,
+ "format": "int"
+ },
+ {
+ "id": "network_errors",
+ "title": "Cluster Network Errors",
+ "type": "line",
+ "expressions": [
+ "eks_cluster_net_rx_error",
+ "eks_cluster_net_tx_error"
+ ],
+ "expressionLabels": [
+ "rx",
+ "tx"
+ ],
+ "span": 6,
+ "rowSpan": 2
+ },
+ {
+ "id": "network_dropped",
+ "title": "Cluster Network Drops",
+ "type": "line",
+ "expressions": [
+ "eks_cluster_net_rx_dropped",
+ "eks_cluster_net_tx_dropped"
+ ],
+ "expressionLabels": [
+ "rx",
+ "tx"
+ ],
+ "span": 6,
+ "rowSpan": 2
+ }
+ ],
+ "endpoint": [
{
"id": "pod_cpu",
"title": "Pod CPU Utilization (%)",
diff --git a/apps/bff/src/bundled_templates/layers/aws_gateway.json
b/apps/bff/src/bundled_templates/layers/aws_gateway.json
index ce0344b..301fdf1 100644
--- a/apps/bff/src/bundled_templates/layers/aws_gateway.json
+++ b/apps/bff/src/bundled_templates/layers/aws_gateway.json
@@ -239,7 +239,7 @@
"type": "line",
"unit": "KB",
"expressions": [
- "aws_gateway_endpoint_data_processed/1024"
+ "aws_gateway_endpoint_DataProcessed/1024"
],
"span": 4,
"rowSpan": 2
diff --git a/apps/bff/src/bundled_templates/layers/browser.json
b/apps/bff/src/bundled_templates/layers/browser.json
index 3c31b33..dc58364 100644
--- a/apps/bff/src/bundled_templates/layers/browser.json
+++ b/apps/bff/src/bundled_templates/layers/browser.json
@@ -30,7 +30,6 @@
"title": "Page health",
"size": "auto",
"metrics": [
- { "id": "fmp_p95", "label": "FMP P95", "tip": "95th-percentile
first-meaningful-paint latency across the app.", "mqe":
"browser_app_page_fmp_percentile{p='95'}", "unit": "ms", "aggregation": "avg" },
{ "id": "errorRate", "label": "Error Rate", "tip": "Percentage of
page loads that produced an error.", "mqe": "browser_app_error_rate/100",
"unit": "%", "aggregation": "avg" }
]
},
diff --git a/apps/bff/src/bundled_templates/layers/mesh_dp.json
b/apps/bff/src/bundled_templates/layers/mesh_dp.json
index b6730fc..5603118 100644
--- a/apps/bff/src/bundled_templates/layers/mesh_dp.json
+++ b/apps/bff/src/bundled_templates/layers/mesh_dp.json
@@ -27,51 +27,7 @@
"scope": "instance"
},
"layer-header": {
- "orderBy": "conns",
- "columns": [
- {
- "metric": "conns",
- "label": "Connections",
- "mqe": "avg(envoy_total_connections_used)",
- "aggregation": "avg"
- },
- {
- "metric": "threads",
- "label": "Worker Threads",
- "mqe": "avg(envoy_worker_threads)",
- "aggregation": "avg"
- },
- {
- "metric": "bugFail",
- "label": "Bug Failures",
- "mqe": "avg(envoy_bug_failures)",
- "aggregation": "avg"
- }
- ]
- },
- "overview": {
- "groups": [
- {
- "title": "Sidecar health",
- "size": "auto",
- "metrics": [
- {
- "id": "conns",
- "label": "Connections",
- "tip": "Envoy connections used across sidecars.",
- "mqe": "avg(envoy_total_connections_used)",
- "aggregation": "avg"
- },
- {
- "id": "bugFail",
- "label": "Bug Failures",
- "tip": "Envoy assertion / bug counter \u2014 should be 0 in
healthy clusters.",
- "mqe": "avg(envoy_bug_failures)",
- "aggregation": "avg"
- }
- ]
- }
- ]
+ "columns": []
},
"dashboards": {
"instance": [
diff --git a/apps/bff/src/bundled_templates/layers/so11y_go_agent.json
b/apps/bff/src/bundled_templates/layers/so11y_go_agent.json
index cd5b13a..37399b2 100644
--- a/apps/bff/src/bundled_templates/layers/so11y_go_agent.json
+++ b/apps/bff/src/bundled_templates/layers/so11y_go_agent.json
@@ -1,7 +1,8 @@
{
"key": "SO11Y_GO_AGENT",
- "alias": "Go Agent (self-obs)",
+ "alias": "Go Agent",
"group": "Self-Observability",
+ "visibility": "operate",
"color": "var(--sw-fg-2)",
"documentLink":
"https://skywalking.apache.org/docs/main/next/en/setup/service-agent/server-agents/";,
"aliases": {
@@ -17,61 +18,7 @@
"logs": false
},
"layer-header": {
- "orderBy": "created",
- "columns": [
- {
- "metric": "created",
- "label": "Created RPM",
- "mqe":
"sum(aggregate_labels(meter_sw_go_created_tracing_context_count,sum))",
- "aggregation": "sum",
- "unit": "rpm"
- },
- {
- "metric": "finished",
- "label": "Finished RPM",
- "mqe":
"sum(aggregate_labels(meter_sw_go_finished_tracing_context_count,sum))",
- "aggregation": "sum",
- "unit": "rpm"
- },
- {
- "metric": "ignored",
- "label": "Ignored RPM",
- "mqe":
"sum(aggregate_labels(meter_sw_go_created_ignored_context_count,sum))",
- "aggregation": "sum",
- "unit": "rpm"
- },
- {
- "metric": "leaked",
- "label": "Leaks",
- "mqe": "sum(meter_sw_go_possible_leaked_context_count)",
- "aggregation": "sum"
- }
- ]
- },
- "overview": {
- "groups": [
- {
- "title": "Tracing context",
- "size": "auto",
- "metrics": [
- {
- "id": "created",
- "label": "Created",
- "tip": "Tracing contexts created across all Go agents in this
service per minute.",
- "mqe":
"sum(aggregate_labels(meter_sw_go_created_tracing_context_count,sum))",
- "unit": "rpm",
- "aggregation": "sum"
- },
- {
- "id": "leaked",
- "label": "Leaks",
- "tip": "Possible leaked contexts \u2014 non-zero indicates
instrumentation drift.",
- "mqe": "sum(meter_sw_go_possible_leaked_context_count)",
- "aggregation": "sum"
- }
- ]
- }
- ]
+ "columns": []
},
"dashboards": {
"instance": [
diff --git a/apps/bff/src/bundled_templates/layers/so11y_java_agent.json
b/apps/bff/src/bundled_templates/layers/so11y_java_agent.json
index 619587b..31b7a16 100644
--- a/apps/bff/src/bundled_templates/layers/so11y_java_agent.json
+++ b/apps/bff/src/bundled_templates/layers/so11y_java_agent.json
@@ -1,7 +1,8 @@
{
"key": "SO11Y_JAVA_AGENT",
- "alias": "Java Agent (self-obs)",
+ "alias": "Java Agent",
"group": "Self-Observability",
+ "visibility": "operate",
"color": "var(--sw-fg-2)",
"documentLink":
"https://skywalking.apache.org/docs/main/next/en/setup/service-agent/server-agents/";,
"aliases": {
@@ -17,61 +18,7 @@
"logs": false
},
"layer-header": {
- "orderBy": "created",
- "columns": [
- {
- "metric": "created",
- "label": "Created RPM",
- "mqe":
"sum(aggregate_labels(meter_java_agent_created_tracing_context_count,sum))",
- "aggregation": "sum",
- "unit": "rpm"
- },
- {
- "metric": "finished",
- "label": "Finished RPM",
- "mqe":
"sum(aggregate_labels(meter_java_agent_finished_tracing_context_count,sum))",
- "aggregation": "sum",
- "unit": "rpm"
- },
- {
- "metric": "ignored",
- "label": "Ignored RPM",
- "mqe":
"sum(aggregate_labels(meter_java_agent_created_ignored_context_count,sum))",
- "aggregation": "sum",
- "unit": "rpm"
- },
- {
- "metric": "leaked",
- "label": "Leaks",
- "mqe": "sum(meter_java_agent_possible_leaked_context_count)",
- "aggregation": "sum"
- }
- ]
- },
- "overview": {
- "groups": [
- {
- "title": "Tracing context",
- "size": "auto",
- "metrics": [
- {
- "id": "created",
- "label": "Created",
- "tip": "Tracing contexts created across all Java agents in this
service per minute.",
- "mqe":
"sum(aggregate_labels(meter_java_agent_created_tracing_context_count,sum))",
- "unit": "rpm",
- "aggregation": "sum"
- },
- {
- "id": "leaked",
- "label": "Leaks",
- "tip": "Possible leaked contexts \u2014 non-zero indicates
instrumentation drift.",
- "mqe": "sum(meter_java_agent_possible_leaked_context_count)",
- "aggregation": "sum"
- }
- ]
- }
- ]
+ "columns": []
},
"dashboards": {
"instance": [
diff --git a/apps/bff/src/bundled_templates/layers/so11y_oap.json
b/apps/bff/src/bundled_templates/layers/so11y_oap.json
index d4b3713..509ba49 100644
--- a/apps/bff/src/bundled_templates/layers/so11y_oap.json
+++ b/apps/bff/src/bundled_templates/layers/so11y_oap.json
@@ -1,7 +1,8 @@
{
"key": "SO11Y_OAP",
- "alias": "OAP (self-obs)",
+ "alias": "OAP",
"group": "Self-Observability",
+ "visibility": "operate",
"color": "var(--sw-fg-2)",
"documentLink":
"https://skywalking.apache.org/docs/main/next/en/setup/backend/backend-setup/";,
"aliases": {
@@ -17,62 +18,7 @@
"logs": false
},
"layer-header": {
- "orderBy": "cpu",
- "columns": [
- {
- "metric": "cpu",
- "label": "Avg CPU",
- "unit": "%",
- "mqe": "avg(meter_oap_instance_cpu_percentage)",
- "aggregation": "avg"
- },
- {
- "metric": "persist",
- "label": "Persist",
- "unit": "/min",
- "mqe": "sum(meter_oap_instance_persistence_execute_count)",
- "aggregation": "sum"
- },
- {
- "metric": "graphql",
- "label": "GraphQL",
- "unit": "/min",
- "mqe": "sum(meter_oap_instance_graphql_query_count)",
- "aggregation": "sum"
- },
- {
- "metric": "graphqlErr",
- "label": "GraphQL err",
- "unit": "/min",
- "mqe": "sum(meter_oap_instance_graphql_query_error_count)",
- "aggregation": "sum"
- }
- ]
- },
- "overview": {
- "groups": [
- {
- "title": "OAP health",
- "size": "auto",
- "metrics": [
- {
- "id": "cpu",
- "label": "CPU %",
- "tip": "OAP process CPU usage averaged across instances.",
- "mqe": "avg(meter_oap_instance_cpu_percentage)",
- "unit": "%",
- "aggregation": "avg"
- },
- {
- "id": "graphqlErr",
- "label": "GraphQL Err",
- "tip": "GraphQL query errors per minute summed across instances.",
- "mqe": "sum(meter_oap_instance_graphql_query_error_count)",
- "aggregation": "sum"
- }
- ]
- }
- ]
+ "columns": []
},
"dashboards": {
"instance": [
