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
commit 35ce622028dad2015ffb28ed1b0274adcf6a081c Author: JaredTan95 <jian....@daocloud.io> AuthorDate: Fri Jul 23 21:31:57 2021 +0800 bump up envoy metrics service sinks version. and update envoy.yaml config for demo. --- docs/en/setup/envoy/examples/metrics/README.md | 71 +++++++++++++++++++--- .../envoy/examples/metrics/docker-compose.yaml | 2 +- docs/en/setup/envoy/examples/metrics/envoy.yaml | 29 ++++++--- 3 files changed, 84 insertions(+), 18 deletions(-) diff --git a/docs/en/setup/envoy/examples/metrics/README.md b/docs/en/setup/envoy/examples/metrics/README.md index dddd2c5..15f6501 100644 --- a/docs/en/setup/envoy/examples/metrics/README.md +++ b/docs/en/setup/envoy/examples/metrics/README.md @@ -13,15 +13,28 @@ Note that in ths setup, we override the [`log4j2.xml`](log4j2.xml) config to set $ make up $ docker-compose logs -f skywalking $ # Please wait for a moment until SkyWalking is ready and Envoy starts sending the stats. You will see similar messages like the following: -skywalking_1 | 2019-08-31 23:57:40,672 - org.apache.skywalking.oap.server.receiver.envoy.MetricServiceGRPCHandler -26870 [grpc-default-executor-0] DEBUG [] - Received msg identifier { +skywalking_1 | 2021-07-23 13:25:30,683 - org.apache.skywalking.oap.server.receiver.envoy.MetricServiceGRPCHandler -19437 [grpcServerPool-1-thread-2] DEBUG [] - Received msg identifier { skywalking_1 | node { skywalking_1 | id: "ingress" skywalking_1 | cluster: "envoy-proxy" skywalking_1 | metadata { skywalking_1 | fields { -skywalking_1 | key: "skywalking" +skywalking_1 | key: "LABELS" skywalking_1 | value { -skywalking_1 | string_value: "iscool" +skywalking_1 | struct_value { +skywalking_1 | fields { +skywalking_1 | key: "app" +skywalking_1 | value { +skywalking_1 | string_value: "test-app" +skywalking_1 | } +skywalking_1 | } +skywalking_1 | } +skywalking_1 | } +skywalking_1 | } +skywalking_1 | fields { +skywalking_1 | key: "NAME" +skywalking_1 | value { +skywalking_1 | string_value: "service-instance-name" skywalking_1 | } skywalking_1 | } skywalking_1 | fields { @@ -30,24 +43,68 @@ skywalking_1 | value { skywalking_1 | string_value: "isawesome" skywalking_1 | } skywalking_1 | } +skywalking_1 | fields { +skywalking_1 | key: "skywalking" +skywalking_1 | value { +skywalking_1 | string_value: "iscool" +skywalking_1 | } +skywalking_1 | } skywalking_1 | } skywalking_1 | locality { skywalking_1 | region: "ap-southeast-1" skywalking_1 | zone: "zone1" skywalking_1 | sub_zone: "subzone1" skywalking_1 | } -skywalking_1 | build_version: "e349fb6139e4b7a59a9a359be0ea45dd61e589c5/1.11.1/Clean/RELEASE/BoringSSL" +skywalking_1 | user_agent_name: "envoy" +skywalking_1 | user_agent_build_version { +skywalking_1 | version { +skywalking_1 | major_number: 1 +skywalking_1 | minor_number: 19 +skywalking_1 | } +skywalking_1 | metadata { +skywalking_1 | fields { +skywalking_1 | key: "build.type" +skywalking_1 | value { +skywalking_1 | string_value: "RELEASE" +skywalking_1 | } +skywalking_1 | } +skywalking_1 | fields { +skywalking_1 | key: "revision.sha" +skywalking_1 | value { +skywalking_1 | string_value: "68fe53a889416fd8570506232052b06f5a531541" +skywalking_1 | } +skywalking_1 | } +skywalking_1 | fields { +skywalking_1 | key: "revision.status" +skywalking_1 | value { +skywalking_1 | string_value: "Clean" +skywalking_1 | } +skywalking_1 | } +skywalking_1 | fields { +skywalking_1 | key: "ssl.version" +skywalking_1 | value { +skywalking_1 | string_value: "BoringSSL" +skywalking_1 | } +skywalking_1 | } +skywalking_1 | } +skywalking_1 | } +skywalking_1 | extensions { +skywalking_1 | name: "composite-action" +skywalking_1 | category: "envoy.matching.action" +skywalking_1 | } + ...... skywalking_1 | } skywalking_1 | } skywalking_1 | envoy_metrics { -skywalking_1 | name: "cluster.service_skywalking.update_success" +skywalking_1 | name: "cluster.service_google.update_no_rebuild" skywalking_1 | type: COUNTER skywalking_1 | metric { skywalking_1 | counter { -skywalking_1 | value: 2.0 +skywalking_1 | value: 1.0 skywalking_1 | } -skywalking_1 | timestamp_ms: 1567295859556 +skywalking_1 | timestamp_ms: 1627046729718 skywalking_1 | } + ...... skywalking_1 | } ... diff --git a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml b/docs/en/setup/envoy/examples/metrics/docker-compose.yaml index 6f069da..95482a7 100644 --- a/docs/en/setup/envoy/examples/metrics/docker-compose.yaml +++ b/docs/en/setup/envoy/examples/metrics/docker-compose.yaml @@ -17,7 +17,7 @@ version: "3" services: envoy: - image: envoyproxy/envoy-alpine:v1.16.2 + image: envoyproxy/envoy-alpine:v1.19-latest command: /usr/local/bin/envoy -c /etc/envoy.yaml --service-cluster envoy-proxy ports: - 10000:10000 diff --git a/docs/en/setup/envoy/examples/metrics/envoy.yaml b/docs/en/setup/envoy/examples/metrics/envoy.yaml index fd66731..0efb939 100644 --- a/docs/en/setup/envoy/examples/metrics/envoy.yaml +++ b/docs/en/setup/envoy/examples/metrics/envoy.yaml @@ -23,8 +23,10 @@ admin: port_value: 9901 stats_sinks: - - name: envoy.metrics_service - config: + - name: envoy.stat_sinks.metrics_service + typed_config: + "@type": type.googleapis.com/envoy.config.metrics.v3.MetricsServiceConfig + transport_api_version: V3 grpc_service: envoy_grpc: cluster_name: service_skywalking @@ -53,9 +55,10 @@ static_resources: port_value: 10000 filter_chains: - filters: - - name: envoy.http_connection_manager + - name: envoy.filters.network.http_connection_manager typed_config: - "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager + codec_type: auto stat_prefix: ingress_http route_config: name: local_route @@ -66,15 +69,19 @@ static_resources: - match: prefix: "/" route: - host_rewrite: www.google.com + host_rewrite_literal: www.google.com cluster: service_google http_filters: - - name: envoy.router + - name: envoy.filters.http.router clusters: - name: service_skywalking connect_timeout: 5s - type: STRICT_DNS - http2_protocol_options: {} + 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: {} # Comment out the following line to test on v6 networks dns_lookup_family: V4_ONLY lb_policy: ROUND_ROBIN @@ -103,5 +110,7 @@ static_resources: socket_address: address: www.google.com port_value: 443 - tls_context: - sni: www.google.com + transport_socket: + name: envoy.transport_sockets.tls + typed_config: + "@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext