mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-21 03:16:00 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
11895 commits 278 branches 454 tags 666 MiB
Commit graph

969 commits

Author SHA1 Message Date
Oleg Zaytsev 002ae0aa1d
Merge pull request #522 from grafana/cherry-pick-61daa30bb1251c391307f3c90943fda616090de7 
Pass ref to SeriesLifecycleCallback.PostDeletion (#12626)
 2023-08-04 11:40:06 +02:00
Oleg Zaytsev 74ed44a1c6 Pass ref to SeriesLifecycleCallback.PostDeletion (#12626) 
When a particular SeriesLifecycleCallback tries to optimize and run
closer to the Head, keeping track of the HeadSeriesRef instead of the
labelsets, it's impossible to handle the PostDeletion callback properly
as there's no way to know which series refs were deleted from the head.

This changes the callback to provide the series refs alongside the
labelsets, so the implementation can choose what to do.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
 2023-08-04 10:04:59 +02:00
Oleg Zaytsev a54cb4744d Merge branch 'main' into prometheus-2023-07-31-76dd9b547 2023-08-04 09:46:03 +02:00
Bryan Boreham 4ced6d5f40 compactor: avoid memory blow-up with stringlabels 
When compiled with `-tags stringlabels`, the names and values point into
a larger block of memory containing all labels. Garbage-collection
considers the entire block "live" if you point to a part of it, so the
map ends up retaining all labels for (nearly) all series.

Cloning the string value avoids this problem, and we check first if the
value is already in the map. Since the clone is more expensive, only do
it when built with `-tags stringlabels`.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-07-29 10:20:25 +01:00
Robert Fratto 886945cda7
tsdb/agent: ensure that new series get written to WAL on rollback (#12592) 
If a new series is introduced in a storage.Appender instance, that
series should be written to the WAL once the storage.Appender is closed,
even on Rollback.

Previously, new series would only be written to the WAL when calling
Commit. However, because the series is stored in memory regardless,
subsequent calls to Commit may write samples to the WAL which reference
a series ID which that was never written.

Related to #11589. It's likely that this fix also resolves this issue,
but we need more testing from users to see if the problem persists after
this fix; there may be more cases where samples get written to the WAL
in Prometheus Agent mode without the corresponding series record.

Signed-off-by: Robert Fratto <robertfratto@gmail.com>
 2023-07-27 09:28:26 -04:00
Peter Štibraný c8f5ad1492
Optimize labelValuesWithMatchers to fetch label values from selected series (#518) 
* Optimize labelValues when matchers select small number of series.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Address review feedback.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Add missing p.Err()

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Reuse existing slice with all label values.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Simplify check for expanded postings.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

* Fix comment.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>

---------

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
 2023-07-27 11:44:29 +02:00
George Krajcsovits 6cd2d1621f
Hide histogram chunk append and reset header internals (#12352) 
tsdb: Hide histogram chunk append and reset header internals

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: George Krajcsovits <krajorama@users.noreply.github.com>
 2023-07-26 15:08:16 +02:00
Björn Rabenstein 0e12f11d61
Merge pull request #12583 from prometheus/release-2.46 
Merge release-2.46 into main
 2023-07-20 18:29:44 +02:00
György Krajcsovits d4e355243a tsdbutil/ChunkFromSamplesGeneric should not panic 
Add error handling instead.
Prepares for #12352

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
 2023-07-20 17:01:34 +02:00
Julien Pivotto 7905594b52
Merge pull request #12557 from prometheus/beorn7/histogram 
scrape: Enable ingestion of multiple exemplars per sample
 2023-07-20 15:19:28 +02:00
Jeanette Tan 8035c04624 Merge remote-tracking branch 'upstream/main' 
Minor conflicts:
rules/manager.go
tsdb/compact.go
tsdb/db.go
go.mod
 2023-07-19 21:40:27 +08:00
Julien Pivotto 1f5934e7be
Merge pull request #10623 from songjiayang/update-index 
make sure response error when TOC parse failed
 2023-07-18 13:47:27 +02:00
cui fliter 096ceca44f
remove repetitive words (#12556) 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-07-13 15:53:40 +02:00
beorn7 0e3f35324b scrape: Enable ingestion of multiple exemplars per sample 
This has become a requirement for native histograms, as a single
histogram sample commonly has many buckets, so that providing many
exemplars makes sense.

Since OM text doesn't support native histograms yet, the test had to
be expanded to also support protobuf test cases.

Signed-off-by: beorn7 <beorn@grafana.com>
 2023-07-13 14:16:10 +02:00
Julien Pivotto 89e213bc02
Merge pull request #12546 from roidelapluie/removeimport 
TSDB: Remove usused import of sort
 2023-07-11 15:06:48 +02:00
Justin Lei 32d87282ad
Add Zstandard compression option for wlog (#11666) 
Snappy remains as the default compression but there is now a flag to switch 
the compression algorithm.

Signed-off-by: Justin Lei <justin.lei@grafana.com>
 2023-07-11 14:57:57 +02:00
Julien Pivotto bf5bf1a4b3 TSDB: Remove usused import of sort 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2023-07-11 14:29:31 +02:00
Julien Pivotto 8c8afec116
Merge pull request #12542 from merrickclay/tsdb-doc-comment 
improve incorrect doc comment
 2023-07-11 13:10:04 +02:00
Julien Pivotto 0f85e4f41d
Merge pull request #12539 from bboreham/slices-sorts 
Replace sort.Slice with faster slices.SortFunc
 2023-07-11 13:09:02 +02:00
Merrick Clay 70e41fc5ac improve incorrect doc comment 
Signed-off-by: Merrick Clay <merrick.e.clay@gmail.com>
 2023-07-10 16:52:00 -06:00
Bryan Boreham ce153e3fff Replace sort.Sort with faster slices.SortFunc 
The generic version is more efficient.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-07-10 09:43:45 +00:00
Charles Korn f3697f5242
Merge pull request #513 from grafana/charleskorn/expose-chunk-count 
Add `ChunkCount()` method to `ChunkSeries`
 2023-07-07 09:42:45 +10:00
Marco Pracucci 7ad111b27e
Merge remote-tracking branch 'remotes/prometheus/main' into update-upstream 2023-07-06 15:13:54 +02:00
Charles Korn a0634e7408
Rename EstimatedChunkCount to ChunkCount 2023-07-06 15:42:44 +10:00
Charles Korn a9445622ad
Permit returning an error from EstimatedChunkCount() 2023-07-06 15:41:05 +10:00
Marc Tudurí 4851ced266
tsdb: Support native histograms in snapshot on shutdown (#12258) 
Signed-off-by: Marc Tuduri <marctc@protonmail.com>
 2023-07-05 11:44:13 +02:00
Charles Korn 8b84856ba5
Add EstimatedChunkCount() method to ChunkSeries 
Signed-off-by: Charles Korn <charles.korn@grafana.com>
 2023-07-05 15:34:07 +10:00
Bryan Boreham 013fdb9460 Update goleak for change in glog 
Evidently the internal type changed.
 2023-07-04 15:01:02 +00:00
Marco Pracucci 34e7d9d997 Fix race condition in ChunkDiskMapper.Truncate() (#12500) 
* Fix race condition in ChunkDiskMapper.Truncate()

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added unit test

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Update tsdb/chunks/head_chunks.go

Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>

---------

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2023-07-04 15:01:02 +00:00
Justin Lei 92668d9bf7 Also pass chunkOpts into appendPreprocessor 
Signed-off-by: Justin Lei <justin.lei@grafana.com>
 2023-07-04 15:01:01 +00:00
Justin Lei 7622d5ac5f Group args to append to memSeries in chunkOpts 
Signed-off-by: Justin Lei <justin.lei@grafana.com>
 2023-07-04 15:01:01 +00:00
Nidhey Nitin Indurkar e970f70ced Feat: Get block by id directly on promtool analyze & get latest block if ID not provided (#12031) 
* feat: analyze latest block or block by ID in CLI (promtool)

Signed-off-by: nidhey27 <nidhey.indurkar@infracloud.io>

* address remarks

Signed-off-by: nidhey60@gmail.com <nidhey.indurkar@infracloud.io>

* address latest review comments

Signed-off-by: nidhey60@gmail.com <nidhey.indurkar@infracloud.io>

---------

Signed-off-by: nidhey27 <nidhey.indurkar@infracloud.io>
Signed-off-by: nidhey60@gmail.com <nidhey.indurkar@infracloud.io>
 2023-07-04 13:39:01 +00:00
Alan Protasio e18ee99544 Opmizing Group Regex (#12375) 
Signed-off-by: Alan Protasio <alanprot@gmail.com>
 2023-07-04 13:39:01 +00:00
Matthieu MOREL 584966f1c4 ci(lint): enable predeclared linter 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2023-07-04 13:38:31 +00:00
Justin Lei d0fea47a9c Remove samplesPerChunk from memSeries (#12390) 
Signed-off-by: Justin Lei <justin.lei@grafana.com>
 2023-07-04 13:38:31 +00:00
Julien Pivotto 9ff1f24efa
Merge pull request #12505 from pracucci/fix-infinite-loop-in-index-writer 
Fix infinite loop in index Writer when a series contains duplicated label names
 2023-07-04 13:08:36 +02:00
Patrick Oyarzun 68e5937474
Apply relevant label matchers in LabelValues before fetching extra postings (#12274) 
* Apply matchers when fetching label values

Signed-off-by: Patrick Oyarzun <patrick.oyarzun@grafana.com>

* Avoid extra copying of label values

Signed-off-by: Patrick Oyarzun <patrick.oyarzun@grafana.com>

---------

Signed-off-by: Patrick Oyarzun <patrick.oyarzun@grafana.com>
 2023-07-04 10:37:58 +01:00
Bryan Boreham 5255bf06ad Replace sort.Slice with faster slices.SortFunc 
The generic version is more efficient.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2023-07-02 22:17:08 +00:00
Marco Pracucci 35069910f5
Fix infinite loop in index Writer when a series contains duplicated label names 
Signed-off-by: Marco Pracucci <marco@pracucci.com>
 2023-07-01 17:38:08 +02:00
Marco Pracucci 031d22df9e
Fix race condition in ChunkDiskMapper.Truncate() (#12500) 
* Fix race condition in ChunkDiskMapper.Truncate()

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Added unit test

Signed-off-by: Marco Pracucci <marco@pracucci.com>

* Update tsdb/chunks/head_chunks.go

Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>

---------

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Co-authored-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2023-06-30 18:29:59 +05:30
Bartlomiej Plotka 4062f12573
Merge pull request #12396 from leizor/leizor/chunk-opts 
Group args to append to memSeries in chunkOpts
 2023-06-27 13:08:21 +02:00
Nidhey Nitin Indurkar a8772a4178
Feat: Get block by id directly on promtool analyze & get latest block if ID not provided (#12031) 
* feat: analyze latest block or block by ID in CLI (promtool)

Signed-off-by: nidhey27 <nidhey.indurkar@infracloud.io>

* address remarks

Signed-off-by: nidhey60@gmail.com <nidhey.indurkar@infracloud.io>

* address latest review comments

Signed-off-by: nidhey60@gmail.com <nidhey.indurkar@infracloud.io>

---------

Signed-off-by: nidhey27 <nidhey.indurkar@infracloud.io>
Signed-off-by: nidhey60@gmail.com <nidhey.indurkar@infracloud.io>
 2023-06-01 17:13:09 +05:30
Alan Protasio 73078bf738
Opmizing Group Regex (#12375) 
Signed-off-by: Alan Protasio <alanprot@gmail.com>
 2023-05-30 13:49:22 +02:00
Julien Pivotto 6f97641a51
Merge pull request #12380 from mmorel-35/patch-2 
ci(lint): enable predeclared linter
 2023-05-28 14:43:29 +02:00
Justin Lei e73d8b2084 Also pass chunkOpts into appendPreprocessor 
Signed-off-by: Justin Lei <justin.lei@grafana.com>
 2023-05-25 13:37:18 -07:00
Justin Lei 4c4454e4c9 Group args to append to memSeries in chunkOpts 
Signed-off-by: Justin Lei <justin.lei@grafana.com>
 2023-05-25 13:12:46 -07:00
Justin Lei 89af351730
Remove samplesPerChunk from memSeries (#12390) 
Signed-off-by: Justin Lei <justin.lei@grafana.com>
 2023-05-25 11:18:41 +02:00
Jeanette Tan dd172440e5 Merge remote-tracking branch 'mine/fix-default-samples-per-chunk' into zenador/sync-upstream-22-may-2023 2023-05-24 19:32:04 +08:00
zenador 37e5249e33
Use DefaultSamplesPerChunk in tsdb (#12387) 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-05-24 13:00:21 +02:00
Jeanette Tan 02e113d03f Use DefaultSamplesPerChunk in tsdb 
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
 2023-05-24 16:44:53 +08:00