diff --git a/CHANGELOG.md b/CHANGELOG.md index d41adde680..472c355b49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -93,6 +93,8 @@ Main (unreleased) - `loki.source.api` during component shutdown will now reject all the inflight requests with status code 503 after `graceful_shutdown_timeout` has expired. (@kalleep) +- Update percona/mongodb_exporter dependency for `prometheus.exporter.mongodb`. (@dehaansa) + ### Bugfixes - Stop `loki.source.kubernetes` discarding log lines with duplicate timestamps. (@ciaranj) diff --git a/go.mod b/go.mod index 2f6981edf2..83c1e4dd52 100644 --- a/go.mod +++ b/go.mod @@ -177,7 +177,7 @@ require ( github.com/ory/dockertest/v3 v3.12.0 github.com/oschwald/geoip2-golang v1.13.0 github.com/oschwald/maxminddb-golang v1.13.1 - github.com/percona/mongodb_exporter v0.45.1-0.20250630080259-d761c954bba6 + github.com/percona/mongodb_exporter v0.47.1 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/pingcap/tidb/pkg/parser v0.0.0-20250501143621-a50a2323f4ba github.com/pkg/errors v0.9.1 @@ -313,6 +313,7 @@ require ( ) require ( + cel.dev/expr v0.24.0 // indirect cloud.google.com/go v0.121.6 // indirect cloud.google.com/go/auth v0.17.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect @@ -321,6 +322,7 @@ require ( cloud.google.com/go/logging v1.13.0 // indirect cloud.google.com/go/longrunning v0.6.7 // indirect cloud.google.com/go/monitoring v1.24.2 // indirect + cloud.google.com/go/storage v1.57.0 // indirect cloud.google.com/go/trace v1.11.6 // indirect dario.cat/mergo v1.0.2 // indirect filippo.io/edwards25519 v1.1.0 // indirect @@ -452,6 +454,7 @@ require ( github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.29.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect github.com/Masterminds/semver/v3 v3.4.0 // indirect @@ -581,6 +584,7 @@ require ( github.com/gavv/monotime v0.0.0-20190418164738-30dba4353424 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.6.2 // indirect + github.com/go-ini/ini v1.67.0 // indirect github.com/go-jose/go-jose/v4 v4.1.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect @@ -732,6 +736,9 @@ require ( github.com/microsoft/go-mssqldb v1.9.2 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect + github.com/minio/crc64nvme v1.0.2 // indirect + github.com/minio/md5-simd v1.1.2 // indirect + github.com/minio/minio-go/v7 v7.0.95 // indirect github.com/minio/sha256-simd v1.0.1 // indirect github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mitchellh/copystructure v1.2.0 // indirect @@ -749,7 +756,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/mongodb/mongo-tools v0.0.0-20250715155915-887641268977 // indirect + github.com/mongodb/mongo-tools v0.0.0-20250912152915-51d601cb4ba7 // indirect github.com/montanaflynn/stats v0.7.1 // indirect github.com/morikuni/aec v1.0.0 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect @@ -805,7 +812,7 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/percona/percona-backup-mongodb v1.8.1-0.20250218045950-7e9f38fe06ab // indirect + github.com/percona/percona-backup-mongodb v1.8.1-0.20250429102026-063dab6cc946 // indirect github.com/peterbourgon/ff/v3 v3.4.0 // indirect github.com/philhofer/fwd v1.2.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect @@ -830,6 +837,7 @@ require ( github.com/remeh/sizedwaitgroup v1.0.0 // indirect github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 // indirect github.com/rivo/uniseg v0.4.7 // indirect + github.com/rs/xid v1.6.0 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/safchain/ethtool v0.5.10 // indirect github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da // indirect @@ -850,6 +858,7 @@ require ( github.com/spf13/afero v1.15.0 // indirect github.com/spf13/cast v1.9.2 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect github.com/stackitcloud/stackit-sdk-go/core v0.17.3 // indirect github.com/stormcat24/protodep v0.1.8 // indirect github.com/stretchr/objx v0.5.2 // indirect @@ -895,6 +904,7 @@ require ( github.com/yl2chen/cidranger v1.0.2 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect + github.com/zeebo/errs v1.4.0 // indirect go.etcd.io/bbolt v1.4.3 // indirect go.etcd.io/etcd/api/v3 v3.5.21 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect diff --git a/go.sum b/go.sum index 147d55b9d5..1d7ba05044 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.57.0 h1:4g7NB7Ta7KetVbOMpCqy89C+Vg5VE8scqlSHUPm7Rds= +cloud.google.com/go/storage v1.57.0/go.mod h1:329cwlpzALLgJuu8beyJ/uvQznDHpa2U5lGjWednkzg= cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4= cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI= connectrpc.com/connect v1.18.1 h1:PAg7CjSAGvscaf6YZKUefjoih5Z/qYkyaTrBW8xvYPw= @@ -385,6 +387,8 @@ github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.53.0 h1:Bx8/0To6dQQzbRMaZX/NBqK/Vtzto9nRb0FySqWUsQs= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.53.0/go.mod h1:p659xWjqa2ZU6ubOumX1arLc5cY7UTITBkLVedm/qec= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 h1:owcC2UnmsZycprQ5RfRgjydWhuoxg71LUfyiQdijZuM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0/go.mod h1:ZPpqegjbE99EPKsu3iUWV22A04wzGPcAY/ziSIQEEgs= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.29.0 h1:YVtMlmfRUTaWs3+1acwMBp7rBUo6zrxl6Kn13/R9YW4= github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.29.0/go.mod h1:rKOFVIPbNs2wZeh7ZeQ0D9p/XLgbNiTr5m7x6KuAshk= github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.53.0 h1:4LP6hvB4I5ouTbGgWtixJhgED6xdf67twf9PoY96Tbg= @@ -863,6 +867,8 @@ github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lo github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= +github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-jose/go-jose/v4 v4.1.2 h1:TK/7NqRQZfgAh+Td8AlsrvtPoUyiHh0LqVvokh+1vHI= github.com/go-jose/go-jose/v4 v4.1.2/go.mod h1:22cg9HWM1pOlnRiY+9cQYJ9XHmya1bYW8OeDM6Ku6Oo= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -1080,8 +1086,11 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.3.3 h1:DIhPTQrbPkgs2yJYdXU/eNACCG5DVQjySNRNlflZ9Fc= +github.com/google/martian/v3 v3.3.3/go.mod h1:iEPrYcgCF7jA9OtScMFQyAlZZ4YXTKEtJ1E6RWzmBA0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -1527,6 +1536,7 @@ github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU= github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= @@ -1646,6 +1656,12 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpsp github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= +github.com/minio/crc64nvme v1.0.2 h1:6uO1UxGAD+kwqWWp7mBFsi5gAse66C4NXO8cmcVculg= +github.com/minio/crc64nvme v1.0.2/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= +github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= +github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM= +github.com/minio/minio-go/v7 v7.0.95 h1:ywOUPg+PebTMTzn9VDsoFJy32ZuARN9zhB+K3IYEvYU= +github.com/minio/minio-go/v7 v7.0.95/go.mod h1:wOOX3uxS334vImCNRVyIDdXX9OsXDm89ToynKgqUKlo= github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM= github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1:aKW/4cBs+yK6gpqU3K/oIwk9Q/XICqd3zOX/UFuvqmk= @@ -1699,8 +1715,8 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/mongodb/mongo-tools v0.0.0-20250715155915-887641268977 h1:J9wFLko0N7sbovyHahuRw1NyfMUsNhaauLK87wQ3ruc= -github.com/mongodb/mongo-tools v0.0.0-20250715155915-887641268977/go.mod h1:LnygXPEsw45G6DSmJmA9pLaNBXL8GblrFlKiSY3YNyY= +github.com/mongodb/mongo-tools v0.0.0-20250912152915-51d601cb4ba7 h1:xc+CdDoQEE67BoAtPEIeN3KfmsSfqxsJ8Ygy0e1Hy+8= +github.com/mongodb/mongo-tools v0.0.0-20250912152915-51d601cb4ba7/go.mod h1:LnygXPEsw45G6DSmJmA9pLaNBXL8GblrFlKiSY3YNyY= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= @@ -1991,10 +2007,10 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/percona/exporter_shared v0.7.6 h1:+IatWDIjkuAxAmJAU3oVvVGyOYI5E2/cz9p/WZ5BiuQ= github.com/percona/exporter_shared v0.7.6/go.mod h1:ia54ZOkbuIbN3KRkz98p6InhDTwPaJuqkBuD15YsI5g= -github.com/percona/mongodb_exporter v0.45.1-0.20250630080259-d761c954bba6 h1:y+VYKF8/iQWcp0bsQ//63BDptcOsbegbKw7d8SIWLDs= -github.com/percona/mongodb_exporter v0.45.1-0.20250630080259-d761c954bba6/go.mod h1:nPxDTzLRQi+IMVJ/KyfxUVXa7LuvSl+iXsXp0BSBoCk= -github.com/percona/percona-backup-mongodb v1.8.1-0.20250218045950-7e9f38fe06ab h1:PtSaYWf4AYpVjzn2+IX8aGu1FCQkx7GeRFXiUqFButw= -github.com/percona/percona-backup-mongodb v1.8.1-0.20250218045950-7e9f38fe06ab/go.mod h1:HRKf8nO4SqtNJ1oNzfY3THcwIsjGTWGBF3rNz1TwA9c= +github.com/percona/mongodb_exporter v0.47.1 h1:v3vfklfwbNe9/2Ro0d8bh65yqNwsBcWioKV75FY7IyM= +github.com/percona/mongodb_exporter v0.47.1/go.mod h1:4MItkpWlupTTxDZabrQlbC/x03YEi0YF6knfyrkGlZs= +github.com/percona/percona-backup-mongodb v1.8.1-0.20250429102026-063dab6cc946 h1:WMEOVJIHpchUh8MtDYjxNPjo0YZiECTmk0y4yuut5u4= +github.com/percona/percona-backup-mongodb v1.8.1-0.20250429102026-063dab6cc946/go.mod h1:gB/bHx955pIDTTXo/4fPJZxo3YuK+840lfKqDDYo8AE= github.com/peterbourgon/ff/v3 v3.4.0 h1:QBvM/rizZM1cB0p0lGMdmR7HxZeI/ZrBWB4DqLkMUBc= github.com/peterbourgon/ff/v3 v3.4.0/go.mod h1:zjJVUhx+twciwfDl0zBcFzl4dW8axCRyXE/eKY9RztQ= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= @@ -2153,6 +2169,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7 github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= +github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= @@ -2295,6 +2313,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.480 h1:YEDZmv2 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.480/go.mod h1:zaBIuDDs+rC74X8Aog+LSu91GFtHYRYDC196RGTm2jk= github.com/testcontainers/testcontainers-go v0.39.0 h1:uCUJ5tA+fcxbFAB0uP3pIK3EJ2IjjDUHFSZ1H1UxAts= github.com/testcontainers/testcontainers-go v0.39.0/go.mod h1:qmHpkG7H5uPf/EvOORKvS6EuDkBUPE3zpVGaH9NL7f8= +github.com/testcontainers/testcontainers-go/modules/minio v0.34.0 h1:OpUqT7VV/d+wriDMHcCZCUfOoFE6wiHnGVzJOXqq8lU= +github.com/testcontainers/testcontainers-go/modules/minio v0.34.0/go.mod h1:0iaOtVNCzu04KcXHgmdNE7aelKaMUwC9x1M0oe6h1sw= github.com/testcontainers/testcontainers-go/modules/mongodb v0.34.0 h1:o3bgcECyBFfMwqexCH/6vIJ8XzbCffCP/Euesu33rgY= github.com/testcontainers/testcontainers-go/modules/mongodb v0.34.0/go.mod h1:ljLR42dN7k40CX0dp30R8BRIB3OOdvr7rBANEpfmMs4= github.com/tg123/go-htpasswd v1.2.4 h1:HgH8KKCjdmo7jjXWN9k1nefPBd7Be3tFCTjc2jPraPU= diff --git a/internal/converter/internal/staticconvert/testdata-v2/integrations_v2.alloy b/internal/converter/internal/staticconvert/testdata-v2/integrations_v2.alloy index fe6532b4d8..0442522087 100644 --- a/internal/converter/internal/staticconvert/testdata-v2/integrations_v2.alloy +++ b/internal/converter/internal/staticconvert/testdata-v2/integrations_v2.alloy @@ -325,39 +325,6 @@ prometheus.scrape "integrations_memcached" { job_name = "integrations/memcached" } -prometheus.exporter.mongodb "integrations_mongodb_exporter" { - mongodb_uri = "mongodb://mongodb-a:27017" - direct_connect = true - discovering_mode = true -} - -discovery.relabel "integrations_mongodb" { - targets = prometheus.exporter.mongodb.integrations_mongodb_exporter.targets - - rule { - source_labels = ["__address__"] - target_label = "service_name" - replacement = "replicaset1-node1" - } - - rule { - source_labels = ["__address__"] - target_label = "mongodb_cluster" - replacement = "prod-cluster" - } - - rule { - target_label = "job" - replacement = "integrations/mongodb" - } -} - -prometheus.scrape "integrations_mongodb" { - targets = discovery.relabel.integrations_mongodb.output - forward_to = [prometheus.remote_write.metrics_default.receiver] - job_name = "integrations/mongodb" -} - prometheus.exporter.mssql "integrations_mssql" { connection_string = "sqlserver://:@:" } @@ -764,3 +731,36 @@ prometheus.scrape "integrations_gcp" { forward_to = [prometheus.remote_write.metrics_default.receiver] job_name = "integrations/gcp" } + +prometheus.exporter.mongodb "integrations_mongodb_exporter" { + mongodb_uri = "mongodb://mongodb-a:27017" + direct_connect = true + discovering_mode = true +} + +discovery.relabel "integrations_mongodb" { + targets = prometheus.exporter.mongodb.integrations_mongodb_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "service_name" + replacement = "replicaset1-node1" + } + + rule { + source_labels = ["__address__"] + target_label = "mongodb_cluster" + replacement = "prod-cluster" + } + + rule { + target_label = "job" + replacement = "integrations/mongodb" + } +} + +prometheus.scrape "integrations_mongodb" { + targets = discovery.relabel.integrations_mongodb.output + forward_to = [prometheus.remote_write.metrics_default.receiver] + job_name = "integrations/mongodb" +} diff --git a/internal/converter/internal/staticconvert/testdata/integrations.alloy b/internal/converter/internal/staticconvert/testdata/integrations.alloy index e1f75785ab..5b81350c0d 100644 --- a/internal/converter/internal/staticconvert/testdata/integrations.alloy +++ b/internal/converter/internal/staticconvert/testdata/integrations.alloy @@ -406,50 +406,6 @@ prometheus.scrape "integrations_memcached_exporter" { } } -prometheus.exporter.mongodb "integrations_mongodb_exporter" { - mongodb_uri = "mongodb://mongodb-a:27017" - direct_connect = true - discovering_mode = true -} - -discovery.relabel "integrations_mongodb_exporter" { - targets = prometheus.exporter.mongodb.integrations_mongodb_exporter.targets - - rule { - source_labels = ["__address__"] - target_label = "service_name" - replacement = "replicaset1-node1" - } - - rule { - source_labels = ["__address__"] - target_label = "mongodb_cluster" - replacement = "prod-cluster" - } - - rule { - target_label = "instance" - replacement = "instance-key-value" - } - - rule { - target_label = "job" - replacement = "integrations/mongodb_exporter" - } -} - -prometheus.scrape "integrations_mongodb_exporter" { - targets = discovery.relabel.integrations_mongodb_exporter.output - forward_to = [prometheus.remote_write.integrations.receiver] - job_name = "integrations/mongodb_exporter" - - tls_config { - ca_file = "/something7.cert" - cert_file = "/something8.cert" - key_file = "/something9.cert" - } -} - prometheus.exporter.mssql "integrations_mssql" { connection_string = "sqlserver://:@:" } @@ -783,3 +739,47 @@ prometheus.scrape "integrations_gcp_exporter" { key_file = "/something9.cert" } } + +prometheus.exporter.mongodb "integrations_mongodb_exporter" { + mongodb_uri = "mongodb://mongodb-a:27017" + direct_connect = true + discovering_mode = true +} + +discovery.relabel "integrations_mongodb_exporter" { + targets = prometheus.exporter.mongodb.integrations_mongodb_exporter.targets + + rule { + source_labels = ["__address__"] + target_label = "service_name" + replacement = "replicaset1-node1" + } + + rule { + source_labels = ["__address__"] + target_label = "mongodb_cluster" + replacement = "prod-cluster" + } + + rule { + target_label = "instance" + replacement = "instance-key-value" + } + + rule { + target_label = "job" + replacement = "integrations/mongodb_exporter" + } +} + +prometheus.scrape "integrations_mongodb_exporter" { + targets = discovery.relabel.integrations_mongodb_exporter.output + forward_to = [prometheus.remote_write.integrations.receiver] + job_name = "integrations/mongodb_exporter" + + tls_config { + ca_file = "/something7.cert" + cert_file = "/something8.cert" + key_file = "/something9.cert" + } +}