Skip to content

Commit 3aa4895

Browse files
cgilmourcgilmour
committed
Add examples for envoy v1.15 and v1.16
Other minor changes - bump version numbers for older containers - add version to service name
1 parent 50cb40e commit 3aa4895

File tree

8 files changed

+200
-8
lines changed

8 files changed

+200
-8
lines changed

‎examples/envoy-tracing/docker-compose.yml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,36 @@ services:
2424
volumes:
2525
- './envoy-ed6a1b8.yaml:/etc/envoy/envoy.yaml:ro'
2626

27+
envoy-v1.16:
28+
image: envoyproxy/envoy:v1.16.1
29+
depends_on:
30+
- dd-agent
31+
entrypoint: []
32+
command:
33+
- envoy
34+
- -l
35+
- debug
36+
- -c
37+
- /etc/envoy/envoy.yaml
38+
volumes:
39+
- './envoy-v1.16.yaml:/etc/envoy/envoy.yaml:ro'
40+
41+
envoy-v1.15:
42+
image: envoyproxy/envoy:v1.15.3
43+
depends_on:
44+
- dd-agent
45+
entrypoint: []
46+
command:
47+
- envoy
48+
- -l
49+
- debug
50+
- -c
51+
- /etc/envoy/envoy.yaml
52+
volumes:
53+
- './envoy-v1.15.yaml:/etc/envoy/envoy.yaml:ro'
54+
2755
envoy-v1.14:
28-
image: envoyproxy/envoy:v1.14.1
56+
image: envoyproxy/envoy:v1.14.6
2957
depends_on:
3058
- dd-agent
3159
entrypoint: []
@@ -39,7 +67,7 @@ services:
3967
- './envoy-v1.14.yaml:/etc/envoy/envoy.yaml:ro'
4068

4169
envoy-v1.13:
42-
image: envoyproxy/envoy:v1.13.1
70+
image: envoyproxy/envoy:v1.13.7
4371
depends_on:
4472
- dd-agent
4573
entrypoint: []

‎examples/envoy-tracing/envoy-ed6a1b8.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ tracing:
7474
name: envoy.tracers.datadog
7575
typed_config:
7676
"@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig
77-
collector_cluster: datadog_agent # matched against the named cluster below
78-
service_name: envoy-example # user-defined service name
77+
collector_cluster: datadog_agent # matched against the named cluster below
78+
service_name: envoy-example-ed6a1b8 # user-defined service name
7979

8080
admin:
8181
access_log_path: "/dev/null"

‎examples/envoy-tracing/envoy-v1.11.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ tracing:
7676
typed_config:
7777
"@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig
7878
collector_cluster: datadog_agent # matched against the named cluster below
79-
service_name: envoy-example # user-defined service name
79+
service_name: envoy-example-v1.11 # user-defined service name
8080

8181
admin:
8282
access_log_path: "/dev/null"

‎examples/envoy-tracing/envoy-v1.12.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ tracing:
7575
typed_config:
7676
"@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig
7777
collector_cluster: datadog_agent # matched against the named cluster below
78-
service_name: envoy-example # user-defined service name
78+
service_name: envoy-example-v1.12 # user-defined service name
7979

8080
admin:
8181
access_log_path: "/dev/null"

‎examples/envoy-tracing/envoy-v1.13.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ tracing:
7575
typed_config:
7676
"@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig
7777
collector_cluster: datadog_agent # matched against the named cluster below
78-
service_name: envoy-example # user-defined service name
78+
service_name: envoy-example-v1.13 # user-defined service name
7979

8080
admin:
8181
access_log_path: "/dev/null"

‎examples/envoy-tracing/envoy-v1.14.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ tracing:
7575
typed_config:
7676
"@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig
7777
collector_cluster: datadog_agent # matched against the named cluster below
78-
service_name: envoy-example # user-defined service name
78+
service_name: envoy-example-v1.14 # user-defined service name
7979

8080
admin:
8181
access_log_path: "/dev/null"

‎examples/envoy-tracing/envoy-v1.15.yaml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
static_resources:
2+
listeners:
3+
- address:
4+
socket_address:
5+
address: 0.0.0.0
6+
port_value: 80
7+
traffic_direction: OUTBOUND
8+
filter_chains:
9+
- filters:
10+
- name: envoy.http_connection_manager
11+
typed_config:
12+
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
13+
generate_request_id: true
14+
tracing:
15+
provider:
16+
name: envoy.tracers.datadog
17+
typed_config:
18+
"@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig
19+
collector_cluster: datadog_agent
20+
service_name: envoy-example-v1.15
21+
codec_type: auto
22+
stat_prefix: ingress_http
23+
route_config:
24+
name: local_route
25+
virtual_hosts:
26+
- name: backend
27+
domains:
28+
- "*"
29+
routes:
30+
- match:
31+
prefix: "/"
32+
route:
33+
cluster: service1
34+
http_filters:
35+
# Traces for healthcheck requests should not be sampled.
36+
- name: envoy.filters.http.health_check
37+
typed_config:
38+
"@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck
39+
pass_through_mode: false
40+
headers:
41+
- exact_match: /healthcheck
42+
name: :path
43+
- name: envoy.filters.http.router
44+
typed_config: {}
45+
use_remote_address: true
46+
clusters:
47+
- name: service1
48+
connect_timeout: 0.250s
49+
type: strict_dns
50+
lb_policy: round_robin
51+
http2_protocol_options: {}
52+
load_assignment:
53+
cluster_name: service1
54+
endpoints:
55+
- lb_endpoints:
56+
- endpoint:
57+
address:
58+
socket_address:
59+
address: service1
60+
port_value: 80
61+
# Configure this cluster with the address of the datadog agent
62+
# for sending traces.
63+
- name: datadog_agent
64+
connect_timeout: 1s
65+
type: strict_dns
66+
lb_policy: round_robin
67+
load_assignment:
68+
cluster_name: datadog_agent
69+
endpoints:
70+
- lb_endpoints:
71+
- endpoint:
72+
address:
73+
socket_address:
74+
address: dd-agent
75+
port_value: 8126
76+
77+
admin:
78+
access_log_path: "/dev/null"
79+
address:
80+
socket_address:
81+
address: 0.0.0.0
82+
port_value: 8001

‎examples/envoy-tracing/envoy-v1.16.yaml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
static_resources:
2+
listeners:
3+
- address:
4+
socket_address:
5+
address: 0.0.0.0
6+
port_value: 80
7+
traffic_direction: OUTBOUND
8+
filter_chains:
9+
- filters:
10+
- name: envoy.http_connection_manager
11+
typed_config:
12+
"@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
13+
generate_request_id: true
14+
tracing:
15+
provider:
16+
name: envoy.tracers.datadog
17+
typed_config:
18+
"@type": type.googleapis.com/envoy.config.trace.v2.DatadogConfig
19+
collector_cluster: datadog_agent
20+
service_name: envoy-example-v1.16
21+
codec_type: auto
22+
stat_prefix: ingress_http
23+
route_config:
24+
name: local_route
25+
virtual_hosts:
26+
- name: backend
27+
domains:
28+
- "*"
29+
routes:
30+
- match:
31+
prefix: "/"
32+
route:
33+
cluster: service1
34+
http_filters:
35+
# Traces for healthcheck requests should not be sampled.
36+
- name: envoy.filters.http.health_check
37+
typed_config:
38+
"@type": type.googleapis.com/envoy.config.filter.http.health_check.v2.HealthCheck
39+
pass_through_mode: false
40+
headers:
41+
- exact_match: /healthcheck
42+
name: :path
43+
- name: envoy.filters.http.router
44+
typed_config: {}
45+
use_remote_address: true
46+
clusters:
47+
- name: service1
48+
connect_timeout: 0.250s
49+
type: strict_dns
50+
lb_policy: round_robin
51+
http2_protocol_options: {}
52+
load_assignment:
53+
cluster_name: service1
54+
endpoints:
55+
- lb_endpoints:
56+
- endpoint:
57+
address:
58+
socket_address:
59+
address: service1
60+
port_value: 80
61+
# Configure this cluster with the address of the datadog agent
62+
# for sending traces.
63+
- name: datadog_agent
64+
connect_timeout: 1s
65+
type: strict_dns
66+
lb_policy: round_robin
67+
load_assignment:
68+
cluster_name: datadog_agent
69+
endpoints:
70+
- lb_endpoints:
71+
- endpoint:
72+
address:
73+
socket_address:
74+
address: dd-agent
75+
port_value: 8126
76+
77+
admin:
78+
access_log_path: "/dev/null"
79+
address:
80+
socket_address:
81+
address: 0.0.0.0
82+
port_value: 8001

0 commit comments

Comments
 (0)