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/04/14 15:34:59 UTC
[skywalking] branch master updated: Show more metrics on service/instance/endpoint list on the dashboards (#8879)
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 e7d14bd37c Show more metrics on service/instance/endpoint list on the dashboards (#8879)
e7d14bd37c is described below
commit e7d14bd37c1ecc7b66527c26cf371e4fb127b844
Author: zhang-wei <zh...@apache.org>
AuthorDate: Thu Apr 14 23:34:52 2022 +0800
Show more metrics on service/instance/endpoint list on the dashboards (#8879)
---
.licenserc.yaml | 2 ++
docs/en/changes/changes.md | 1 +
.../browser/browser-app.json | 24 +++++++++++---
.../browser/browser-root.json | 12 +++++--
.../faas/faas-function.json | 19 +++++++++--
.../ui-initialized-templates/faas/faas-root.json | 25 ++++++++++++--
.../general/general-root.json | 25 ++++++++++++--
.../general/general-service.json | 38 +++++++++++++++++++---
.../ui-initialized-templates/mesh/mesh-root.json | 25 ++++++++++++--
.../mesh/mesh-service.json | 38 +++++++++++++++++++---
skywalking-ui | 2 +-
11 files changed, 188 insertions(+), 23 deletions(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 73c834ff3b..c4b70fb210 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -49,6 +49,8 @@ header:
- 'skywalking-ui/node'
- 'skywalking-ui/.browserslistrc'
- 'skywalking-ui/.prettierrc'
+ - 'skywalking-ui/src/types/auto-imports.d.ts'
+ - 'skywalking-ui/src/types/components.d.ts'
- '**/src/main/fbs/istio/**'
- '**/src/main/proto/envoy/**'
- '**/src/main/proto/udpa/**'
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index b78f77b71e..ca9c93c40a 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -21,6 +21,7 @@
* General service instance: move `Thread Pool` from JVM to Overview, fix `JVM GC Count` calculation.
* Add Apache ShenYu (incubating) component LOGO.
+* Show more metrics on service/instance/endpoint list on the dashboards.
#### Documentation
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json
index 6648adc502..8669a2e522 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-app.json
@@ -284,16 +284,24 @@
"fontSize": 12
},
"metrics": [
- "browser_app_single_version_pv"
+ "browser_app_single_version_pv",
+ "browser_app_single_version_error_rage"
],
"metricTypes": [
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "PV",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Error Rate"
}
]
}
@@ -320,16 +328,24 @@
"showYAxis": false
},
"metrics": [
- "browser_app_page_pv"
+ "browser_app_page_pv",
+ "browser_app_page_error_rate"
],
"metricTypes": [
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "PV",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Error Rate"
}
]
}
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json
index b06838ffad..7a25562b69 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/browser/browser-root.json
@@ -39,16 +39,24 @@
"showGroup": true
},
"metrics": [
- "browser_app_pv"
+ "browser_app_pv",
+ "browser_app_error_rage"
],
"metricTypes": [
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "PV",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Error Rate"
}
]
},
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 496e234e03..f6397f27ba 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
@@ -354,16 +354,31 @@
"fontSize": 12
},
"metrics": [
- "service_instance_cpm"
+ "service_instance_cpm",
+ "service_instance_sla",
+ "service_instance_resp_time"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
}
]
}
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json
index 97cda03fee..6af9f17bd1 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/faas/faas-root.json
@@ -61,16 +61,37 @@
"showGroup": false
},
"metrics": [
- "service_cpm"
+ "service_cpm",
+ "service_sla",
+ "service_resp_time",
+ "service_apdex"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
+ },
+ {
+ "calculation": "apdexAvg",
+ "label": "Apdex"
}
]
}
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
index d2b5857e8b..eadd746eaf 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-root.json
@@ -61,16 +61,37 @@
"showGroup": true
},
"metrics": [
- "service_cpm"
+ "service_cpm",
+ "service_sla",
+ "service_resp_time",
+ "service_apdex"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
+ },
+ {
+ "calculation": "apdexAvg",
+ "label": "Apdex"
}
]
}
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
index 6c3ab167dc..9802c31539 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/general/general-service.json
@@ -511,16 +511,31 @@
"fontSize": 12
},
"metrics": [
- "service_instance_cpm"
+ "service_instance_cpm",
+ "service_instance_sla",
+ "service_instance_resp_time"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
}
]
}
@@ -547,16 +562,31 @@
"showYAxis": false
},
"metrics": [
- "endpoint_cpm"
+ "endpoint_cpm",
+ "endpoint_sla",
+ "endpoint_resp_time"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
}
]
}
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
index fa09b5c171..8fae2e29a4 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-root.json
@@ -63,16 +63,37 @@
},
"standard": {},
"metrics": [
- "service_cpm"
+ "service_cpm",
+ "service_sla",
+ "service_resp_time",
+ "service_apdex"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls or packets / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
+ },
+ {
+ "calculation": "apdexAvg",
+ "label": "Apdex"
}
]
}
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
index 964ba7766d..291f522ba3 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/mesh/mesh-service.json
@@ -486,16 +486,31 @@
"fontSize": 12
},
"metrics": [
- "service_instance_cpm"
+ "service_instance_cpm",
+ "service_instance_sla",
+ "service_instance_resp_time"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls or packets / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
}
]
}
@@ -522,16 +537,31 @@
"showYAxis": false
},
"metrics": [
- "endpoint_cpm"
+ "endpoint_cpm",
+ "endpoint_sla",
+ "endpoint_resp_time"
],
"metricTypes": [
+ "readMetricsValues",
+ "readMetricsValues",
"readMetricsValues"
],
"moved": false,
"metricConfig": [
{
"label": "Load",
- "unit": "calls or packets / min"
+ "unit": "calls / min",
+ "calculation": "average"
+ },
+ {
+ "calculation": "percentageAvg",
+ "unit": "%",
+ "label": "Success Rate"
+ },
+ {
+ "calculation": "average",
+ "label": "Latency",
+ "unit": "ms"
}
]
}
diff --git a/skywalking-ui b/skywalking-ui
index 1d83e14f22..26db1ec23e 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 1d83e14f22e7809e7e3947c211dfe3ab20dc754c
+Subproject commit 26db1ec23ed06c662b4da6da022e678937b01b45