6380229c71
[REFACTOR] Scraping: rename variables for clarity
...
Instead of shadowing the outer variables, use different names.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-11-07 17:29:11 +00:00
3f6a133f26
[Test] Scraping: check reload metrics
...
Need to extend `newTestScrapeMetrics`` to get at the Registry.
`gatherLabels` function could go upstream to `client_golang`.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-11-07 17:29:04 +00:00
f9bc50b247
storage: Implement limit in mergeGenericQuerier
...
Signed-off-by: 🌲 Harry 🌊 John 🏔 <johrry@amazon.com>
2024-11-07 09:08:23 -08:00
e7c0d21a8b
add CHANGELOG entry
...
Signed-off-by: alexgreenbank <alex.greenbank@grafana.com>
2024-11-07 15:43:45 +00:00
6b09f094e1
scrape: stop erroring on empty scrapes
...
Signed-off-by: alexgreenbank <alex.greenbank@grafana.com>
2024-11-07 11:30:03 +00:00
704071d4c3
Merge pull request #15355 from roidelapluie/update-common-3
...
Update prometheus/common
2024-11-07 11:28:12 +01:00
1ea35578ca
Merge pull request #15353 from fionaliao/fl/update-docs
...
docs: formatting and typo fixes to 3.0 migration guide
2024-11-07 09:42:32 +00:00
3aab02c63b
chore(deps): bump github.com/prometheus/exporter-toolkit
...
Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit ) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases )
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/prometheus/exporter-toolkit/compare/v0.13.0...v0.13.1 )
---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-11-07 09:08:53 +00:00
5c05c89b8b
Update prometheus/common
...
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-11-07 10:08:02 +01:00
fc3d19725d
Merge pull request #15336 from roidelapluie/update-common
...
Update prometheus/common
2024-11-07 10:07:14 +01:00
54a3f5054c
docs: formatting and typo fixes to 3.0 migration guide
...
Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
2024-11-06 19:35:42 +00:00
96c2fe04e7
Merge pull request #15328 from prometheus/deadcode
...
chore: Remove dead code
2024-11-06 13:20:53 -03:00
f42b37ff2f
[BUGFIX] TSDB: Fix race on stale values in headAppender ( #15322 )
...
* [BUGFIX] TSDB: Fix race on stale values in headAppender
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* Simplify
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
---------
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-11-06 16:51:39 +01:00
af1a19fc78
enable errorf rule from perfsprint linter
...
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
2024-11-06 16:50:36 +01:00
37f3f3f2db
Fix scrape failure logs
...
Before this change, logs would show like:
```
{...,"target":"http://localhost:8080/metrics ","!BADKEY":"Get ..."}
```
After this change
```
{...,"msg":"Get ...","job_name":...,"target":...}
```
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
2024-11-06 15:38:47 +01:00
160a4801d2
chore(deps): bump golangci/golangci-lint-action from 6.1.0 to 6.1.1
...
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action ) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases )
- [Commits](aaa42aa062...971e284b60
2024-11-06 10:29:01 +00:00
d60cdcdac8
chore(deps): bump actions/checkout from 4.2.0 to 4.2.2
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](d632683dd7...11bd71901b
2024-11-06 10:29:01 +00:00
bac1fa6149
Merge pull request #15323 from bboreham/enable-race
...
CI Build: re-enable race detector
2024-11-06 10:27:54 +00:00
a7793b1010
Merge pull request #15327 from prometheus/merge-2.55-into-main2
...
Merge 2.55 into main
2024-11-06 10:11:30 +00:00
8bd1d73e53
Merge pull request #15341 from prometheus/fix/empty-metric-name-formatting-2
...
Fix selector / series formatting for empty metric names
2024-11-05 19:06:45 +01:00
3c5551df68
Merge pull request #15340 from prometheus/fix/empty-metric-name-formatting
...
Fix selector / series formatting for empty metric names
2024-11-05 16:48:46 +01:00
75626c4ce8
Merge pull request #15295 from prometheus/dependabot/go_modules/github.com/envoyproxy/go-control-plane-0.13.1
...
chore(deps): bump github.com/envoyproxy/go-control-plane from 0.13.0 to 0.13.1
2024-11-05 16:37:25 +01:00
d19e749dc6
Fix selector / series formatting for empty metric names
...
Fixes https://github.com/prometheus/prometheus/issues/15335
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-11-05 16:29:40 +01:00
c1f8036228
Fix selector / series formatting for empty metric names
...
Fixes https://github.com/prometheus/prometheus/issues/15335
Signed-off-by: Julius Volz <julius.volz@gmail.com>
2024-11-05 16:12:05 +01:00
3294b7d58b
chore(deps): bump actions/checkout from 4.2.0 to 4.2.2 in /scripts
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](d632683dd7...11bd71901b
2024-11-05 15:10:10 +00:00
60c1d7ae30
Merge pull request #15306 from prometheus/dependabot/github_actions/scripts/actions/setup-go-5.1.0
...
chore(deps): bump actions/setup-go from 5.0.2 to 5.1.0 in /scripts
2024-11-05 16:09:01 +01:00
dd76c98240
Merge pull request #15304 from prometheus/dependabot/github_actions/scripts/golangci/golangci-lint-action-6.1.1
...
chore(deps): bump golangci/golangci-lint-action from 6.1.0 to 6.1.1 in /scripts
2024-11-05 16:07:07 +01:00
b8d06c79ea
chore(deps): bump the go-opentelemetry-io group with 6 updates
...
Bumps the go-opentelemetry-io group with 6 updates:
| Package | From | To |
| --- | --- | --- |
| [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector ) | `1.16.0` | `1.18.0` |
| [go.opentelemetry.io/collector/semconv](https://github.com/open-telemetry/opentelemetry-collector ) | `0.110.0` | `0.112.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace](https://github.com/open-telemetry/opentelemetry-go ) | `1.30.0` | `1.31.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc](https://github.com/open-telemetry/opentelemetry-go ) | `1.30.0` | `1.31.0` |
| [go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp](https://github.com/open-telemetry/opentelemetry-go ) | `1.30.0` | `1.31.0` |
| [go.opentelemetry.io/otel/sdk](https://github.com/open-telemetry/opentelemetry-go ) | `1.30.0` | `1.31.0` |
Updates `go.opentelemetry.io/collector/pdata` from 1.16.0 to 1.18.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.16.0...pdata/v1.18.0 )
Updates `go.opentelemetry.io/collector/semconv` from 0.110.0 to 0.112.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.110.0...v0.112.0 )
Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace` from 1.30.0 to 1.31.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.30.0...v1.31.0 )
Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc` from 1.30.0 to 1.31.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.30.0...v1.31.0 )
Updates `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp` from 1.30.0 to 1.31.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.30.0...v1.31.0 )
Updates `go.opentelemetry.io/otel/sdk` from 1.30.0 to 1.31.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.30.0...v1.31.0 )
---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/pdata
dependency-type: direct:production
update-type: version-update:semver-minor
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/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
- dependency-name: go.opentelemetry.io/otel/sdk
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: go-opentelemetry-io
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-11-05 14:59:52 +00:00
07ea8d1aeb
chore(deps): bump github.com/envoyproxy/go-control-plane
...
Bumps [github.com/envoyproxy/go-control-plane](https://github.com/envoyproxy/go-control-plane ) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/envoyproxy/go-control-plane/releases )
- [Changelog](https://github.com/envoyproxy/go-control-plane/blob/main/CHANGELOG.md )
- [Commits](https://github.com/envoyproxy/go-control-plane/compare/v0.13.0...v0.13.1 )
---
updated-dependencies:
- dependency-name: github.com/envoyproxy/go-control-plane
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-11-05 14:59:00 +00:00
be9f488067
Merge pull request #15291 from prometheus/dependabot/go_modules/google.golang.org/api-0.204.0
...
chore(deps): bump google.golang.org/api from 0.199.0 to 0.204.0
2024-11-05 15:58:10 +01:00
05f618147a
Merge pull request #15286 from prometheus/dependabot/github_actions/actions/setup-node-4.1.0
...
chore(deps): bump actions/setup-node from 4.0.4 to 4.1.0
2024-11-05 15:57:47 +01:00
c85202563f
Merge pull request #15307 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/influxdata/influxdb-1.11.7
...
chore(deps): bump github.com/influxdata/influxdb from 1.11.6 to 1.11.7 in /documentation/examples/remote_storage
2024-11-05 15:56:42 +01:00
40179b1890
Merge pull request #15292 from prometheus/dependabot/go_modules/github.com/digitalocean/godo-1.128.0
...
chore(deps): bump github.com/digitalocean/godo from 1.126.0 to 1.128.0
2024-11-05 15:56:07 +01:00
9aabf66ecf
Merge pull request #15296 from prometheus/dependabot/go_modules/github.com/hashicorp/consul/api-1.30.0
...
chore(deps): bump github.com/hashicorp/consul/api from 1.29.4 to 1.30.0
2024-11-05 15:55:14 +01:00
2d0def3f43
Merge pull request #15128 from wuast94/patch-1
...
Add image source label to dockerfiles
2024-11-05 15:34:24 +01:00
50e83e8f98
Export 'go_sync_mutex_wait_total_seconds_total' metric
...
This metric can be useful to debug mutex contention.
Ref: https://github.com/golang/go/issues/49881
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
2024-11-05 15:25:55 +01:00
1491d29fb1
Merge pull request #15330 from prometheus/make-release-2.53.3
...
Make release 2.53.3 LTS
2024-11-05 12:15:36 +00:00
02aa6d1de6
Merge pull request #15338 from bboreham/cosmetic-tsdb
...
[COMMENT] Remove duplicate line
2024-11-05 12:03:04 +00:00
b1e4052682
MemPostings.Delete(): make pauses to unlock and let the readers read ( #15242 )
...
This introduces back some unlocking that was removed in #13286 but in a
more balanced way, as suggested by @pracucci.
For TSDBs with a lot of churn, Delete() can take a couple of seconds,
and while it's holding the mutex, reads and writes are blocked waiting
for that mutex, increasing the number of connections handled and memory
usage.
This implementation pauses every 4K labels processed (note that also
compared to #13286 we're not processing all the label-values anymore,
but only the affected ones, because of #14307 ), makes sure that it's
possible to get the read lock, and waits for a few milliseconds more.
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Co-authored-by: Marco Pracucci <marco@pracucci.com>
2024-11-05 12:59:57 +01:00
9d9e86b333
Fix auto reload when a config file with a syntax error is reverted
...
When we had a syntax error but restored the old file, we did not
re-trigger the config reload, so the config reload metric was showing
that config reload was unsucessful.
I made magic to handle logs in cmd/prometheus.
For now it is a separate file so we can backport this easily.
I will generalize the helper in another PR.
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-11-05 12:43:34 +01:00
28f22b4d80
Update prometheus/common
...
Signed-off-by: Julien <roidelapluie@o11y.eu>
2024-11-05 12:08:33 +01:00
541c7fd9fe
[COMMENT] Remove duplicate line
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-11-05 11:03:40 +00:00
be41d3efeb
chore(deps): bump github.com/influxdata/influxdb
...
Bumps [github.com/influxdata/influxdb](https://github.com/influxdata/influxdb ) from 1.11.6 to 1.11.7.
- [Release notes](https://github.com/influxdata/influxdb/releases )
- [Commits](https://github.com/influxdata/influxdb/compare/v1.11.6...v1.11.7 )
---
updated-dependencies:
- dependency-name: github.com/influxdata/influxdb
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-11-05 10:45:13 +00:00
49f4443b9a
Merge pull request #15309 from prometheus/dependabot/go_modules/documentation/examples/remote_storage/github.com/prometheus/common-0.60.1
...
chore(deps): bump github.com/prometheus/common from 0.60.0 to 0.60.1 in /documentation/examples/remote_storage
2024-11-05 11:43:39 +01:00
4f97b0937e
chore(deps): bump actions/setup-node from 4.0.4 to 4.1.0
...
Bumps [actions/setup-node](https://github.com/actions/setup-node ) from 4.0.4 to 4.1.0.
- [Release notes](https://github.com/actions/setup-node/releases )
- [Commits](0a44ba7841...39370e3970
2024-11-05 10:36:50 +00:00
6427e13bd4
Merge pull request #15287 from prometheus/dependabot/github_actions/prometheus/promci-0.4.5
...
chore(deps): bump prometheus/promci from 0.4.4 to 0.4.5
2024-11-05 11:35:45 +01:00
266307be7a
Merge pull request #15290 from prometheus/dependabot/go_modules/github.com/Azure/azure-sdk-for-go/sdk/azcore-1.16.0
...
chore(deps): bump github.com/Azure/azure-sdk-for-go/sdk/azcore from 1.14.0 to 1.16.0
2024-11-05 11:35:13 +01:00
851be5e09f
Merge pull request #15297 from prometheus/dependabot/go_modules/github.com/klauspost/compress-1.17.11
...
chore(deps): bump github.com/klauspost/compress from 1.17.10 to 1.17.11
2024-11-05 11:35:01 +01:00
2c49f1bb6f
chore(deps): bump github.com/digitalocean/godo from 1.126.0 to 1.128.0
...
Bumps [github.com/digitalocean/godo](https://github.com/digitalocean/godo ) from 1.126.0 to 1.128.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.126.0...v1.128.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>
2024-11-05 10:33:54 +00:00
6cabe1446f
Merge pull request #15294 from prometheus/dependabot/go_modules/github.com/edsrzf/mmap-go-1.2.0
...
chore(deps): bump github.com/edsrzf/mmap-go from 1.1.0 to 1.2.0
2024-11-05 11:31:54 +01:00
Bryan Boreham