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 08:08:01 UTC

[incubator-skywalking] branch master updated: Update user wall and document (#1982)

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 e2f2356  Update user wall and document (#1982)
e2f2356 is described below

commit e2f2356a6fcbfe5e361ce0538b80a790d236b7cc
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Nov 30 16:07:56 2018 +0800

    Update user wall and document (#1982)
    
    * Update document and user wall.
    
    * Change format.
    
    * user wall updated.
    
    * Fix typo
---
 README.md                                | 14 ++++++++++++--
 docs/en/guides/storage-extention.md      |  6 +++++-
 docs/en/setup/backend/backend-storage.md | 19 ++++++++++++++-----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index d9874c0..c24f908 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, 
@@ -94,10 +94,20 @@ Follow this [document](docs/en/guides/How-to-build.md).
 A wide variety of companies and organizations use SkyWalking for research, production and commercial product.
 Here is the **User Wall** of SkyWalking.
 
-<img src="https://skywalkingtest.github.io/page-resources/users/users-2018-11-02.png"/>
+<img src="https://skywalkingtest.github.io/page-resources/users/users-2018-11-30.png"/>
 
 Users are encouraged to add themselves to the [PoweredBy](docs/powered-by.md) page.
 
+# Landscapes
+
+<p align="center">
+<br/><br/>
+<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/><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 fd07e20..cad0613 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
 
@@ -71,6 +76,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 not 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.