Skip to content

Commit ae0e46e

Browse files
authored
Update agent collector config (#3396)
Problem: Agent updated the structure of the collector configuration. Solution: Update our agent config template to match the new structure.
1 parent 7854d84 commit ae0e46e

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

build/Dockerfile.nginx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ WORKDIR /tmp
1212
RUN apk add --no-cache git make \
1313
&& git clone https://github.com/nginx/agent.git \
1414
&& cd agent \
15-
&& git checkout 9b574fa90848c9a7c123e6e7e6153ccd602ae724 \
15+
&& git checkout 3dad26582af6c17e013302d08a4f1ed5d5504296 \
1616
&& make build
1717

1818
FROM nginx:1.28.0-alpine-otel

build/Dockerfile.nginxplus

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ WORKDIR /tmp
1111
RUN apk add --no-cache git make \
1212
&& git clone https://github.com/nginx/agent.git \
1313
&& cd agent \
14-
&& git checkout 9b574fa90848c9a7c123e6e7e6153ccd602ae724 \
14+
&& git checkout 3dad26582af6c17e013302d08a4f1ed5d5504296 \
1515
&& make build
1616

1717
FROM alpine:3.21

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/go-logr/logr v1.4.2
88
github.com/google/go-cmp v0.7.0
99
github.com/google/uuid v1.6.0
10-
github.com/nginx/agent/v3 v3.0.0-20250520100419-9b574fa90848
10+
github.com/nginx/agent/v3 v3.0.0-20250522105044-3dad26582af6
1111
github.com/nginx/telemetry-exporter v0.1.4
1212
github.com/onsi/ginkgo/v2 v2.23.4
1313
github.com/onsi/gomega v1.37.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
135135
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
136136
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
137137
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
138-
github.com/nginx/agent/v3 v3.0.0-20250520100419-9b574fa90848 h1:BZ5WY30Ojw/+/SmmvsdbM7SXuEpUy9zgBkuMSVet540=
139-
github.com/nginx/agent/v3 v3.0.0-20250520100419-9b574fa90848/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs=
138+
github.com/nginx/agent/v3 v3.0.0-20250522105044-3dad26582af6 h1:/JE/9CpNIIpLRmmF6aYbTVvZyGU21Iano5gzdmhmICc=
139+
github.com/nginx/agent/v3 v3.0.0-20250522105044-3dad26582af6/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs=
140140
github.com/nginx/telemetry-exporter v0.1.4 h1:3ikgKlyz/O57oaBLkxCInMjr74AhGTKr9rHdRAkkl/w=
141141
github.com/nginx/telemetry-exporter v0.1.4/go.mod h1:bl6qmsxgk4a9D0X8R5E3sUNXN2iECPEK1JNbRLhN5C4=
142142
github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o=

internal/mode/static/provisioner/templates.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,17 @@ log:
6060
{{- if .EnableMetrics }}
6161
collector:
6262
receivers:
63+
container_metrics:
64+
collection_interval: 1m0s
6365
host_metrics:
6466
collection_interval: 1m0s
6567
initial_delay: 1s
6668
scrapers:
67-
cpu: {}
68-
memory: {}
69-
disk: {}
7069
network: {}
71-
filesystem: {}
7270
processors:
7371
batch: {}
7472
exporters:
75-
prometheus_exporter:
73+
prometheus:
7674
server:
7775
host: "0.0.0.0"
7876
port: {{ .MetricsPort }}

0 commit comments

Comments
 (0)