16324 Commits

Author SHA1 Message Date
Harsh
24282f7b44 test(discovery/xds): speed up tests with t.Parallel()
Signed-off-by: Harsh <harshmastic@gmail.com>
2025-10-12 15:27:33 +05:30
Harsh
3a7a8d7547 promql: Enhance TestNHCBAndCTZeroIngestion to validate exemplar parsing with created timestamps
Signed-off-by: Harsh <harshmastic@gmail.com>
2025-10-11 17:27:47 +05:30
harsh kumar
2b2cbec8cd
Merge branch 'prometheus:main' into fix-17224-remove-nhcb-check 2025-10-11 17:13:22 +05:30
beorn7
6a8cacdf6f model/histogram: Fix checkHistogramCustomBounds to accept -Inf
Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-10 23:10:32 +02:00
Bryan Boreham
1c58399160
PromQL: Speed up parsing of variadic functions (#17316)
* PromQL: Add benchmark case with variadic function

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

* PromQL: Speed up parsing of variadic functions

Defer formatting of an error message until we hit an error.

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

---------

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2025-10-10 09:16:33 +01:00
George Krajcsovits
8558b722f2
Merge pull request #17312 from prometheus/beorn7/histogram
promql(histograms): Fix counter reset hint handling when aggregating
2025-10-10 07:25:01 +02:00
beorn7
51e0982c91 promql(histograms): Fix counter reset hint handling when aggregating
Fixes #17308.

As explained adding the warn-annotation about conflicting counter
reset hints doesn't happen consistently. Furthermore, because of
incremental mean calculation being used so far (which includes
subtraction), avg calculation always created gauge histograms.

The fix is to make Sub behave like Add WRT counter reset handling, and
then set the result of a subtraction to gauge explicitly in actual
PromQL subtraction (rather than using Sub for something else, like
incremental mean calculation). Also, track the presence of a
CounterReset hint and a NotCounterReset hint separately for the
entirety of aggregated histograms and create the warn-annotation based
on that.

As a minor fix, this commit also consistently creates the warn
annotation in aggregation to be about "aggregation" rather than
"subtraction" or "addition", because the latter are just internal
operations within the aggregation, which is not of interest for the
user.

Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-09 19:40:00 +02:00
Sahil Rasaikar
8a3ec78ae8 fix: reorder AlertState constants to start with StateUnknown, reorder String method to match constant order.
Signed-off-by: Sahil Rasaikar <sahil.rasaikar@gmail.com>
2025-10-08 22:56:35 +05:30
Ayoub Mrini
9e4d23ddaf
Merge pull request #17306 from AliNazariii/targets-rlock
Optimize scrape target by using RLock in read methods
2025-10-08 15:31:21 +02:00
George Krajcsovits
36678c0551
Merge pull request #17274 from prometheus/krajo/prepare-release-3.7
prepare release 3.7-rc.0
v0.307.0-rc.0 v3.7.0-rc.0
2025-10-08 12:15:46 +02:00
György Krajcsovits
736ad1f54f
prepare release 3.7
Bump versions and changelog.

Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>
Co-authored-by: Ayoub Mrini <ayoubmrini424@gmail.com>

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2025-10-08 12:03:27 +02:00
György Krajcsovits
c4b63ab0ae
chore(changelog): fix changelog
16737 was in 3.6.
16923 lacked number and a bit underdefined.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2025-10-08 12:03:25 +02:00
Ali Nazari
f64ee61312 Use rlock in read methods of scrape target
Signed-off-by: Ali Nazari <ali4nazari4@gmail.com>
2025-10-08 09:06:09 +03:30
Harsh
febd734137 test: Add TestNHCBAndCTZeroIngestion to verify simultaneous feature usage
Signed-off-by: Harsh <harshmastic@gmail.com>
2025-10-08 09:07:24 +05:30
Harsh
c6793e717a Remove obsolete check
Signed-off-by: Harsh <harshmastic@gmail.com>
2025-10-08 08:41:43 +05:30
Björn Rabenstein
1caac94026
Merge pull request #17302 from prometheus/release-3.7
Merge release-3.7 back into main.
2025-10-07 18:40:08 +02:00
Björn Rabenstein
dc5108abb5
Merge pull request #17300 from prometheus/beorn7/testing
tsdb: Disable more tests on MS Windows
2025-10-07 17:38:56 +02:00
beorn7
e2aed2cd27 tsdb: Disable more tests on MS Windows
Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-07 16:34:59 +02:00
Björn Rabenstein
705b8a3f88
Merge pull request #17299 from prometheus/beorn7/histogram
Update prometheus/common to 0.67.1
2025-10-07 16:30:32 +02:00
Björn Rabenstein
68e4d4e5eb
Merge pull request #17298 from prometheus/release-3.7
Merging back release-3.7 branch into master
2025-10-07 16:23:36 +02:00
beorn7
df068cff5d Update prometheus/common to 0.67.1
This should enable NHCB federation with text format.

Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-07 15:57:54 +02:00
Björn Rabenstein
f2fc492473
Merge pull request #17284 from linasm/custom-bucket-bounds-match-fn
NHCB: Separate CustomBucketBoundsMatch from FloatBucketsMatch
2025-10-07 15:38:59 +02:00
Björn Rabenstein
3c9605263e
Merge pull request #17296 from prometheus/beorn7/histogram
tsdb: Do not track stFloat in typesInBatch explicitly
2025-10-07 15:24:57 +02:00
Björn Rabenstein
cf0ba36db0
Merge pull request #17295 from prometheus/beorn7/cleanup
tsdb: Remove leftover debug fmt.Println
2025-10-07 15:22:53 +02:00
beorn7
51c8e55835 tsdb: Do not track stFloat in typesInBatch explicitly
Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-07 15:01:22 +02:00
beorn7
5f582a7e1f tsdb: Remove leftover debug fmt.Println
Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-07 14:58:25 +02:00
Bartlomiej Plotka
a4da440dad
fix: Fix slicelabels corruption when used with proto decoding (#17150)
* fix: Fix slicelabels corruption when used with proto decoding

Alternative to https://github.com/prometheus/prometheus/pull/16957/

Signed-off-by: bwplotka <bwplotka@gmail.com>

* addressed comments

Signed-off-by: bwplotka <bwplotka@gmail.com>

---------

Signed-off-by: bwplotka <bwplotka@gmail.com>
2025-10-07 12:06:48 +01:00
George Krajcsovits
077abc5cca
Merge pull request #17291 from prometheus/krajo/pick-pr-17290
perf(tsdb): reuse map of sample types to speed up head appender
2025-10-07 09:30:33 +02:00
György Krajcsovits
d11ee103ac
perf(tsdb): reuse map of sample types to speed up head appender
While investigating +10% CPU in v3.7 release, found that ~5% is from
expanding the types map. Try reuse.

Also fix a linter error.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2025-10-07 08:31:20 +02:00
George Krajcsovits
fe4e684e0d
Merge pull request #17290 from prometheus/krajo/optimize-appender-typemap
perf(tsdb): reuse map of sample types to speed up head appender
2025-10-07 08:29:29 +02:00
György Krajcsovits
c26a5390aa
perf(tsdb): reuse map of sample types to speed up head appender
While investigating +10% CPU in v3.7 release, found that ~5% is from
expanding the types map. Try reuse.

Also fix a linter error.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2025-10-06 21:44:34 +02:00
George Krajcsovits
fe11cae637
Merge pull request #17287 from linasm/reject-nan-histogram-custom-bounds
NHCB: Reject custom bucket bounds with NaN value
2025-10-06 18:11:03 +02:00
Linas Medziunas
c16db58061 NHCB: Reject custom bucket bounds with NaN value
Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com>
2025-10-06 16:37:28 +03:00
Minh Nguyen
50d1dc2577
Improve prompb/readme.md (#17037)
* Improve propb/readme.md

Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>

* commit

Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>

---------

Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>
2025-10-06 12:55:08 +01:00
Minh Nguyen
106e6f2c77
[RW2] Return 400 for Exemplars without Series or Histograms not written (#17250)
* fix

Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>

* fix cmt

Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>

---------

Signed-off-by: pipiland2612 <nguyen.t.dang.minh@gmail.com>
2025-10-06 12:53:44 +01:00
Linas Medziunas
8caf1f1c41 [NHCB] Separate CustomBucketBoundsMatch from floatBucketsMatch
Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com>
2025-10-05 22:38:07 +03:00
Sahil Rasaikar
96425ea984 fix: linting errors
Signed-off-by: Sahil Rasaikar <sahil.rasaikar@gmail.com>
2025-10-05 17:15:32 +05:30
Sahil Rasaikar
cc1e6e40f0 fix: Updates unknown state to -1,adds fix for failing test case
Signed-off-by: Sahil Rasaikar <sahil.rasaikar@gmail.com>
2025-10-05 17:15:32 +05:30
Sahil Rasaikar
516afbea67 Init Commit: fix for issue #4510
Signed-off-by: Sahil Rasaikar <sahil.rasaikar@gmail.com>
2025-10-05 17:15:32 +05:30
George Krajcsovits
f4b8840f51
Merge pull request #17271 from prometheus/krajo/fix-changelog
chore(changelog): fix changelog
2025-10-02 12:38:54 +02:00
Bryan Boreham
968d722bb2
Merge pull request #17212 from bboreham/no-simplify
[PERF] Regex: stop calling Simplify
2025-10-02 10:51:04 +01:00
György Krajcsovits
dc0013381c
chore(changelog): fix changelog
16737 was in 3.6.
16923 lacked number and a bit underdefined.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2025-10-02 09:49:25 +02:00
Björn Rabenstein
12c0961fd4
Merge pull request #17248 from prometheus/beorn7/histogram
model/histogram: Validate non-negative count and zero bucket
2025-10-01 18:05:14 +02:00
Björn Rabenstein
1b0f2b3017
Merge pull request #17249 from prometheus/beorn7/doc
docs: Clarify the handling of negative histograms
2025-10-01 16:58:28 +02:00
beorn7
e94031abd2 docs: Clarify the handling of negative histograms
Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-01 16:42:20 +02:00
beorn7
3d7cf4c274 model/histogram: Validate non-negative count and zero bucket
We have always validated that none of the bucket is negative. We
should do the same for the count of observations and the zero bucket.

Note that this was always implied in the protobuf exposition format
because a count or a zero bucket population is ignored if it is not
positive.

Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-01 16:40:41 +02:00
Marvin Rösch
e5dd0315a8
mixin: add uid to remote write dashboard
Signed-off-by: Marvin Rösch <marvinroesch99@gmail.com>
2025-10-01 14:39:26 +02:00
George Krajcsovits
5c897e3801
Merge pull request #17244 from prometheus/krajo/update-npm-deps
chore(deps): update npm dependencies before release
2025-10-01 11:31:08 +02:00
György Krajcsovits
63fb211946
chore(deps): update npm dependencies before release
make update-npm-deps

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2025-10-01 10:58:29 +02:00
George Krajcsovits
58a42623d8
Merge pull request #17253 from prometheus/krajo/merge-release-306-to-main
merge release 306 to main
2025-10-01 10:54:09 +02:00