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/11/30 07:09:28 UTC

[incubator-skywalking] branch doc created (now ff50777)

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

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


      at ff50777  Update document and user wall.

This branch includes the following new commits:

     new ff50777  Update document and user wall.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[incubator-skywalking] 01/01: Update document and user wall.

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit ff5077700822332cb5f8d29804510558bd45cdc5
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Nov 30 15:09:15 2018 +0800

    Update document and user wall.
---
 README.md                                | 11 ++++++++++-
 docs/en/guides/storage-extention.md      |  6 +++++-
 docs/en/setup/backend/backend-storage.md | 19 ++++++++++++++-----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d9874c0..e87e190 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ The core features are following.
 - Alarm
 
 
-<img src="https://skywalkingtest.github.io/page-resources/6-alpha-overview.png"/>
+<img src="https://skywalkingtest.github.io/page-resources/6-beta-overview.png"/>
 
 SkyWalking supports to collect telemetry (traces and metrics) data from multiple sources
 and multiple formats, 
@@ -98,6 +98,15 @@ Here is the **User Wall** of SkyWalking.
 
 Users are encouraged to add themselves to the [PoweredBy](docs/powered-by.md) page.
 
+# Landscape
+
+<p align="center">
+<img src="https://landscape.cncf.io/images/cncf-landscape.svg" width="150"/>&nbsp;&nbsp;<img src="https://landscape.cncf.io/images/cncf.svg" width="200"/>
+<br/>
+SkyWalking enriches the <a href="https://landscape.cncf.io/landscape=observability-and-analysis&license=apache-license-2-0">CNCF CLOUD NATIVE Landscape.
+
+</p>
+
 <p align="center">
 <a href="https://openapm.io"><img src="https://openapm.io/static/media/openapm_logo.svg" width="100"/></a> 
   <br/>Our project enriches the <a href="https://openapm.io">OpenAPM Landscape!</a>
diff --git a/docs/en/guides/storage-extention.md b/docs/en/guides/storage-extention.md
index a88e34b..d52100c 100644
--- a/docs/en/guides/storage-extention.md
+++ b/docs/en/guides/storage-extention.md
@@ -34,4 +34,8 @@ In `public void prepare()`, use `this#registerServiceImplementation` method to d
 
 ## Example
 Take `org.apache.skywalking.oap.server.storage.plugin.elasticsearch.StorageModuleElasticsearchProvider` 
-or `org.apache.skywalking.oap.server.storage.plugin.jdbc.mysql.MySQLStorageProvider`  as a good example.
\ No newline at end of file
+or `org.apache.skywalking.oap.server.storage.plugin.jdbc.mysql.MySQLStorageProvider`  as a good example.
+
+## Redistribution with new storage implementation.
+You don't have to clone the main repo just for implementing the storage. You could just easy depend our Apache releases.
+Take a look at [OpenSkywalking/SkyWalking-With-Es5x-Storage](https://github.com/OpenSkywalking/SkyWalking-With-Es5x-Storage) repo, SkyWalking v6 redistribution with ElasticSearch 5 TCP connection storage implemention.
\ 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 f5ea054..c3a9ad9 100644
--- a/docs/en/setup/backend/backend-storage.md
+++ b/docs/en/setup/backend/backend-storage.md
@@ -2,10 +2,15 @@
 SkyWalking storage is pluggable, we have provided the following storage solutions, you could easily 
 use is by changing the `application.yml`
 
-- [**H2**](#h2)
-- [**ElasticSearch 6**](#elasticsearch-6)
-- [**MySQL**](#mysql)
-- [**TiDB**](#tidb)
+Native supported storage
+- H2
+- ElasticSearch 6
+- MySQL
+- TiDB
+
+Redistribution version with supported storage.
+- ElasticSearch 5
+
 
 ## H2
 Active H2 as storage, set storage provider to **H2** In-Memory Databases. Default in distribution package.
@@ -24,7 +29,7 @@ storage:
 ## ElasticSearch 6
 Active ElasticSearch 6 as storage, set storage provider to **elasticsearch**.
 
-> Required ElasticSearch 6.3.0 or higher.
+**Required ElasticSearch 6.3.0 or higher. HTTP RestHighLevelClient is used to connect server.**
 
 Setting fragment example
 ```yaml
@@ -73,6 +78,10 @@ storage:
 All connection related settings including link url, username and password
 are in `datasource-settings.properties`. And these settings can refer to the configuration of *MySQL* above.
 
+## ElasticSearch 5
+ElasticSearch 5 is incompatible with ElasticSearch 6 Java client jar, so it could be included in native distribution.
+[OpenSkywalking/SkyWalking-With-Es5x-Storage](https://github.com/OpenSkywalking/SkyWalking-With-Es5x-Storage) repo includes the distribution version. 
+
 ## More storage solution extension
 Follow [Storage extension development guide](../../guides/storage-extention.md) 
 in [Project Extensions document](../../guides/README.md#project-extensions) in development guide.