diff --git a/build/Dockerfile.nginx b/build/Dockerfile.nginx index 8d22987895..34190265df 100644 --- a/build/Dockerfile.nginx +++ b/build/Dockerfile.nginx @@ -12,7 +12,7 @@ WORKDIR /tmp RUN apk add --no-cache git make \ && git clone https://github.com/nginx/agent.git \ && cd agent \ - && git checkout 9b574fa90848c9a7c123e6e7e6153ccd602ae724 \ + && git checkout 3dad26582af6c17e013302d08a4f1ed5d5504296 \ && make build FROM nginx:1.28.0-alpine-otel diff --git a/build/Dockerfile.nginxplus b/build/Dockerfile.nginxplus index 84ee8993cd..2a662d4bf3 100644 --- a/build/Dockerfile.nginxplus +++ b/build/Dockerfile.nginxplus @@ -11,7 +11,7 @@ WORKDIR /tmp RUN apk add --no-cache git make \ && git clone https://github.com/nginx/agent.git \ && cd agent \ - && git checkout 9b574fa90848c9a7c123e6e7e6153ccd602ae724 \ + && git checkout 3dad26582af6c17e013302d08a4f1ed5d5504296 \ && make build FROM alpine:3.21 diff --git a/go.mod b/go.mod index a1c1a45284..78d607ac5b 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 - github.com/nginx/agent/v3 v3.0.0-20250520100419-9b574fa90848 + github.com/nginx/agent/v3 v3.0.0-20250522105044-3dad26582af6 github.com/nginx/telemetry-exporter v0.1.4 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.37.0 diff --git a/go.sum b/go.sum index f94f7cf103..5dad51c20f 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nginx/agent/v3 v3.0.0-20250520100419-9b574fa90848 h1:BZ5WY30Ojw/+/SmmvsdbM7SXuEpUy9zgBkuMSVet540= -github.com/nginx/agent/v3 v3.0.0-20250520100419-9b574fa90848/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs= +github.com/nginx/agent/v3 v3.0.0-20250522105044-3dad26582af6 h1:/JE/9CpNIIpLRmmF6aYbTVvZyGU21Iano5gzdmhmICc= +github.com/nginx/agent/v3 v3.0.0-20250522105044-3dad26582af6/go.mod h1:O/31aKtii/mpiZmFGMcTNDoLtKzwTyTXOBMSRkMaPvs= github.com/nginx/telemetry-exporter v0.1.4 h1:3ikgKlyz/O57oaBLkxCInMjr74AhGTKr9rHdRAkkl/w= github.com/nginx/telemetry-exporter v0.1.4/go.mod h1:bl6qmsxgk4a9D0X8R5E3sUNXN2iECPEK1JNbRLhN5C4= github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1 h1:5VVK38bnELMDWnwfF6dSv57ResXh9AUzeDa72ENj94o= diff --git a/internal/mode/static/provisioner/templates.go b/internal/mode/static/provisioner/templates.go index 87a667ef87..791a807c4d 100644 --- a/internal/mode/static/provisioner/templates.go +++ b/internal/mode/static/provisioner/templates.go @@ -60,19 +60,17 @@ log: {{- if .EnableMetrics }} collector: receivers: + container_metrics: + collection_interval: 1m0s host_metrics: collection_interval: 1m0s initial_delay: 1s scrapers: - cpu: {} - memory: {} - disk: {} network: {} - filesystem: {} processors: batch: {} exporters: - prometheus_exporter: + prometheus: server: host: "0.0.0.0" port: {{ .MetricsPort }}