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 2021/04/21 23:20:52 UTC

[skywalking] branch wu-sheng-patch-1 created (now d9467fd)

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

wusheng pushed a change to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at d9467fd  Re-statement self-observability doc

This branch includes the following new commits:

     new d9467fd  Re-statement self-observability doc

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.


[skywalking] 01/01: Re-statement self-observability doc

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

wusheng pushed a commit to branch wu-sheng-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit d9467fd291aaf6e14bd2355ce70c3e45a06bfcb8
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Apr 22 07:20:33 2021 +0800

    Re-statement self-observability doc
    
    **WARNING**, since Apr 21, 2021, **Grafana** project has been relicensed to **AGPL-v3**, no as Apache 2.0 anymore. Check the LICENSE details.
    The following Prometheus + Grafana solution is optional, not a recommendation.
---
 docs/en/setup/backend/backend-telemetry.md | 83 ++++++++++++++++--------------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/docs/en/setup/backend/backend-telemetry.md b/docs/en/setup/backend/backend-telemetry.md
index f9beec0..1c9f5af 100644
--- a/docs/en/setup/backend/backend-telemetry.md
+++ b/docs/en/setup/backend/backend-telemetry.md
@@ -15,44 +15,6 @@ telemetry:
 
 but you can set one of `prometheus` to enable them, for more information, refer to the details below.
 
-## Prometheus
-Prometheus is supported as telemetry implementor. 
-By using this, prometheus collects metrics from SkyWalking backend.
-
-Set `prometheus` to provider. The endpoint open at `http://0.0.0.0:1234/` and `http://0.0.0.0:1234/metrics`.
-```yaml
-telemetry:
-  selector: ${SW_TELEMETRY:prometheus}
-  prometheus:
-```
-
-Set host and port if needed.
-```yaml
-telemetry:
-  selector: ${SW_TELEMETRY:prometheus}
-  prometheus:
-    host: 127.0.0.1
-    port: 1543
-```
-
-Set SSL relevant settings to expose a secure endpoint. Notice private key file and cert chain file could be uploaded once
-changes are applied to them.
-```yaml
-telemetry:
-  selector: ${SW_TELEMETRY:prometheus}
-  prometheus:
-    host: 127.0.0.1
-    port: 1543
-    sslEnabled: true
-    sslKeyPath: /etc/ssl/key.pem
-    sslCertChainPath: /etc/ssl/cert-chain.pem
-```
-
-### Grafana Visualization
-Provide the grafana dashboard settings. 
-Check [SkyWalking OAP Cluster Monitor Dashboard](grafana-cluster.json) config and [SkyWalking OAP Instance Monitor Dashboard](grafana-instance.json) config.
-
-
 ## Self Observability
 
 SkyWalking supports to collect telemetry data into OAP backend directly. Users could check them out through UI or
@@ -125,3 +87,48 @@ staticConfig:
     service: oap-server
 ...
 ```
+
+___
+
+**WARNING**, since Apr 21, 2021, **Grafana** project has been relicensed to **AGPL-v3**, no as Apache 2.0 anymore. Check the LICENSE details.
+The following Prometheus + Grafana solution is optional, not a recommendation.
+
+## Prometheus
+Prometheus is supported as telemetry implementor. 
+By using this, prometheus collects metrics from SkyWalking backend.
+
+Set `prometheus` to provider. The endpoint open at `http://0.0.0.0:1234/` and `http://0.0.0.0:1234/metrics`.
+```yaml
+telemetry:
+  selector: ${SW_TELEMETRY:prometheus}
+  prometheus:
+```
+
+Set host and port if needed.
+```yaml
+telemetry:
+  selector: ${SW_TELEMETRY:prometheus}
+  prometheus:
+    host: 127.0.0.1
+    port: 1543
+```
+
+Set SSL relevant settings to expose a secure endpoint. Notice private key file and cert chain file could be uploaded once
+changes are applied to them.
+```yaml
+telemetry:
+  selector: ${SW_TELEMETRY:prometheus}
+  prometheus:
+    host: 127.0.0.1
+    port: 1543
+    sslEnabled: true
+    sslKeyPath: /etc/ssl/key.pem
+    sslCertChainPath: /etc/ssl/cert-chain.pem
+```
+
+### Grafana Visualization
+Provide the grafana dashboard settings. 
+Check [SkyWalking OAP Cluster Monitor Dashboard](grafana-cluster.json) config and [SkyWalking OAP Instance Monitor Dashboard](grafana-instance.json) config.
+
+
+