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/04 14:02:18 UTC
[skywalking] branch master updated: Sync UI and update templates (#8800)
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 1ca53a12ed Sync UI and update templates (#8800)
1ca53a12ed is described below
commit 1ca53a12ed93ada216ba138736d5fb2596cddbcc
Author: Kai <wa...@foxmail.com>
AuthorDate: Mon Apr 4 22:02:08 2022 +0800
Sync UI and update templates (#8800)
---
docs/en/setup/backend/backend-vm-monitoring.md | 6 +++---
.../src/main/resources/ui-initialized-templates/faas/faas-root.json | 4 ++--
.../virtual_database/virtual-database-root.json | 2 +-
skywalking-ui | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/en/setup/backend/backend-vm-monitoring.md b/docs/en/setup/backend/backend-vm-monitoring.md
index 562379e07d..9a6ac3cc02 100644
--- a/docs/en/setup/backend/backend-vm-monitoring.md
+++ b/docs/en/setup/backend/backend-vm-monitoring.md
@@ -1,7 +1,7 @@
-# VMs monitoring
+# Linux Monitoring
SkyWalking leverages Prometheus node-exporter to collect metrics data from the VMs, and leverages OpenTelemetry Collector to transfer the metrics to
[OpenTelemetry receiver](opentelemetry-receiver.md) and into the [Meter System](./../../concepts-and-designs/meter.md).
-We define the VM entity as a `Service` in OAP, and use `vm::` as a prefix to identify it.
+VM entity as a `Service` in OAP, and on the `Layer: OS_LINUX`.
## Data flow
1. The Prometheus node-exporter collects metrics data from the VMs.
@@ -35,7 +35,7 @@ We define the VM entity as a `Service` in OAP, and use `vm::` as a prefix to ide
## Customizing
You can customize your own metrics/expression/dashboard panel.
The metrics definition and expression rules are found in `/config/otel-oc-rules/vm.yaml`.
-The dashboard panel confirmations are found in `/config/ui-initialized-templates/vm.yml`.
+The dashboard panel confirmations are found in `/config/ui-initialized-templates/os_linux`.
## Blog
For more details, see blog article [SkyWalking 8.4 provides infrastructure monitoring](https://skywalking.apache.org/blog/2021-02-07-infrastructure-monitoring/).
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 0447575f1d..11c34f44c0 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
@@ -22,7 +22,7 @@
"children": [
{
"x": 0,
- "y": 2,
+ "y": 3,
"w": 24,
"h": 52,
"i": "1",
@@ -209,7 +209,7 @@
"x": 0,
"y": 0,
"w": 24,
- "h": 2,
+ "h": 3,
"i": "2",
"type": "Text",
"metricTypes": [
diff --git a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json
index 784b07ac57..e977a9c61f 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json
+++ b/oap-server/server-starter/src/main/resources/ui-initialized-templates/virtual_database/virtual-database-root.json
@@ -71,7 +71,7 @@
"content": "Observe the Virtual Database which is conjectured by language agent through various plugins.",
"fontSize": 14,
"textAlign": "left",
- "url": "test"
+ "url": "https://skywalking.apache.org/docs/main/latest/en/setup/service-agent/virtual-database/"
},
"moved": false
}
diff --git a/skywalking-ui b/skywalking-ui
index 4e8aa062f5..e955c91323 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 4e8aa062f5a0b03c74fdaf5d7a3578ce3441487a
+Subproject commit e955c91323ef14449d96a402f9c000c3d77355bd