You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/09/13 03:00:55 UTC

[incubator-skywalking] branch docs updated: no message

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch docs
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/docs by this push:
     new 958b3f7  no message
958b3f7 is described below

commit 958b3f7a2ce8ff1c2138a1c5c1066d31c686fc0f
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Sep 13 11:00:48 2018 +0800

    no message
---
 CHANGES.md                                 |  2 +-
 docs/en/guides/README.md                   |  1 +
 docs/en/setup/backend/backend-receivers.md | 17 +++++++++++++++++
 docs/en/setup/backend/backend-storage.md   |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 1479003..357ead7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,7 @@ Changes by Version
 ==================
 Release Notes.
 
-5.0.0-RC
+5.0.0-RC2
 ------------------
 
 #### Agent Changes
diff --git a/docs/en/guides/README.md b/docs/en/guides/README.md
index a4c3c10..524d45d 100644
--- a/docs/en/guides/README.md
+++ b/docs/en/guides/README.md
@@ -17,6 +17,7 @@ and private plugin developer should read this.
 - If you want to build a new probe or plugin in any language, please read [Component library definition and extension](Component-library-settings.md) document.
 - [Storage extension development guide](storage-extention.md). Help potential contributors to build a new 
 storage implementor besides the official.
+- 
 
 
 ## UI developer
diff --git a/docs/en/setup/backend/backend-receivers.md b/docs/en/setup/backend/backend-receivers.md
index 8e776e8..9fba9ed 100644
--- a/docs/en/setup/backend/backend-receivers.md
+++ b/docs/en/setup/backend/backend-receivers.md
@@ -5,7 +5,24 @@ receivers are using gRPC or HTTPRestful to provide service, actually, whether li
 could be receiver. Such as a receiver could base on pull data from remote, like Kakfa MQ.
 
 We have following receivers, and `default` implementors are provided in our Apache distribution.zzz
+1. **receiver-trace**. gRPC and HTTPRestful services to accept SkyWalking format traces.
 1. **receiver-register**. gRPC and HTTPRestful services to provide service, service instance and endpoint register.
 1. **service-mesh**. gRPC services accept data from inbound mesh probes.
 1. **istio-telemetry**. Istio telemetry is from Istio official bypass adaptor, this receiver match its gRPC services.
 1. **receiver-jvm**. gRPC services accept JVM metric data.
+
+The sample settings of these receivers should be already in default `application.yml`, and also list here
+```yaml
+receiver-trace:
+  default:
+    bufferPath: ../buffer/  # Path to trace buffer files, suggest to use absolute path
+    bufferOffsetMaxFileSize: 100 # Unit is MB
+    bufferDataMaxFileSize: 500 # Unit is MB
+    bufferFileCleanWhenRestart: false # Clean buffer file when backend restart.
+receiver-jvm:
+  default:
+service-mesh:
+  default:
+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 b45e6a4..7f60cef 100644
--- a/docs/en/setup/backend/backend-storage.md
+++ b/docs/en/setup/backend/backend-storage.md
@@ -6,7 +6,7 @@ use is by changing the `application.yml`
 - [**ElasticSearch 6**](#elasticsearch-6)
 
 ## H2
-Active ElasticSearch 6 as storage, set storage provider to **H2**.
+Active ElasticSearch 6 as storage, set storage provider to **H2**. Default in distribution package.
 
 Setting fragment example
 ```yaml