RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-01-30 03:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,666 Commits 2 Branches 0 Tags 665 MiB
9bc6d7a7db
Commit Graph

10666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Boreham
9bc6d7a7db Update package scrape tests for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
91254fb187 Update package scrape for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
b3ca791bfd Update package notifier for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
aa634e0b7e Update package promql tests for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
56fefcd812 Update package promql for new labels.Labels type 
We use `labels.Builder` to parse metrics, to avoid depending on the
internal implementation. This is not efficient, but the feature is only
used in tests. It wasn't efficient previously either - calling `Sort()`
after adding each label.

`createLabelsForAbsentFunction` also uses a Builder now, and gets
an extra `map` to replace the previous `Has()` usage.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

Fix up promql to compile with changes to Labels
 2022-12-19 15:22:09 +00:00
Bryan Boreham
d6b97f631a Update package storage for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
4b6a4d1425 Update package tsdb tests for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
ce2cfad0cb Update package tsdb/record for new labels.Labels type 
Implement decoding via labels.ScratchBuilder, which we retain and re-use
to reduce memory allocations.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
543c318ec2 Update package tsdb for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
f0ec81badd Update package tsdb/test for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
14ad2e780b Update package tsdb/agent for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
a5bdff414b Update package tsdb/index tests for new labels.Labels type 
Note in one cases we needed an extra copy of labels in case they change.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
d3d96ec887 tsdb/index: use ScratchBuilder to create Labels 
This necessitates a change to the `tsdb.IndexReader` interface:
`index.Reader` is used from multiple goroutines concurrently, so we
can't have state in it.

We do retain a `ScratchBuilder` in `blockBaseSeriesSet` which is
iterator-like.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
927a14b0e9 Update package tsdb/index for new labels.Labels type 
Incomplete - needs further changes to `Decoder.Series()`.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
623d306f91 Update package config for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
8d350d9e0c Update package model/textparse tests for new labels.Labels type 
We don't want to touch the result labels now we create them differently.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
1f04899ae3 Update package model/textparse for new labels.Labels type 
Parse metrics using labels.ScratchBuilder, so we reduce assumptions about
internals of Labels.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
fe9fe0e1e5 Update package model/relabel tests for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
8ad7b64c0f Update package model/relabel for new labels.Labels type 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
b10fd9aea3 model/labels: add a basic test for ScratchBuilder 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
cbf432d2ac Update package labels tests for new labels.Labels type 
Re-did the FromStrings test to avoid assumptions about how it works.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
617bee60f1 labels: use ScratchBuilder in ReadLabels 
Instead of relying on being able to append to it like a slice.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
2b8b8d9ac7 labels: new methods to work without access to internals 
Without changing the definition of `labels.Labels`, add methods which
enable code using it to work without knowledge of the internals.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
ea7345a09c labels: improve comment on Builder.Set 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
a19b369f9e labels: avoid lint warning on New() 
This code is a bit cleaner.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-19 15:22:09 +00:00
Bryan Boreham
1695a7ee2f promql: refactor BenchmarkRangeQuery so we can re-use test cases 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-15 19:39:46 +00:00
Bryan Boreham
89bf6e1df9 tsdb: Tidy up some test code 
Use simpler utility function to create Labels objects, making fewer
assumptions about the data structure.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-15 19:39:46 +00:00
Bryan Boreham
3543257d93
Merge pull request #11334 from bboreham/tsdb-reuse-iterators 
tsdb: reuse iterators to save garbage [INTERFACE CHANGE]
 2022-12-15 19:37:34 +00:00
Bryan Boreham
0853250695 Review feedback 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-15 18:32:45 +00:00
Bryan Boreham
463f5cafdd storage: re-use iterators to save garbage 
Re-use previous memory if it is already of the correct type.

In `NewListSeries` we hoist the conversion to an interface value out
so it only allocates once.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-15 18:32:45 +00:00
Bryan Boreham
f0866c0774 tsdb: optimise block series iterators 
Re-use previous memory if it is already of the correct type.

Also turn two levels of function closure into a single object that
holds the required data.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-15 18:32:45 +00:00
Bryan Boreham
3c7de69059 storage: allow re-use of iterators 
Patterned after `Chunk.Iterator()`: pass the old iterator in so it
can be re-used to avoid allocating a new object.

(This commit does not do any re-use; it is just changing all the method
signatures so re-use is possible in later commits.)

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-12-15 18:32:45 +00:00
Bryan Boreham
7ce09b4e39 storage: fix BenchmarkMergeSeriesSet 
The SeriesSets to be merged must be created each time round the loop,
otherwise the benchmark is not doing any real work.

Don't call ExpandSeries, because it spends most of its time allocating
a memory buffer to hold the result, which we don't look at.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

Fix up merge test again
 2022-12-15 18:32:45 +00:00
Julien Pivotto
e1d23c5532
Merge pull request #11721 from roidelapluie/macmake 
Makefile: Avoid the use of --transform for tar
 2022-12-15 14:26:47 +01:00
Julien Pivotto
35830bfc19
Merge pull request #11728 from prometheus/release-2.41 
Merge back release 2.41
 2022-12-15 14:26:08 +01:00
Julien Pivotto
1bf03eb315
Merge pull request #11720 from roidelapluie/release-2-41-0-rc-0 
Release v2.41.0-rc.0
 2022-12-15 14:09:00 +01:00
Julien Pivotto
75af6531e4 Release v2.41.0-rc.0 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-15 13:48:51 +01:00
Julien Pivotto
8aae683d43 Update docker dependency 
Dependabots complains about this

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-15 13:47:40 +01:00
Julien Pivotto
4f35683b65
Merge pull request #11727 from prometheus/fix-error-unwrapping 
Correctly handle error unwrapping in rules and remote write receiver
 2022-12-15 13:44:26 +01:00
Julius Volz
1a2c645dfa Correctly handle error unwrapping in rules and remote write receiver 
errors.Unwrap() actually dangerously returns nil if the error does not have an
Unwrap() method, which is the case in at least one of these places where I
noticed that no error was being logged at all when it should have.

Signed-off-by: Julius Volz <julius.volz@gmail.com>
 2022-12-15 12:50:55 +01:00
Julien Pivotto
c3fac587ef
Merge pull request #11723 from alanprot/span-fix 
Finishing evalSpanTimer always before return
 2022-12-14 22:53:10 +01:00
Alan Protasio
8460807475 fix blank lines 
Signed-off-by: Alan Protasio <approtas@amazon.com>
 2022-12-14 13:24:10 -08:00
Alan Protasio
f8f4ac14a8 Finishing evalSpanTimer always before return 
Signed-off-by: Alan Protasio <approtas@amazon.com>
 2022-12-14 13:10:35 -08:00
Julien Pivotto
29707b1569 Makefile: Avoid the use of --transform for tar 
This makes it compatible with macos tar as well

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-14 16:35:13 +01:00
Julien Pivotto
88ee72dea3
Merge pull request #11712 from roidelapluie/update-deps-for-41 
Update go dependencies for 2.41
 2022-12-14 14:22:26 +01:00
Julien Pivotto
9e26adfd20
Add myself as release shepherd (#11693) 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-14 12:05:16 +01:00
Julien Pivotto
c396c3e32f Update go dependencies before 2.41 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-14 11:30:36 +01:00
Julien Pivotto
bd2bcfc166
Merge pull request #11715 from roidelapluie/merge-240 
Merge release 2.40 into main
 2022-12-14 11:27:52 +01:00
Julien Pivotto
475cfe8a6b Merge remote-tracking branch 'origin/release-2.40' 
Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
 2022-12-14 11:22:01 +01:00
Frederic Branczyk
97912cf388
Merge pull request #11713 from roidelapluie/update-kube 
Update kubernetes dependencies
 2022-12-14 11:17:00 +01:00