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/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 00a7365 Fix istio control and data planes naming (#8475)
00a7365 is described below
commit 00a73659600c2c0e851a723f4c843c7e6455808e
Author: Marc Navarro <[email protected]>
AuthorDate: Tue Jan 25 12:14:29 2022 +0100
Fix istio control and data planes naming (#8475)
---
README.md | 2 +-
docs/en/concepts-and-designs/backend-overview.md | 4 ++--
docs/en/concepts-and-designs/probe-introduction.md | 2 +-
docs/en/concepts-and-designs/service-mesh-probe.md | 6 +++---
docs/en/setup/backend/opentelemetry-receiver.md | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 1bdc8ca..474472e 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ including
1. Go and C++ SDKs.
1. LUA agent especially for Nginx, OpenResty and Apache APISIX.
1. Browser agent.
-1. Service Mesh Observability. Control panel and data panel.
+1. Service Mesh Observability. Control plane and data plane.
1. Metrics system, including Prometheus, OpenTelemetry, Spring
Sleuth(Micrometer), Zabbix.
1. Logs.
1. Zipkin v1/v2 trace.(No Analysis)
diff --git a/docs/en/concepts-and-designs/backend-overview.md
b/docs/en/concepts-and-designs/backend-overview.md
index 1889b70..d53440c 100644
--- a/docs/en/concepts-and-designs/backend-overview.md
+++ b/docs/en/concepts-and-designs/backend-overview.md
@@ -5,8 +5,8 @@ SkyWalking is an Observability Analysis Platform that provides
full observabilit
SkyWalking covers all 3 areas of observability, including, **Tracing**,
**Metrics** and **Logging**.
- **Tracing**. SkyWalking native data formats, including Zipkin v1 and v2, as
well as Jaeger.
-- **Metrics**. SkyWalking integrates with Service Mesh platforms, such as
Istio, Envoy, and Linkerd, to build observability into the data panel
-or control panel. Also, SkyWalking native agents can run in the metrics mode,
which greatly improves performances.
+- **Metrics**. SkyWalking integrates with Service Mesh platforms, such as
Istio, Envoy, and Linkerd, to build observability into the data plane
+or control plane. Also, SkyWalking native agents can run in the metrics mode,
which greatly improves performances.
- **Logging**. Includes logs collected from disk or through network. Native
agents could bind the tracing context with logs automatically,
or use SkyWalking to bind the trace and log through the text content.
diff --git a/docs/en/concepts-and-designs/probe-introduction.md
b/docs/en/concepts-and-designs/probe-introduction.md
index e4bed49..01ba32f 100644
--- a/docs/en/concepts-and-designs/probe-introduction.md
+++ b/docs/en/concepts-and-designs/probe-introduction.md
@@ -7,7 +7,7 @@ On a high level, there are three typical categories in all
SkyWalking probes.
the SkyWalking Java agent uses the `-javaagent` command line argument to
manipulate codes in runtime, where `manipulate` means to change and inject
user's codes. Another kind of agents uses certain hook or intercept mechanism
provided by target libraries. As you can see, these agents are based on
languages and libraries.
-- **Service Mesh probes**. Service Mesh probes collect data from sidecar,
control panel in service mesh or proxy. In the old days, proxy
+- **Service Mesh probes**. Service Mesh probes collect data from sidecar,
control plane in service mesh or proxy. In the old days, proxy
is only used as an ingress of the whole cluster, but with the Service Mesh and
sidecar, we can now perform observability functions.
- **3rd-party instrument library**. SkyWalking accepts many widely used
instrument libraries data formats. It analyzes the
diff --git a/docs/en/concepts-and-designs/service-mesh-probe.md
b/docs/en/concepts-and-designs/service-mesh-probe.md
index 423fb43..0c7f0de 100644
--- a/docs/en/concepts-and-designs/service-mesh-probe.md
+++ b/docs/en/concepts-and-designs/service-mesh-probe.md
@@ -9,13 +9,13 @@ Its requirements can include discovery, load balancing,
failure recovery, metric
such as A/B testing, canary releases, rate limiting, access control, and
end-to-end authentication.
## Where does the probe collect data from?
-Istio is a typical Service Mesh design and implementor. It defines **Control
Panel** and **Data Panel**,
+Istio is a typical Service Mesh design and implementor. It defines **Control
Plane** and **Data Plane**,
which are widely used. Here is the Istio Architecture:
-The Service Mesh probe can choose to collect data from **Data Panel**. In
Istio, it means collecting telemetry data from
-Envoy sidecar (Data Panel). The probe collects two telemetry entities from the
client end and the server end per request.
+The Service Mesh probe can choose to collect data from **Data Plane**. In
Istio, it means collecting telemetry data from
+Envoy sidecar (Data Plane). The probe collects two telemetry entities from the
client end and the server end per request.
## How does Service Mesh make backend work?
In this kind of probes, you can see that there is no trace related to them. So
how does the SkyWalking
diff --git a/docs/en/setup/backend/opentelemetry-receiver.md
b/docs/en/setup/backend/opentelemetry-receiver.md
index b28e099..4447e1f 100644
--- a/docs/en/setup/backend/opentelemetry-receiver.md
+++ b/docs/en/setup/backend/opentelemetry-receiver.md
@@ -29,7 +29,7 @@ for identification of the metric data.
| Rule Name | Description | Configuration File | Data Source |
|----|----|-----|----|
-|istio-controlplane| Metrics of Istio control panel |
otel-oc-rules/istio-controlplane.yaml | Istio Control Panel -> OpenTelemetry
Collector --OC format--> SkyWalking OAP Server |
+|istio-controlplane| Metrics of Istio Control Plane |
otel-oc-rules/istio-controlplane.yaml | Istio Control Plane -> OpenTelemetry
Collector --OC format--> SkyWalking OAP Server |
|oap| Metrics of SkyWalking OAP server itself | otel-oc-rules/oap.yaml |
SkyWalking OAP Server(SelfObservability) -> OpenTelemetry Collector --OC
format--> SkyWalking OAP Server |
|vm| Metrics of VMs | otel-oc-rules/vm.yaml | Prometheus node-exporter(VMs) ->
OpenTelemetry Collector --OC format--> SkyWalking OAP Server |
|k8s-cluster| Metrics of K8s cluster | otel-oc-rules/k8s-cluster.yaml | K8s
kube-state-metrics -> OpenTelemetry Collector --OC format--> SkyWalking OAP
Server |
