Jan Fajerski
adf5d6bce1
Merge branch 'main' into 3.0-main-sync-24-07-18
...
Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
Conflicts:
VERSION
pick 3.0.0
promql/promqltest/testdata/histograms.test
pick changes from c39776c5b5
,
but adjust 5m range selectors to 10m to account for
https://github.com/prometheus/prometheus/pull/13904 .
Fixes:
promql/promqltest/testdata/functions.test
promql/promqltest/testdata/staleness.test
Tests added in https://github.com/prometheus/prometheus/pull/9138
need to be adjusted to account for
https://github.com/prometheus/prometheus/pull/13904 .
2024-07-18 15:56:40 +02:00
Björn Rabenstein
e9dec5fc53
Merge pull request #14483 from prometheus/beorn7/doc
...
docs: Correct and clarify histogram bucket and resolution limits
2024-07-18 14:31:24 +02:00
Bryan Boreham
bdfeae6489
Merge pull request #14474 from bboreham/shrink-memseries
...
TSDB: shrink memSeries by moving bools together
2024-07-18 12:15:57 +01:00
beorn7
a6fa8a471c
docs: Correct and clarify histogram bucket and resolution limits
...
Previously, the config doc suggested that scrapes are simply failed if
the bucket limit is exceeded. However, instead Prometheus first
attempts to reduce the resolution. This will succeed in almost all
non-pathological cases. However, in the rare case that it doesn't, the
scrape will be failed after all.
For the resolution limit AKA `native_histogram_min_bucket_factor`, the
logic is a bit different. Once the highest factor, i.e. schema -4, is
reached, the scrape will still succeed.
Signed-off-by: beorn7 <beorn@grafana.com>
2024-07-18 12:30:55 +02:00
Arve Knudsen
932918cd3f
OTLPConfig.UnmarshalYAML: Return error on invalid input
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-18 10:40:47 +02:00
Arve Knudsen
ad0a30cdd8
Merge remote-tracking branch 'prometheus/main' into feat/promote-attributes
2024-07-18 10:21:43 +02:00
Bryan Boreham
ce3bd4abea
Update for Docker deprecation
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-17 17:03:32 +01:00
Bryan Boreham
8f9069f41b
Bump Otel semconv version to 1.26.0
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-17 17:00:50 +01:00
Bryan Boreham
6b4ff79ce0
Update Go dependencies
...
Prior to preparing v2.54 release.
Note not updating to k8s.io 1.30, which would force Go 1.22.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-17 16:30:36 +01:00
Bryan Boreham
b75e635374
Merge pull request #14476 from SeanKilleen/patch-2
...
docs: Update storage.md to provide right-sizing advice on retention
2024-07-17 15:36:28 +01:00
Björn Rabenstein
ca7062cf49
Merge pull request #14464 from prometheus/beorn7/histogram
...
promql: Add NHCB tests
2024-07-17 14:57:46 +02:00
Carrie Edwards
a28d1974b4
Merge pull request #14438 from prometheus/cedwards/ooo-chunk-encoding
...
tsdb: Add support for handling multiple chunks in OOO head
2024-07-16 11:12:23 -07:00
Carrie Edwards
02f05cbf2c
Ensure lastMmapRef set to 0 if mmapRefs is empty
...
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
2024-07-16 10:54:06 -07:00
Carrie Edwards
79b53bd3de
Refactor TestWBLReplay to use scenarios
...
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
Co-authored by: Fiona Liao <fiona.liao@grafana.com>:
2024-07-16 10:53:28 -07:00
Carrie Edwards
7e020bb4e9
Refactor
...
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
2024-07-16 10:53:23 -07:00
Carrie Edwards
e0d7cef545
Rename some variables in Commit()
...
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
2024-07-16 10:53:23 -07:00
Carrie Edwards
fb2ebe1c3d
Fix linting
...
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
2024-07-16 10:53:23 -07:00
Carrie Edwards
2e0e4e9ce9
Add support for handling multiple chunks in OOO head
...
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
Co-authored by: Jeanette Tan <jeanette.tan@grafana.com>:
Co-authored by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>:
Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>
Co-authored by: Fiona Liao <fiona.liao@grafana.com>:
2024-07-16 10:53:09 -07:00
Arve Knudsen
1d21867d8b
Add otlptranslator tests
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-16 15:31:52 +02:00
Arve Knudsen
6a9df95620
Add to changelog
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-16 15:13:22 +02:00
Arve Knudsen
ec818332dc
Add config tests
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-16 14:55:08 +02:00
Arve Knudsen
ae82a0a941
Sanitize configured OTel resource attributes
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-16 14:38:39 +02:00
beorn7
c39776c5b5
promql: Add NHCB tests
...
This adds equivalent NHCB tests to the existing classic histogram
tests.
Signed-off-by: beorn7 <beorn@grafana.com>
2024-07-16 12:20:43 +02:00
Arve Knudsen
a25b626792
prometheusremotewrite: Support resource attribute promotion
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-16 11:51:10 +02:00
Bryan Boreham
e892483768
Merge pull request #14469 from charleskorn/memoizedseriesiterator-att
...
storage: add `AtT` method to `MemoizedSeriesIterator`
2024-07-16 08:43:47 +01:00
Sean Killeen
f031fe1fa3
Update storage.md to provide right-sizing advice on retention
...
Signed-off-by: Sean Killeen <SeanKilleen@gmail.com>
2024-07-15 12:30:16 -04:00
Bryan Boreham
d878146c70
TSDB: shrink memSeries by moving bools together
...
In each case the following member requires 8-byte alignment, so moving
one beside the other shrinks memSeries from 176 to 168 bytes, when
compiled with `-tags stringlabels`.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-15 16:09:48 +01:00
Arve Knudsen
d7d06b40d4
Merge pull request #14420 from B1F030/patch-1
...
Fix web.cors.origin in command-line/prometheus.md
2024-07-15 12:53:41 +02:00
dependabot[bot]
c6c240d4ce
build(deps): bump @codemirror/lint from 6.8.0 to 6.8.1 in /web/ui ( #14383 )
...
Bumps [@codemirror/lint](https://github.com/codemirror/lint ) from 6.8.0 to 6.8.1.
- [Changelog](https://github.com/codemirror/lint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/lint/compare/6.8.0...6.8.1 )
---
updated-dependencies:
- dependency-name: "@codemirror/lint"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-15 11:42:41 +02:00
Bryan Boreham
bb241d7960
Merge pull request #14463 from fpetkovski/customize-acceptance-tests
...
Allow built-in tests to be customized
2024-07-15 10:04:41 +01:00
Bryan Boreham
efdd6fcbcb
Merge pull request #14467 from aknuds1/arve/fix-golangcilint-deprecations
...
golangci-lint: Don't use deprecated config params
2024-07-15 10:01:10 +01:00
Bryan Boreham
d84282b105
Labels: use single byte as separator - small speedup
...
Since `seps` is a variable, `seps[0]` has to be bounds-checked every
time. Replacing with a constant everywhere it is used skips this
overhead.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2024-07-15 09:47:16 +01:00
dependabot[bot]
c0f1b452bc
build(deps): bump @codemirror/view from 6.27.0 to 6.28.3 in /web/ui ( #14379 )
...
Bumps [@codemirror/view](https://github.com/codemirror/view ) from 6.27.0 to 6.28.3.
- [Changelog](https://github.com/codemirror/view/blob/main/CHANGELOG.md )
- [Commits](https://github.com/codemirror/view/compare/6.27.0...6.28.3 )
---
updated-dependencies:
- dependency-name: "@codemirror/view"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-15 09:52:55 +02:00
Charles Korn
2ca4d16236
storage: add AtT
method to MemoizedSeriesIterator
...
Signed-off-by: Charles Korn <charles.korn@grafana.com>
2024-07-15 14:09:02 +10:00
B1F030
3648386345
fix fmt
...
Signed-off-by: B1F030 <b1fzhang@gmail.com>
2024-07-15 11:59:58 +08:00
B1F030
15ac95ddd0
change documentcli
...
Signed-off-by: B1F030 <b1fzhang@gmail.com>
2024-07-15 11:33:58 +08:00
B1F030
5c2590c358
revert main.go
...
Signed-off-by: B1F030 <b1fzhang@gmail.com>
2024-07-15 10:54:54 +08:00
Odysseus Zhang
4c74d359eb
Merge branch 'prometheus:main' into patch-1
2024-07-15 10:51:51 +08:00
Arve Knudsen
52a73ec871
Merge pull request #14374 from prometheus/dependabot/npm_and_yarn/web/ui/sass-1.77.6
...
build(deps): bump sass from 1.77.4 to 1.77.6 in /web/ui
2024-07-14 19:32:10 +02:00
Arve Knudsen
9f9f9298fa
Merge pull request #14375 from prometheus/dependabot/npm_and_yarn/web/ui/types/node-20.14.9
...
build(deps-dev): bump @types/node from 20.14.2 to 20.14.9 in /web/ui
2024-07-14 19:31:30 +02:00
Arve Knudsen
5daf584afc
Merge pull request #14385 from prometheus/dependabot/github_actions/github/codeql-action-3.25.11
...
build(deps): bump github/codeql-action from 3.25.8 to 3.25.11
2024-07-14 19:30:15 +02:00
Arve Knudsen
a41a0538c7
Merge pull request #14384 from prometheus/dependabot/go_modules/go-opentelemetry-io-deefcab708
...
build(deps): bump the go-opentelemetry-io group across 1 directory with 2 updates
2024-07-14 19:23:36 +02:00
dependabot[bot]
18a40e31d4
build(deps): bump the go-opentelemetry-io group across 1 directory with 2 updates
...
Bumps the go-opentelemetry-io group with 2 updates in the / directory: [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector ) and [go.opentelemetry.io/collector/semconv](https://github.com/open-telemetry/opentelemetry-collector ).
Updates `go.opentelemetry.io/collector/pdata` from 1.8.0 to 1.11.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.8.0...pdata/v1.11.0 )
Updates `go.opentelemetry.io/collector/semconv` from 0.101.0 to 0.104.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.101.0...v0.104.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
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-14 18:51:09 +02:00
Arve Knudsen
f23792f9e8
Merge pull request #14468 from prometheus/dependabot/npm_and_yarn/web/ui/ts-jest-29.2.2
...
build(deps-dev): bump ts-jest from 29.2.1 to 29.2.2 in /web/ui
2024-07-14 18:39:03 +02:00
Arve Knudsen
3eda19ac04
Merge pull request #14386 from prometheus/dependabot/github_actions/bufbuild/buf-setup-action-1.34.0
...
build(deps): bump bufbuild/buf-setup-action from 1.32.2 to 1.34.0
2024-07-14 18:16:19 +02:00
Arve Knudsen
64bfd2f49a
Merge pull request #14390 from prometheus/dependabot/github_actions/scripts/actions/checkout-4.1.7
...
build(deps): bump actions/checkout from 4.1.6 to 4.1.7 in /scripts
2024-07-14 18:15:51 +02:00
dependabot[bot]
c458cb73a4
build(deps-dev): bump ts-jest from 29.2.1 to 29.2.2 in /web/ui
...
Bumps [ts-jest](https://github.com/kulshekhar/ts-jest ) from 29.2.1 to 29.2.2.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases )
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v29.2.1...v29.2.2 )
---
updated-dependencies:
- dependency-name: ts-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-07-14 16:12:25 +00:00
Arve Knudsen
42293c008a
Merge pull request #14458 from prometheus/dependabot/npm_and_yarn/web/ui/codemirror/autocomplete-6.17.0
...
build(deps): bump @codemirror/autocomplete from 6.16.2 to 6.17.0 in /web/ui
2024-07-14 18:12:14 +02:00
Arve Knudsen
f6e37c5cdb
Merge pull request #14459 from prometheus/dependabot/npm_and_yarn/web/ui/ts-jest-29.2.1
...
build(deps-dev): bump ts-jest from 29.1.4 to 29.2.1 in /web/ui
2024-07-14 18:11:16 +02:00
Arve Knudsen
506729480e
golangci-lint: Don't use deprecated config params
...
Replace deprecated golangci-lint configuration parameters with current
equivalents:
* `run.skip-files` => `issues.exclude-files`
* `run.skip-dirs` => `issues.exclude-dirs`
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2024-07-14 14:10:45 +02:00