From 3aa489551e9bd594bcb2a667a96dbdd7bb29834e Mon Sep 17 00:00:00 2001 From: Caleb Gilmour Date: Wed, 9 Dec 2020 23:38:10 +0000 Subject: [PATCH] Add examples for envoy v1.15 and v1.16 Other minor changes - bump version numbers for older containers - add version to service name --- examples/envoy-tracing/docker-compose.yml | 32 ++++++++- examples/envoy-tracing/envoy-ed6a1b8.yaml | 4 +- examples/envoy-tracing/envoy-v1.11.yaml | 2 +- examples/envoy-tracing/envoy-v1.12.yaml | 2 +- examples/envoy-tracing/envoy-v1.13.yaml | 2 +- examples/envoy-tracing/envoy-v1.14.yaml | 2 +- examples/envoy-tracing/envoy-v1.15.yaml | 82 +++++++++++++++++++++++ examples/envoy-tracing/envoy-v1.16.yaml | 82 +++++++++++++++++++++++ 8 files changed, 200 insertions(+), 8 deletions(-) create mode 100644 examples/envoy-tracing/envoy-v1.15.yaml create mode 100644 examples/envoy-tracing/envoy-v1.16.yaml diff --git a/examples/envoy-tracing/docker-compose.yml b/examples/envoy-tracing/docker-compose.yml index f8f9d8e1..541f4d7e 100644 --- a/examples/envoy-tracing/docker-compose.yml +++ b/examples/envoy-tracing/docker-compose.yml @@ -24,8 +24,36 @@ services: volumes: - './envoy-ed6a1b8.yaml:/etc/envoy/envoy.yaml:ro' + envoy-v1.16: + image: envoyproxy/envoy:v1.16.1 + depends_on: + - dd-agent + entrypoint: [] + command: + - envoy + - -l + - debug + - -c + - /etc/envoy/envoy.yaml + volumes: + - './envoy-v1.16.yaml:/etc/envoy/envoy.yaml:ro' + + envoy-v1.15: + image: envoyproxy/envoy:v1.15.3 + depends_on: + - dd-agent + entrypoint: [] + command: + - envoy + - -l + - debug + - -c + - /etc/envoy/envoy.yaml + volumes: + - './envoy-v1.15.yaml:/etc/envoy/envoy.yaml:ro' + envoy-v1.14: - image: envoyproxy/envoy:v1.14.1 + image: envoyproxy/envoy:v1.14.6 depends_on: - dd-agent entrypoint: [] @@ -39,7 +67,7 @@ services: - './envoy-v1.14.yaml:/etc/envoy/envoy.yaml:ro' envoy-v1.13: - image: envoyproxy/envoy:v1.13.1 + image: envoyproxy/envoy:v1.13.7 depends_on: - dd-agent entrypoint: [] diff --git a/examples/envoy-tracing/envoy-ed6a1b8.yaml b/examples/envoy-tracing/envoy-ed6a1b8.yaml index a3f9eb94..b8db9c35 100644 --- a/examples/envoy-tracing/envoy-ed6a1b8.yaml +++ b/examples/envoy-tracing/envoy-ed6a1b8.yaml @@ -74,8 +74,8 @@ tracing: name: envoy.tracers.datadog typed_config: "@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig - collector_cluster: datadog_agent # matched against the named cluster below - service_name: envoy-example # user-defined service name + collector_cluster: datadog_agent # matched against the named cluster below + service_name: envoy-example-ed6a1b8 # user-defined service name admin: access_log_path: "/dev/null" diff --git a/examples/envoy-tracing/envoy-v1.11.yaml b/examples/envoy-tracing/envoy-v1.11.yaml index e472af7c..85b54756 100644 --- a/examples/envoy-tracing/envoy-v1.11.yaml +++ b/examples/envoy-tracing/envoy-v1.11.yaml @@ -76,7 +76,7 @@ tracing: typed_config: "@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig collector_cluster: datadog_agent # matched against the named cluster below - service_name: envoy-example # user-defined service name + service_name: envoy-example-v1.11 # user-defined service name admin: access_log_path: "/dev/null" diff --git a/examples/envoy-tracing/envoy-v1.12.yaml b/examples/envoy-tracing/envoy-v1.12.yaml index 73096371..92688e8d 100644 --- a/examples/envoy-tracing/envoy-v1.12.yaml +++ b/examples/envoy-tracing/envoy-v1.12.yaml @@ -75,7 +75,7 @@ tracing: typed_config: "@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig collector_cluster: datadog_agent # matched against the named cluster below - service_name: envoy-example # user-defined service name + service_name: envoy-example-v1.12 # user-defined service name admin: access_log_path: "/dev/null" diff --git a/examples/envoy-tracing/envoy-v1.13.yaml b/examples/envoy-tracing/envoy-v1.13.yaml index 73096371..48e7c503 100644 --- a/examples/envoy-tracing/envoy-v1.13.yaml +++ b/examples/envoy-tracing/envoy-v1.13.yaml @@ -75,7 +75,7 @@ tracing: typed_config: "@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig collector_cluster: datadog_agent # matched against the named cluster below - service_name: envoy-example # user-defined service name + service_name: envoy-example-v1.13 # user-defined service name admin: access_log_path: "/dev/null" diff --git a/examples/envoy-tracing/envoy-v1.14.yaml b/examples/envoy-tracing/envoy-v1.14.yaml index a3f9eb94..30d4a695 100644 --- a/examples/envoy-tracing/envoy-v1.14.yaml +++ b/examples/envoy-tracing/envoy-v1.14.yaml @@ -75,7 +75,7 @@ tracing: typed_config: "@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig collector_cluster: datadog_agent # matched against the named cluster below - service_name: envoy-example # user-defined service name + service_name: envoy-example-v1.14 # user-defined service name admin: access_log_path: "/dev/null" diff --git a/examples/envoy-tracing/envoy-v1.15.yaml b/examples/envoy-tracing/envoy-v1.15.yaml new file mode 100644 index 00000000..cc31b88f --- /dev/null +++ b/examples/envoy-tracing/envoy-v1.15.yaml @@ -0,0 +1,82 @@ +static_resources: + listeners: + - address: + socket_address: + address: 0.0.0.0 + port_value: 80 + traffic_direction: OUTBOUND + filter_chains: + - filters: + - name: envoy.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + generate_request_id: true + tracing: + provider: + name: envoy.tracers.datadog + typed_config: + "@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig + collector_cluster: datadog_agent + service_name: envoy-example-v1.15 + codec_type: auto + stat_prefix: ingress_http + route_config: + name: local_route + virtual_hosts: + - name: backend + domains: + - "*" + routes: + - match: + prefix: "/" + route: + cluster: service1 + http_filters: + # Traces for healthcheck requests should not be sampled. + - name: envoy.filters.http.health_check + typed_config: + "@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck + pass_through_mode: false + headers: + - exact_match: /healthcheck + name: :path + - name: envoy.filters.http.router + typed_config: {} + use_remote_address: true + clusters: + - name: service1 + connect_timeout: 0.250s + type: strict_dns + lb_policy: round_robin + http2_protocol_options: {} + load_assignment: + cluster_name: service1 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: service1 + port_value: 80 + # Configure this cluster with the address of the datadog agent + # for sending traces. + - name: datadog_agent + connect_timeout: 1s + type: strict_dns + lb_policy: round_robin + load_assignment: + cluster_name: datadog_agent + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: dd-agent + port_value: 8126 + +admin: + access_log_path: "/dev/null" + address: + socket_address: + address: 0.0.0.0 + port_value: 8001 diff --git a/examples/envoy-tracing/envoy-v1.16.yaml b/examples/envoy-tracing/envoy-v1.16.yaml new file mode 100644 index 00000000..d1684e99 --- /dev/null +++ b/examples/envoy-tracing/envoy-v1.16.yaml @@ -0,0 +1,82 @@ +static_resources: + listeners: + - address: + socket_address: + address: 0.0.0.0 + port_value: 80 + traffic_direction: OUTBOUND + filter_chains: + - filters: + - name: envoy.http_connection_manager + typed_config: + "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager + generate_request_id: true + tracing: + provider: + name: envoy.tracers.datadog + typed_config: + "@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig + collector_cluster: datadog_agent + service_name: envoy-example-v1.16 + codec_type: auto + stat_prefix: ingress_http + route_config: + name: local_route + virtual_hosts: + - name: backend + domains: + - "*" + routes: + - match: + prefix: "/" + route: + cluster: service1 + http_filters: + # Traces for healthcheck requests should not be sampled. + - name: envoy.filters.http.health_check + typed_config: + "@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck + pass_through_mode: false + headers: + - exact_match: /healthcheck + name: :path + - name: envoy.filters.http.router + typed_config: {} + use_remote_address: true + clusters: + - name: service1 + connect_timeout: 0.250s + type: strict_dns + lb_policy: round_robin + http2_protocol_options: {} + load_assignment: + cluster_name: service1 + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: service1 + port_value: 80 + # Configure this cluster with the address of the datadog agent + # for sending traces. + - name: datadog_agent + connect_timeout: 1s + type: strict_dns + lb_policy: round_robin + load_assignment: + cluster_name: datadog_agent + endpoints: + - lb_endpoints: + - endpoint: + address: + socket_address: + address: dd-agent + port_value: 8126 + +admin: + access_log_path: "/dev/null" + address: + socket_address: + address: 0.0.0.0 + port_value: 8001