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/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 2dd4f54 Add some missing documents for v6 (#1830)
2dd4f54 is described below
commit 2dd4f54957cdb8c78a4584e01b851b267d7cb625
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Sun Oct 28 21:45:58 2018 +0800
Add some missing documents for v6 (#1830)
* Add more documents for v6.
* Make default setting consistent .
---
CHANGES.md | 2 +-
apm-webapp/src/main/assembly/webapp.yml | 5 ++++-
apm-webapp/src/main/resources/application.yml | 3 ++-
docs/en/protocols/Trace-Data-Protocol.md | 2 +-
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 +-
8 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 6fa8c0d..80f7039 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ tracing system with analysis and visualization capabilities.
We are an **Observa
The core and most important features in v6 are
1. Support to collect telemetry data from different sources, such as multiple
language agents and service mesh.
-1. Extensible stream analysis core. Make SQL and cache analysis available in
core level, although not
+1. Extensible stream analysis core. Make SQL and cache analysis available in
core level, although haven't
provided in this release.
1. Provide **Observability Analysis Language(OAL)** to make analysis metric
customization available.
1. New GraphQL query protocol. Not binding with UI now.
diff --git a/apm-webapp/src/main/assembly/webapp.yml
b/apm-webapp/src/main/assembly/webapp.yml
index 8e0f7d1..bb67538 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
- listOfServers: 127.0.0.1:10800
+ # Point to all backend's restHost:restPort, split by ,
+ listOfServers: 127.0.0.1:12800
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..7271314 100644
--- a/apm-webapp/src/main/resources/application.yml
+++ b/apm-webapp/src/main/resources/application.yml
@@ -27,7 +27,8 @@ zuul:
collector:
path: /graphql
ribbon:
- listOfServers: 127.0.0.1:10800
+ # Point to all backend's restHost:restPort, split by ,
+ listOfServers: 127.0.0.1:12800
security:
user:
diff --git a/docs/en/protocols/Trace-Data-Protocol.md
b/docs/en/protocols/Trace-Data-Protocol.md
index 0222a22..870acd1 100644
--- a/docs/en/protocols/Trace-Data-Protocol.md
+++ b/docs/en/protocols/Trace-Data-Protocol.md
@@ -113,7 +113,7 @@ Input：
## Deprecated services
**Deprecated service**(s) are the gRPC services SkyWalking used before. In
SkyWalking v6, in order to match the common
concepts in CloudNative world, these services are deprecated.
-Although there services are still supported at this moment, but it will be
removed after 6 months later(Feb. 2019).
+Although there services are still supported at this moment, but it will keep
in supported at least before the end of 2019.
## ~~Application Register Service~~
**Deprecated service**
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
