Skip to content

Commit c4183c2

Browse files
L3n41cgrantseltzer
authored andcommitted
[SMP] Fix agent error logs about process endpoint (#36305)
1 parent f257d7f commit c4183c2

File tree

14 files changed

+67
-24
lines changed

14 files changed

+67
-24
lines changed

test/regression/cases/ddot_logs/datadog-agent/datadog.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ logs_config:
1111
logs_no_ssl: true
1212
force_use_http: true
1313

14-
dd_url: http://127.0.0.1:9092
15-
telemetry.enabled: true
16-
telemetry.checks: '*'
14+
dd_url: http://127.0.0.1:9091
15+
process_config:
16+
process_dd_url: http://localhost:9093
17+
telemetry:
18+
enabled: true
19+
checks: '*'

test/regression/cases/ddot_logs/lading/lading.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ blackhole:
1919
- http:
2020
binding_addr: "127.0.0.1:9092"
2121
body_variant: "nothing"
22+
- http:
23+
binding_addr: "127.0.0.1:9093"
24+
body_variant: "nothing"
2225

2326
target_metrics:
2427
- prometheus:

test/regression/cases/ddot_metrics/datadog-agent/datadog.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ logs_config:
1111
logs_no_ssl: true
1212
force_use_http: true
1313

14-
dd_url: http://127.0.0.1:9092
15-
telemetry.enabled: true
16-
telemetry.checks: '*'
14+
dd_url: http://127.0.0.1:9091
15+
process_config:
16+
process_dd_url: http://localhost:9093
17+
telemetry:
18+
enabled: true
19+
checks: '*'

test/regression/cases/ddot_metrics/lading/lading.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ blackhole:
1919
- http:
2020
binding_addr: "127.0.0.1:9092"
2121
body_variant: "nothing"
22+
- http:
23+
binding_addr: "127.0.0.1:9093"
24+
body_variant: "nothing"
2225

2326
target_metrics:
2427
- prometheus:

test/regression/cases/ddot_traces/datadog-agent/datadog.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ logs_config:
1111
logs_no_ssl: true
1212
force_use_http: true
1313

14-
dd_url: http://127.0.0.1:9092
15-
telemetry.enabled: true
16-
telemetry.checks: '*'
14+
dd_url: http://127.0.0.1:9091
15+
process_config:
16+
process_dd_url: http://localhost:9093
17+
telemetry:
18+
enabled: true
19+
checks: '*'

test/regression/cases/ddot_traces/lading/lading.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ blackhole:
1919
- http:
2020
binding_addr: "127.0.0.1:9092"
2121
body_variant: "nothing"
22+
- http:
23+
binding_addr: "127.0.0.1:9093"
24+
body_variant: "nothing"
2225

2326
target_metrics:
2427
- prometheus:

test/regression/cases/file_tree/datadog-agent/datadog.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ cloud_provider_metadata: []
77

88
logs_enabled: true
99

10-
dd_url: http://127.0.0.1:9092
11-
telemetry.enabled: true
12-
telemetry.checks: '*'
13-
process_collection.enabled: false
10+
dd_url: http://127.0.0.1:9091
11+
telemetry:
12+
enabled: true
13+
checks: '*'
14+
process_config:
15+
process_dd_url: http://localhost:9093
16+
process_collection:
17+
enabled: false

test/regression/cases/file_tree/lading/lading.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ blackhole:
1010
binding_addr: "127.0.0.1:9091"
1111
body_variant: "nothing"
1212
- http:
13-
binding_addr: "127.0.0.1:9092"
13+
binding_addr: "127.0.0.1:9093"
1414
body_variant: "nothing"
1515

1616
target_metrics:

test/regression/cases/otlp_ingest_logs/datadog-agent/datadog.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ logs_config:
1111
logs_no_ssl: true
1212
force_use_http: true
1313

14-
dd_url: http://127.0.0.1:9092
15-
telemetry.enabled: true
16-
telemetry.checks: '*'
14+
dd_url: http://127.0.0.1:9091
15+
process_config:
16+
process_dd_url: http://localhost:9093
17+
telemetry:
18+
enabled: true
19+
checks: '*'
1720
otlp_config:
1821
receiver:
1922
protocols:

test/regression/cases/otlp_ingest_logs/lading/lading.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ blackhole:
1919
- http:
2020
binding_addr: "127.0.0.1:9092"
2121
body_variant: "nothing"
22+
- http:
23+
binding_addr: "127.0.0.1:9093"
24+
body_variant: "nothing"
2225

2326
target_metrics:
2427
- prometheus:

test/regression/cases/otlp_ingest_metrics/datadog-agent/datadog.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ logs_config:
1111
logs_no_ssl: true
1212
force_use_http: true
1313

14-
dd_url: http://127.0.0.1:9092
15-
telemetry.enabled: true
16-
telemetry.checks: '*'
14+
dd_url: http://127.0.0.1:9091
15+
process_config:
16+
process_dd_url: http://localhost:9093
17+
telemetry:
18+
enabled: true
19+
checks: '*'
1720
otlp_config:
1821
receiver:
1922
protocols:

test/regression/cases/otlp_ingest_metrics/lading/lading.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ blackhole:
1919
- http:
2020
binding_addr: "127.0.0.1:9092"
2121
body_variant: "nothing"
22+
- http:
23+
binding_addr: "127.0.0.1:9093"
24+
body_variant: "nothing"
2225

2326
target_metrics:
2427
- prometheus:

test/regression/cases/otlp_ingest_traces/datadog-agent/datadog.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cloud_provider_metadata: []
77

88
apm_config:
99
enabled: true
10-
apm_dd_url: http://127.0.0.1:9091
10+
apm_dd_url: http://127.0.0.1:9094
1111
# set an arbitrarily high sample set
1212
max_traces_per_second: 1000000
1313
errors_per_second: 1000000
@@ -19,9 +19,12 @@ logs_config:
1919
logs_no_ssl: true
2020
force_use_http: true
2121

22-
dd_url: http://127.0.0.1:9092
23-
telemetry.enabled: true
24-
telemetry.checks: '*'
22+
dd_url: http://127.0.0.1:9091
23+
process_config:
24+
process_dd_url: http://localhost:9093
25+
telemetry:
26+
enabled: true
27+
checks: '*'
2528
otlp_config:
2629
receiver:
2730
protocols:

test/regression/cases/otlp_ingest_traces/lading/lading.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ blackhole:
1919
- http:
2020
binding_addr: "127.0.0.1:9092"
2121
body_variant: "nothing"
22+
- http:
23+
binding_addr: "127.0.0.1:9093"
24+
body_variant: "nothing"
25+
- http:
26+
binding_addr: "127.0.0.1:9094"
27+
body_variant: "nothing"
2228

2329
target_metrics:
2430
- prometheus:

0 commit comments

Comments
 (0)