13458 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Björn Rabenstein	0a00d21cff	Merge pull request #14673 from machine424/docdoccc ... docs(configuration.md): clarify the explanations about some temp labe…	2024-08-22 12:31:46 +02:00
Arve Knudsen	a36d1a8a92	Merge pull request #14707 from aknuds1/arve/upgradegolangci-lint ... Upgrade golangci-lint to v1.60.2	2024-08-22 10:58:42 +02:00
Arve Knudsen	fbcd50f32c	Upgrade golangci-lint to v1.60.2 ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-08-21 18:57:17 +02:00
Arve Knudsen	7cfe0b1567	Merge pull request #14706 from aknuds1/arve/otlp-invalid-histograms ... OTLP receiver: Warn when encountering invalid exponential histograms	2024-08-21 18:07:45 +02:00
Arve Knudsen	b50c5d42fe	OTLP receiver: Warn when encountering invalid exponential histograms ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-08-21 16:43:16 +02:00
Bryan Boreham	9a74d53935	[BUGFIX] TSDB: Fix query overlapping in-order and ooo head (#14693) ... * tsdb: Unit test query overlapping in order and ooo head Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> * TSDB: Merge overlapping head chunk The basic idea is that getOOOSeriesChunks can populate Meta.Chunk, but since it only returns one Meta per overlapping time-slot, that pointer may end up in a Meta with a head-chunk ID. So we need HeadAndOOOChunkReader.ChunkOrIterable() to call mergedChunks in that case. Previously, mergedChunks was checking that meta.Ref was a valid OOO chunk reference, but it never actually uses that reference; it just finds all chunks overlapping in time. So we can delete that code. Signed-off-by: Bryan Boreham <bjboreham@gmail.com> Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-08-21 14:24:20 +01:00
Björn Rabenstein	7fad1ec8ee	Merge pull request #14655 from suntala/suntala/sort-by-label-enhancement ... promql: Fall back to full label sets when sorting by label	2024-08-21 12:28:55 +02:00
suntala	8e82ac8d2b	Add comments to the sort by label functions ... Signed-off-by: suntala <arati.rana@grafana.com>	2024-08-20 20:41:55 +02:00
Ben Kochie	1435c8ae4a	Include test CA text info (#14699) ... Use `openssl x509 -text -in <file>` to include the text version of the certificate in order to make it easier to see the diff when applying changes to the cert. Signed-off-by: SuperQ <superq@gmail.com>	2024-08-20 19:41:02 +02:00
Julien	f9f39a4411	Extend testing CA certificates (#14696) ... Signed-off-by: Julien <roidelapluie@o11y.eu>	2024-08-20 17:09:07 +02:00
machine424	88cac6fb49	docs(configuration.md): clarify the explanations about some temp labels and format for better visibility. ... Signed-off-by: machine424 <ayoubmrini424@gmail.com>	2024-08-20 15:44:39 +02:00
Julien	481d718539	Merge pull request #14661 from prymitive/TestHangingNotifier ... tests: increase TestHangingNotifier timeout	2024-08-20 14:37:16 +02:00
Julien	82c4599ebe	Merge pull request #14690 from harshitasao/fix-vulnerability ... fix: fixed the vulnerability	2024-08-20 13:06:51 +02:00
Arve Knudsen	b914a9b580	Merge pull request #14691 from aknuds1/arve/upgrade-golangci-lint ... Upgrade golangci-lint to v1.60.1	2024-08-19 13:51:29 +02:00
Arve Knudsen	250aa5031d	Remove empty line ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-08-19 10:50:27 +02:00
Arve Knudsen	ee47150646	Update web/web.go ... Co-authored-by: Julien <291750+roidelapluie@users.noreply.github.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-08-19 10:43:17 +02:00
Arve Knudsen	4023c2405a	Update web/web.go ... Co-authored-by: Julien <291750+roidelapluie@users.noreply.github.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-08-19 10:43:05 +02:00
Arve Knudsen	3a78e76282	Upgrade golangci-lint to v1.60.1 ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-08-18 12:13:25 +02:00
harshitasao	3b0a386c62	fix: fixed the vulnerability ... Signed-off-by: harshitasao <harshitasao@gmail.com>	2024-08-18 13:15:28 +05:30
Ganesh Vernekar	e86e4ed87f	Merge pull request #14490 from ywwg/owilliams/utf8-02-upstream ... feat(utf8): utf-8 content negotiation and flags	2024-08-16 17:23:42 -04:00
Owen Williams	9e7308de38	feat(utf8): utf8 content negotation and flags ... Signed-off-by: Owen Williams <owen.williams@grafana.com>	2024-08-16 16:41:27 -04:00
Bryan Boreham	87dccb1d1b	Merge pull request #14649 from machine424/ftest ... fix(tsdb/db_test.go): close the corrupted chunk after creating it to satisfy Windows FS	2024-08-16 11:57:54 +01:00
Arve Knudsen	66388f706a	Merge pull request #14042 from aknuds1/arve/wlog-histograms ... tsdb/wlog: Only treat unknown record types as failure	2024-08-16 12:00:49 +02:00
Björn Rabenstein	1daf7cdd62	Merge pull request #14626 from cuiweiyuan/main ... chore: fix some function names	2024-08-15 11:46:21 +02:00
cuiweiyuan	1800af54f0	chore: fix some function names ... Signed-off-by: cuiweiyuan <cuiweiyuan@aliyun.com>	2024-08-15 13:57:21 +08:00
Arve Knudsen	b5d13a1ab5	Merge remote-tracking branch 'prometheus/main' into arve/wlog-histograms ... Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>	2024-08-14 19:04:53 +01:00
Bryan Boreham	d1ea6eb35d	Merge pull request #14354 from bboreham/ooo-head-together ... [PERF] TSDB: Query head and ooo-head together The current implementation of out-of-order querying runs two queriers which each iterate all series in the head, then runs a merge operation on the output. This PR adds HeadAndOOOQuerier which iterates just once over series, then where necessary merges chunks from in-order and out-of-order lists. In order to distinguish in-order from out-of-order chunk references I set bit 23 (i.e. 1<<23) on ooo references; this reduces the maximum number of chunks from 16 million to 8 million. Note one side-effect of this change is that results may come in a different order - the merge operation done previously required a sort of all series. This only changes where Prometheus does not guarantee the order. Fixes #11628	2024-08-14 14:39:30 +01:00
Bryan Boreham	512c67ec26	TSDB: Never go over maximum number of OOO chunks ... In `mmapCurrentOOOHeadChunk`, check if the number is at the maximum and drop the data with an error log. This is not expected to happen as the maximum is over 8 million; that's 8 years of 1 sample every second. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:59 +01:00
Bryan Boreham	9135da1e4f	TSDB: Review feedback ... Signed-off-by: Bryan Boreham <bjboreham@gmail.com> * Re-enable check in `createHeadWithOOOSamples` which wasn't really broken. * Move code making `Block` into a `Queryable` into test file. * Make `getSeriesChunks` return a slice (renamed `appendSeriesChunks`). * Rename `oooMergedChunks` to `mergedChunks`. * Improve comment on `ChunkOrIterableWithCopy`. * Name return values from unpackHeadChunkRef. Co-authored-by: Oleg Zaytsev <mail@olegzaytsev.com> Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:44 +01:00
Bryan Boreham	7ffd3ca280	TSDB: Cosmetic: move HeadAndOOO implementations where old code was ... This makes the diffs easier to follow. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:13 +01:00
Bryan Boreham	e95607b276	TSDB: Lock round access to labels, where necessary ... Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:13 +01:00
Bryan Boreham	26b3de0438	TSDB: Remove OOOHeadIndexReader ... Use headIndexReader instead. OOOCompactionHeadIndexReader needs to be expanded slightly, because it previously delegated to OOOHeadIndexReader. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:13 +01:00
Bryan Boreham	a299c7b6d6	TSDB: Remove OOOHeadChunkReader ... Use HeadAndOOOChunkReader instead. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:13 +01:00
Bryan Boreham	e7e50a3afd	TSDB: Remove code for querying OOO-head only ... Just query via `HeadAndOOOQuerier`, which will skip series where no in-order chunks are in range. Now we don't need `OOORangeHead`. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:13 +01:00
Bryan Boreham	0a2ff76881	TSDB tests: Fix up BenchmarkQueries ... Was not working even on main. Some cases still error. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 13:41:04 +01:00
Björn Rabenstein	9849418fac	Merge pull request #14611 from charleskorn/sum-and-avg-over-mixed-custom-exponential-histograms ... promql: fix incorrect results and panics in `sum` and `avg` over mixed custom and exponential buckets, or incompatible custom buckets	2024-08-14 13:56:47 +02:00
suntala	ce4eac859a	Link to specific feature flag entry ... Signed-off-by: suntala <arati.rana@grafana.com>	2024-08-14 13:22:12 +02:00
Bryan Boreham	f261597944	TSDB: Fix up LabelValues to work for OOO-only head ... Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	6529d6336c	TSDB: NewHeadAndOOOChunkReader takes headChunkReader ... So we can pass nil and have it read just OOO chunks. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	e04d137649	[PERF] TSDB: Query head and ooo-head together ... Add `HeadAndOOOQuerier` which iterates just once over series, then where necessary merges chunks from in-order and out-of-order lists. Add a ChunkQuerier for in-order and ooo together Add copy-last-chunk behaviour to HeadAndOOOChunkReader Out-of-order chunk IDs are distinguished from in-order by setting bit 23. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	2936ab80d7	[Tests] Promtool: Sort output where Prometheus does not guarantee the order. ... Previously this was working because iout-of-order chunks forced a sort and merge. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	da31da3ea6	Refactor: extract selectSeriesSet and selectChunkSeriesSet ... Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	7e24844d08	Refactor: extract headChunkReader.chunkFromSeries() ... For when you have a series locked already. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	a32aca0cd7	Refactoring: extract getOOOSeriesChunks ... Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	c75c8f8329	Refactoring: extract getSeriesChunks ... Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
Bryan Boreham	0c852680bf	[Benchmark] TSDB: Add BenchmarkQuerierSelectWithOutOfOrder ... Refactor existing BenchmarkQuerierSelect to provide the set-up. Note that Head queries now run faster because they use a RangeHead. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>	2024-08-14 11:19:02 +01:00
George Krajcsovits	ff0a1e5e11	Merge pull request #14671 from krajorama/prep-ooo-native-histograms ... tsdb: prepare inserting native histograms into OOO head	2024-08-14 12:02:37 +02:00
György Krajcsovits	41656162fc	tsdb: prepare inserting native histograms into OOO head ... Rename a variable. Add parameters to memSeries.insert function. No effect on how float samples are handled. Related to #14546 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>	2024-08-14 11:13:47 +02:00
Charles Korn	52818a97e2	Merge branch 'main' into sum-and-avg-over-mixed-custom-exponential-histograms ... # Conflicts: # promql/promqltest/testdata/native_histograms.test	2024-08-14 07:52:08 +10:00
Björn Rabenstein	c2bc6cfe97	Merge pull request #14621 from charleskorn/panic-message ... promql: clarify error message logged when panic occurs during query evaluation	2024-08-13 23:02:43 +02:00