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 2018/10/28 07:49:18 UTC
[incubator-skywalking] 01/01: Add more documents for v6.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch v6-doc
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit dadd6af84834eb34e4394c35b33a9ee6575b974f
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Oct 28 15:49:06 2018 +0800
Add more documents for v6.
---
apm-webapp/src/main/assembly/webapp.yml | 3 +++
apm-webapp/src/main/resources/application.yml | 1 +
docs/en/setup/backend/backend-receivers.md | 4 ++++
docs/en/setup/backend/backend-storage.md | 10 ++++++++--
docs/en/setup/backend/ui-setup.md | 20 ++++++++++++++++++++
.../server-starter/src/main/assembly/application.yml | 2 +-
6 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/apm-webapp/src/main/assembly/webapp.yml b/apm-webapp/src/main/assembly/webapp.yml
index 8e0f7d1..6ff1c10 100644
--- a/apm-webapp/src/main/assembly/webapp.yml
+++ b/apm-webapp/src/main/assembly/webapp.yml
@@ -21,9 +21,12 @@ collector:
path: /graphql
ribbon:
ReadTimeout: 10000
+ # Point to all backend's restHost:restPort, split by ,
listOfServers: 127.0.0.1:10800
security:
user:
+ # username
admin:
+ # password
password: admin
diff --git a/apm-webapp/src/main/resources/application.yml b/apm-webapp/src/main/resources/application.yml
index b5d5a20..8bff13b 100644
--- a/apm-webapp/src/main/resources/application.yml
+++ b/apm-webapp/src/main/resources/application.yml
@@ -27,6 +27,7 @@ zuul:
collector:
path: /graphql
ribbon:
+ # Point to all backend's restHost:restPort, split by ,
listOfServers: 127.0.0.1:10800
security:
diff --git a/docs/en/setup/backend/backend-receivers.md b/docs/en/setup/backend/backend-receivers.md
index 9fba9ed..768020f 100644
--- a/docs/en/setup/backend/backend-receivers.md
+++ b/docs/en/setup/backend/backend-receivers.md
@@ -23,6 +23,10 @@ receiver-jvm:
default:
service-mesh:
default:
+ bufferPath: ../mesh-buffer/ # Path to mesh telemetry data buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
istio-telemetry:
default:
```
\ No newline at end of file
diff --git a/docs/en/setup/backend/backend-storage.md b/docs/en/setup/backend/backend-storage.md
index 50b9e37..e75aa9e 100644
--- a/docs/en/setup/backend/backend-storage.md
+++ b/docs/en/setup/backend/backend-storage.md
@@ -6,11 +6,17 @@ use is by changing the `application.yml`
- [**ElasticSearch 6**](#elasticsearch-6)
## H2
-Active H2 as storage, set storage provider to **H2**. Default in distribution package.
+Active H2 as storage, set storage provider to **H2** In-Memory Databases. Default in distribution package.
+Please read `Database URL Overview` in [H2 official document](http://www.h2database.com/html/features.html),
+you could set the target to H2 in **Embedded**, **Server** and **Mixed** modes.
Setting fragment example
```yaml
-
+storage:
+ h2:
+ driver: org.h2.jdbcx.JdbcDataSource
+ url: jdbc:h2:mem:skywalking-oap-db
+ user: sa
```
## ElasticSearch 6
diff --git a/docs/en/setup/backend/ui-setup.md b/docs/en/setup/backend/ui-setup.md
index ae0438b..733c84f 100644
--- a/docs/en/setup/backend/ui-setup.md
+++ b/docs/en/setup/backend/ui-setup.md
@@ -11,3 +11,23 @@ Setting file of UI is `webapp/webapp.yml` in distribution package. It is consti
1. Backend connect info.
1. Auth setting.
+```yaml
+server:
+ port: 8080
+
+collector:
+ path: /graphql
+ ribbon:
+ ReadTimeout: 10000
+ # Point to all backend's restHost:restPort, split by ,
+ listOfServers: 10.2.34.1:10800,10.2.34.2:10800
+
+security:
+ user:
+ # username
+ admin:
+ # password
+ password: admin
+
+```
+
diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml
index 7064bc3..c4fc574 100644
--- a/oap-server/server-starter/src/main/assembly/application.yml
+++ b/oap-server/server-starter/src/main/assembly/application.yml
@@ -69,7 +69,7 @@ receiver-jvm:
default:
service-mesh:
default:
- bufferPath: ../mesh-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferPath: ../mesh-buffer/ # Path to mesh telemetry data buffer files, suggest to use absolute path
bufferOffsetMaxFileSize: 100 # Unit is MB
bufferDataMaxFileSize: 500 # Unit is MB
bufferFileCleanWhenRestart: false