From e2f2356a6fcbfe5e361ce0538b80a790d236b7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 30 Nov 2018 16:07:56 +0800 Subject: [PATCH] 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 d9874c01f..c24f90806 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ The core features are following. - Alarm - + 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. - + Users are encouraged to add themselves to the [PoweredBy](docs/powered-by.md) page. +# Landscapes + +

+

+   +

+SkyWalking enriches the CNCF CLOUD NATIVE Landscape. + +

+


Our project enriches the OpenAPM Landscape! diff --git a/docs/en/guides/storage-extention.md b/docs/en/guides/storage-extention.md index a88e34b3d..d52100cd0 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 fd07e202f..cad061354 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.