Skip to content

Commit daea2bf

Browse files
committed
Fix integration tests
1 parent 2db269b commit daea2bf

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

internal/config/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ type (
3737
DataPlaneConfig *DataPlaneConfig `yaml:"data_plane_config" mapstructure:"data_plane_config"`
3838
Client *Client `yaml:"client" mapstructure:"client"`
3939
Collector *Collector `yaml:"collector" mapstructure:"collector"`
40-
Watchers *Watchers `yaml:"watchers"`
40+
Watchers *Watchers `yaml:"watchers" mapstructure:"watchers"`
4141
Labels map[string]any `yaml:"labels" mapstructure:"labels"`
4242
Version string `yaml:"-"`
4343
Path string `yaml:"-"`
4444
UUID string `yaml:"-"`
4545
AllowedDirectories []string `yaml:"allowed_directories" mapstructure:"allowed_directories"`
46-
Features []string `yaml:"features"`
46+
Features []string `yaml:"features" mapstructure:"features"`
4747
}
4848

4949
Log struct {

test/config/agent/nginx-agent-otel-load.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ allowed_directories:
1717
- /var/run/nginx
1818
- /var/log/nginx
1919

20-
client:
21-
http:
22-
timeout: 10s
23-
2420
collector:
2521
receivers:
2622
otlp_receivers:

test/config/agent/nginx-config-with-grpc-client.conf

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,12 @@ log:
88
level: debug
99

1010
command:
11-
server:
12-
host: managementPlane
13-
port: 9092
14-
type: grpc
15-
16-
watchers:
17-
instance_watcher:
18-
monitoring_frequency: 30s
11+
server:
12+
host: managementPlane
13+
port: 9092
14+
type: grpc
1915

2016
allowed_directories:
21-
- /etc/nginx
22-
- /usr/local/etc/nginx
23-
- /usr/share/nginx/modules
24-
25-
client:
26-
http:
27-
timeout: 10s
17+
- /etc/nginx
18+
- /usr/local/etc/nginx
19+
- /usr/share/nginx/modules

0 commit comments

Comments
 (0)