This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch envoy_stats_sink_config
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/envoy_stats_sink_config by
this push:
new 01631fd update
01631fd is described below
commit 01631fd82dabd1bb5490716397b9a0c79ee26e06
Author: JaredTan95 <jian....@daocloud.io>
AuthorDate: Fri Jul 23 21:46:46 2021 +0800
update
---
docs/en/setup/envoy/examples/metrics/README.md | 2 ++
...mpose.yaml => docker-compose-envoy-v3-api.yaml} | 8 ++---
.../envoy/examples/metrics/docker-compose.yaml | 6 ++--
.../metrics/{envoy.yaml => envoy-v1.16.yaml} | 37 ++++++++--------------
.../metrics/{envoy.yaml => envoy-v1.19.yaml} | 8 ++---
5 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/docs/en/setup/envoy/examples/metrics/README.md
b/docs/en/setup/envoy/examples/metrics/README.md
index 15f6501..9b75236 100644
--- a/docs/en/setup/envoy/examples/metrics/README.md
+++ b/docs/en/setup/envoy/examples/metrics/README.md
@@ -9,6 +9,7 @@ The example requires `docker` and `docker-compose` to be
installed in your local
Note that in ths setup, we override the [`log4j2.xml`](log4j2.xml) config to
set the `org.apache.skywalking.oap.server.receiver.envoy` logger level to
`DEBUG`. This enables us to see the messages sent by Envoy to SkyWalking OAP
server.
+You can also find Envoy Metric Service V3 API example in
[docker-compose-envoy-v3-api.yaml](./docker-compose-envoy-v3-api.yaml)
```
$ make up
$ docker-compose logs -f skywalking
@@ -111,3 +112,4 @@ skywalking_1 | }
$ # To tear down:
$ make down
```
+
diff --git a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
b/docs/en/setup/envoy/examples/metrics/docker-compose-envoy-v3-api.yaml
similarity index 92%
copy from docs/en/setup/envoy/examples/metrics/docker-compose.yaml
copy to docs/en/setup/envoy/examples/metrics/docker-compose-envoy-v3-api.yaml
index 95482a7..58d0382 100644
--- a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
+++ b/docs/en/setup/envoy/examples/metrics/docker-compose-envoy-v3-api.yaml
@@ -16,15 +16,15 @@
version: "3"
services:
- envoy:
+ envoy19:
image: envoyproxy/envoy-alpine:v1.19-latest
command: /usr/local/bin/envoy -c /etc/envoy.yaml --service-cluster
envoy-proxy
ports:
- - 10000:10000
+ - 10001:10000
depends_on:
- - skywalking
+ - skywalking
volumes:
- - ./envoy.yaml:/etc/envoy.yaml
+ - ./envoy-v1.19.yaml:/etc/envoy.yaml
skywalking:
image: apache/skywalking-oap-server:latest
diff --git a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
b/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
index 95482a7..a5873b9 100644
--- a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
+++ b/docs/en/setup/envoy/examples/metrics/docker-compose.yaml
@@ -16,15 +16,15 @@
version: "3"
services:
- envoy:
- image: envoyproxy/envoy-alpine:v1.19-latest
+ envoy16:
+ image: envoyproxy/envoy-alpine:v1.16.2
command: /usr/local/bin/envoy -c /etc/envoy.yaml --service-cluster
envoy-proxy
ports:
- 10000:10000
depends_on:
- skywalking
volumes:
- - ./envoy.yaml:/etc/envoy.yaml
+ - ./envoy-v1.16.yaml:/etc/envoy.yaml
skywalking:
image: apache/skywalking-oap-server:latest
diff --git a/docs/en/setup/envoy/examples/metrics/envoy.yaml
b/docs/en/setup/envoy/examples/metrics/envoy-v1.16.yaml
similarity index 72%
copy from docs/en/setup/envoy/examples/metrics/envoy.yaml
copy to docs/en/setup/envoy/examples/metrics/envoy-v1.16.yaml
index 0efb939..9d3caec 100644
--- a/docs/en/setup/envoy/examples/metrics/envoy.yaml
+++ b/docs/en/setup/envoy/examples/metrics/envoy-v1.16.yaml
@@ -23,17 +23,15 @@ admin:
port_value: 9901
stats_sinks:
- - name: envoy.stat_sinks.metrics_service
- typed_config:
- "@type": type.googleapis.com/envoy.config.metrics.v3.MetricsServiceConfig
- transport_api_version: V3
+ - name: envoy.metrics_service
+ config:
grpc_service:
envoy_grpc:
cluster_name: service_skywalking
node:
- id: ingress
- cluster: card-api-cluster
+ id: ingress-v1
+ cluster: card-api-cluster-v1
locality:
region: ap-southeast-1
zone: zone1
@@ -42,8 +40,8 @@ node:
skywalking: iscool
envoy: isawesome
LABELS:
- app: test-app
- NAME: service-instance-name
+ app: test-app-v1
+ NAME: service-instance-name-v1
static_resources:
listeners:
@@ -55,10 +53,9 @@ static_resources:
port_value: 10000
filter_chains:
- filters:
- - name: envoy.filters.network.http_connection_manager
+ - name: envoy.http_connection_manager
typed_config:
- "@type":
type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
- codec_type: auto
+ "@type":
type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
stat_prefix: ingress_http
route_config:
name: local_route
@@ -69,19 +66,15 @@ static_resources:
- match:
prefix: "/"
route:
- host_rewrite_literal: www.google.com
+ host_rewrite: www.google.com
cluster: service_google
http_filters:
- - name: envoy.filters.http.router
+ - name: envoy.router
clusters:
- name: service_skywalking
connect_timeout: 5s
- type: LOGICAL_DNS
- typed_extension_protocol_options:
- envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
- "@type":
type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
- explicit_http_config:
- http2_protocol_options: {}
+ type: STRICT_DNS
+ http2_protocol_options: {}
# Comment out the following line to test on v6 networks
dns_lookup_family: V4_ONLY
lb_policy: ROUND_ROBIN
@@ -110,7 +103,5 @@ static_resources:
socket_address:
address: www.google.com
port_value: 443
- transport_socket:
- name: envoy.transport_sockets.tls
- typed_config:
- "@type":
type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext
+ tls_context:
+ sni: www.google.com
diff --git a/docs/en/setup/envoy/examples/metrics/envoy.yaml
b/docs/en/setup/envoy/examples/metrics/envoy-v1.19.yaml
similarity index 97%
rename from docs/en/setup/envoy/examples/metrics/envoy.yaml
rename to docs/en/setup/envoy/examples/metrics/envoy-v1.19.yaml
index 0efb939..1c7169c 100644
--- a/docs/en/setup/envoy/examples/metrics/envoy.yaml
+++ b/docs/en/setup/envoy/examples/metrics/envoy-v1.19.yaml
@@ -32,8 +32,8 @@ stats_sinks:
cluster_name: service_skywalking
node:
- id: ingress
- cluster: card-api-cluster
+ id: ingress-v2
+ cluster: card-api-cluster-v2
locality:
region: ap-southeast-1
zone: zone1
@@ -42,8 +42,8 @@ node:
skywalking: iscool
envoy: isawesome
LABELS:
- app: test-app
- NAME: service-instance-name
+ app: test-app-v2
+ NAME: service-instance-name-v2
static_resources:
listeners:
