mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 13:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
12027 commits 243 branches 444 tags 649 MiB
Commit graph

12027 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Kochie acc7b3b534
Merge pull request #13155 from mmorel-35/tsdb 
tsdb: use Go standard errors
 2023-12-11 14:13:11 +01:00
Matthieu MOREL 8f6cf3aabb tsdb: use Go standard errors 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-12-11 12:18:54 +00:00
Arthur Silva Sens 5082655392
Append Created Timestamps (#12733) 
* Append created timestamps.

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

* Log when created timestamps are ignored

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

* Proposed changes to Append CT PR.

Changes:

* Changed textparse Parser interface for consistency and robustness.
* Changed CT interface to be more explicit and handle validation.
* Simplified test, change scrapeManager to allow testability.
* Added TODOs.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* Updates.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* Addressed comments.

Signed-off-by: bwplotka <bwplotka@gmail.com>

* Refactor head_appender test

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

* Fix linter issues

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

* Use model.Sample in head appender test

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>

---------

Signed-off-by: Arthur Silva Sens <arthur.sens@coralogix.com>
Signed-off-by: bwplotka <bwplotka@gmail.com>
Co-authored-by: bwplotka <bwplotka@gmail.com>
 2023-12-11 08:43:42 +00:00
Björn Rabenstein db915b07cb
Merge pull request #13215 from fpetkovski/float-histogram-reuse 
Enable reusing memory when converting between histogram types
 2023-12-09 22:44:46 +01:00
Bartlomiej Plotka 91a383f52c
Merge pull request #13059 from zenador/add-mad-function 
Add mad_over_time function
 2023-12-08 11:53:22 +00:00
Filip Petkovski 9008271df5
Use cap to determine slice capacity 
Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
 2023-12-08 10:23:01 +01:00
Filip Petkovski 10a82f87fd
Enable reusing memory when converting between histogram types 
The 'ToFloat' method on integer histograms currently allocates new memory
each time it is called.

This commit adds an optional *FloatHistogram parameter that can be used
to reuse span and bucket slices. It is up to the caller to make sure the
input float histogram is not used anymore after the call.

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
 2023-12-08 10:22:59 +01:00
dependabot[bot] 48b1818ee8
build(deps-dev): bump @types/node from 17.0.45 to 20.10.4 in /web/ui (#13260) 
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 17.0.45 to 20.10.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-12-08 09:19:48 +00:00
Ben Kochie 1b92d5a341
Merge pull request #13228 from prometheus/dependabot/github_actions/dessant/lock-threads-5.0.1 
build(deps): bump dessant/lock-threads from 4.0.1 to 5.0.1
 2023-12-07 21:50:04 +01:00
Ben Kochie 66374f564c
Merge pull request #13229 from prometheus/dependabot/github_actions/github/codeql-action-2.22.8 
build(deps): bump github/codeql-action from 2.22.5 to 2.22.8
 2023-12-07 21:48:29 +01:00
Ben Kochie 2944381251
Merge pull request #13230 from prometheus/dependabot/github_actions/bufbuild/buf-setup-action-1.28.1 
build(deps): bump bufbuild/buf-setup-action from 1.26.1 to 1.28.1
 2023-12-07 21:47:55 +01:00
Björn Rabenstein 85078b968f
Merge pull request #13208 from linasm/panic-free-float-histogram-add-sub 
FloatHistogram.Add/Sub: handle any schema change
 2023-12-07 20:12:21 +01:00
Björn Rabenstein de1ec731c7
Merge pull request #13212 from linasm/optimize-floatBucketIterator-for-common-case 
Histograms: optimize floatBucketIterator for common case
 2023-12-07 20:11:58 +01:00
Linas Medziunas bd895baefc FloatHistogram.Add/Sub: handle any schema change 
Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com>
 2023-12-07 20:50:54 +02:00
Björn Rabenstein 7c8035a251
Merge pull request #13259 from vesari/add-unit 
protobuf: add unit to metric family message
 2023-12-07 17:29:32 +01:00
Bartlomiej Plotka f9ecc0d5b5
Updated main and example Go dependencies. (#13255) 
Pre step for 2.49-rc.0

Added cmd for documentation module update due to https://github.com/prometheus/prometheus/security/dependabot/92 & other similar alerts.

Signed-off-by: bwplotka <bwplotka@gmail.com>
 2023-12-07 15:56:30 +00:00
Ben Kochie 044c8e8958
Merge pull request #13236 from prometheus/dependabot/go_modules/go-opentelemetry-io-be5b6ce82a 
build(deps): bump the go-opentelemetry-io group with 7 updates
 2023-12-07 16:19:31 +01:00
SuperQ d91ebffb30
Update deprecated otel functions 
Use new `noop.NewTracerProvider` function.

Signed-off-by: SuperQ <superq@gmail.com>
 2023-12-07 15:50:21 +01:00
Ben Kochie 7502d04935
Merge pull request #13237 from prometheus/dependabot/go_modules/github.com/linode/linodego-1.25.0 
build(deps): bump github.com/linode/linodego from 1.24.0 to 1.25.0
 2023-12-07 15:45:04 +01:00
Ben Kochie 1bb13626b2
Merge pull request #13235 from prometheus/dependabot/go_modules/k8s-io-5fd27ec905 
build(deps): bump the k8s-io group with 2 updates
 2023-12-07 15:44:01 +01:00
Bartlomiej Plotka bc4f8366c5
Upgraded npm dependencies pre 2.49-rc.0 (#13256) 
Signed-off-by: bwplotka <bwplotka@gmail.com>
 2023-12-07 14:43:15 +00:00
Ben Kochie b718ec8294
Merge pull request #13239 from prometheus/dependabot/go_modules/github.com/digitalocean/godo-1.106.0 
build(deps): bump github.com/digitalocean/godo from 1.104.1 to 1.106.0
 2023-12-07 15:33:00 +01:00
Ben Kochie 8590c2b56c
Merge pull request #13257 from prometheus/superq/mod_versions 
Add test of Go module versions
 2023-12-07 15:26:42 +01:00
dependabot[bot] 2ada971de2
build(deps): bump github.com/linode/linodego from 1.24.0 to 1.25.0 
Bumps [github.com/linode/linodego](https://github.com/linode/linodego) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/linode/linodego/releases)
- [Commits](https://github.com/linode/linodego/compare/v1.24.0...v1.25.0)

---
updated-dependencies:
- dependency-name: github.com/linode/linodego
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-07 13:52:41 +00:00
dependabot[bot] 9512c4ca9e
build(deps): bump the k8s-io group with 2 updates 
Bumps the k8s-io group with 2 updates: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/client-go](https://github.com/kubernetes/client-go).


Updates `k8s.io/api` from 0.28.3 to 0.28.4
- [Commits](https://github.com/kubernetes/api/compare/v0.28.3...v0.28.4)

Updates `k8s.io/client-go` from 0.28.3 to 0.28.4
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.28.3...v0.28.4)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s-io
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-07 13:52:40 +00:00
dependabot[bot] 9e90b90eb3
build(deps): bump the go-opentelemetry-io group with 7 updates 
Bumps the go-opentelemetry-io group with 7 updates:

| Package | From | To |
| --- | --- | --- |
| [go.opentelemetry.io/collector/featuregate](https://github.com/open-telemetry/opentelemetry-collector) | `0.77.0` | `1.0.0` |
| [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector) | `1.0.0-rcv0017` | `1.0.0` |
| [go.opentelemetry.io/collector/semconv](https://github.com/open-telemetry/opentelemetry-collector) | `0.88.0` | `0.90.1` |
| [go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp](https://github.com/open-telemetry/opentelemetry-go-contrib) | `0.45.0` | `0.46.1` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://github.com/open-telemetry/opentelemetry-go) | `1.19.0` | `1.21.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go) | `1.19.0` | `1.21.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go) | `1.19.0` | `1.21.0` |


Updates `go.opentelemetry.io/collector/featuregate` from 0.77.0 to 1.0.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.77.0...pdata/v1.0.0)

Updates `go.opentelemetry.io/collector/pdata` from 1.0.0-rcv0017 to 1.0.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.0.0-rcv0017...pdata/v1.0.0)

Updates `go.opentelemetry.io/collector/semconv` from 0.88.0 to 0.90.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.88.0...v0.90.1)

Updates `go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp` from 0.45.0 to 0.46.1
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.45.0...zpages/v0.46.1)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace` from 1.19.0 to 1.21.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...v1.21.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.19.0 to 1.21.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...v1.21.0)

Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` from 1.19.0 to 1.21.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...v1.21.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/featuregate
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/collector/pdata
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/collector/semconv
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
- dependency-name: go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-opentelemetry-io
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-07 13:52:12 +00:00
Ben Kochie 4d7b009b7f
Merge pull request #13238 from prometheus/dependabot/go_modules/github.com/alecthomas/kingpin/v2-2.4.0 
build(deps): bump github.com/alecthomas/kingpin/v2 from 2.3.2 to 2.4.0
 2023-12-07 14:51:55 +01:00
dependabot[bot] eddda2a56f
build(deps): bump github.com/digitalocean/godo from 1.104.1 to 1.106.0 
Bumps [github.com/digitalocean/godo](https://github.com/digitalocean/godo) from 1.104.1 to 1.106.0.
- [Release notes](https://github.com/digitalocean/godo/releases)
- [Changelog](https://github.com/digitalocean/godo/blob/main/CHANGELOG.md)
- [Commits](https://github.com/digitalocean/godo/compare/v1.104.1...v1.106.0)

---
updated-dependencies:
- dependency-name: github.com/digitalocean/godo
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-07 13:49:31 +00:00
Ben Kochie 2f7ecbb934
Merge pull request #13240 from prometheus/dependabot/go_modules/golang.org/x/net-0.19.0 
build(deps): bump golang.org/x/net from 0.18.0 to 0.19.0
 2023-12-07 14:48:09 +01:00
Ben Kochie 1ec3b1779e
Merge pull request #13233 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/prometheus/prometheus-0.48.0 
build(deps): bump github.com/prometheus/prometheus from 0.47.2 to 0.48.0 in /documentation/examples/remote_storage
 2023-12-07 14:45:13 +01:00
SuperQ bf2b1ac115
Add test of Go module versions 
Make sure that the Go versions in all `go.mod` files are in sync.

Signed-off-by: SuperQ <superq@gmail.com>
 2023-12-07 14:44:49 +01:00
Arianna Vespri ffcc8a64a9 Add unit to metric family protobuf message 
Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
 2023-12-07 14:13:20 +01:00
dependabot[bot] abcab4efc9
build(deps): bump github.com/prometheus/prometheus 
Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.47.2 to 0.48.0.
- [Release notes](https://github.com/prometheus/prometheus/releases)
- [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/prometheus/compare/v0.47.2...v0.48.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/prometheus
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-07 12:36:16 +00:00
Ben Kochie 2ae84f980f
Merge pull request #13232 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/alecthomas/kingpin/v2-2.4.0 
build(deps): bump github.com/alecthomas/kingpin/v2 from 2.3.2 to 2.4.0 in /documentation/examples/remote_storage
 2023-12-07 13:33:48 +01:00
dependabot[bot] b9960d6d8d
build(deps-dev): bump @babel/traverse from 7.19.3 to 7.23.3 in /web/ui (#13137) 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.19.3 to 7.23.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.3/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-12-07 11:44:57 +00:00
Gavin Lam d5924f305b
Fix missing public IP addresses in Azure service discovery (#13241) 
Fixes #5588, #9293

Signed-off-by: Gavin Lam <gavin.oss@tutamail.com>
 2023-12-07 11:42:14 +00:00
Matthieu MOREL 9c4782f1cc
golangci-lint: enable testifylint linter (#13254) 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-12-07 11:35:01 +00:00
Julien Pivotto cef8aca8e8
Merge pull request #12206 from machadovilaca/add-focus-flag-to-promtool-test-rules 
Add '--run' flag to promtool test rules
 2023-12-05 13:25:02 +01:00
Julien Pivotto 74cd1b6a09
Merge branch 'main' into add-focus-flag-to-promtool-test-rules 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-12-05 12:27:15 +01:00
Matthieu MOREL 998fafe679
tsdb/wlog: use Go standard errors (#13144) 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-12-04 17:08:43 +00:00
dependabot[bot] 6f02c0409b
build(deps): bump golang.org/x/net from 0.18.0 to 0.19.0 
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.18.0 to 0.19.0.
- [Commits](https://github.com/golang/net/compare/v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-01 23:55:44 +00:00
dependabot[bot] f5b69bc777
build(deps): bump github.com/alecthomas/kingpin/v2 from 2.3.2 to 2.4.0 
Bumps [github.com/alecthomas/kingpin/v2](https://github.com/alecthomas/kingpin) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/alecthomas/kingpin/releases)
- [Commits](https://github.com/alecthomas/kingpin/compare/v2.3.2...v2.4.0)

---
updated-dependencies:
- dependency-name: github.com/alecthomas/kingpin/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-01 23:55:32 +00:00
dependabot[bot] ec6253d283
build(deps): bump github.com/alecthomas/kingpin/v2 
Bumps [github.com/alecthomas/kingpin/v2](https://github.com/alecthomas/kingpin) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/alecthomas/kingpin/releases)
- [Commits](https://github.com/alecthomas/kingpin/compare/v2.3.2...v2.4.0)

---
updated-dependencies:
- dependency-name: github.com/alecthomas/kingpin/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-01 23:28:01 +00:00
dependabot[bot] 59f467ca84
build(deps): bump bufbuild/buf-setup-action from 1.26.1 to 1.28.1 
Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.26.1 to 1.28.1.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](eb60cd0de4...382440cdb8)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-01 23:24:02 +00:00
dependabot[bot] 6d8e82df1e
build(deps): bump github/codeql-action from 2.22.5 to 2.22.8 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.5 to 2.22.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](74483a38d3...407ffafae6)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-01 23:23:56 +00:00
dependabot[bot] 2f5f711cf1
build(deps): bump dessant/lock-threads from 4.0.1 to 5.0.1 
Bumps [dessant/lock-threads](https://github.com/dessant/lock-threads) from 4.0.1 to 5.0.1.
- [Release notes](https://github.com/dessant/lock-threads/releases)
- [Changelog](https://github.com/dessant/lock-threads/blob/main/CHANGELOG.md)
- [Commits](be8aa5be94...1bf7ec2505)

---
updated-dependencies:
- dependency-name: dessant/lock-threads
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-01 23:23:47 +00:00
Julien Levesy e4ec263bcc
fix(wlog/watcher): read segment synchronously when not tailing (#13224) 
Signed-off-by: Julien Levesy <jlevesy@gmail.com>
Signed-off-by: Callum Styan <callumstyan@gmail.com>
Co-authored-by: Callum Styan <callumstyan@gmail.com>
 2023-12-01 14:26:38 -08:00
Julien Levesy 501f514389
feat(tsdb/agent): notify remote storage when commit happens (#13223) 
Signed-off-by: Julien Levesy <jlevesy@gmail.com>
Signed-off-by: Callum Styan <callumstyan@gmail.com>
Co-authored-by: Callum Styan <callumstyan@gmail.com>
 2023-12-01 14:00:26 -08:00
Julien Pivotto 52b15d2195
Merge pull request #13219 from djcode/main 
Discovery: Add support for NS records to DNS Discovery
 2023-12-01 16:10:07 +01:00
Julien Pivotto 6e8e16c050
Merge pull request #13227 from prometheus/release-2.48 
Merge release-2.48 back into main
 2023-12-01 16:09:02 +01:00