16481 Commits

Author SHA1 Message Date
György Krajcsovits
ea398c15e8
Merge branch 'release-3.7' into krajo/merge-release-3071-to-main 2025-10-17 10:45:55 +02:00
George Krajcsovits
0aeb4fddc9
Merge pull request #17346 from prometheus/krajo/prepare-release-3.7.1
prepare bugfix release 3.7.1
v3.7.1 v0.307.1
2025-10-17 08:20:21 +02:00
George Krajcsovits
2617f30775
Merge pull request #17344 from aknuds1/arve/add-otlptranslator-params
OTLP: re-enable label name underscore sanitization and keeping of multiple underscores
2025-10-17 08:19:44 +02:00
György Krajcsovits
7477dabcdf
prepare bugfix release 3.7.1
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
2025-10-16 17:29:09 +02:00
Arve Knudsen
99d0967133 Fix lint failure
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2025-10-16 16:56:18 +02:00
Arve Knudsen
f5804e7cf2 Remove configuration parameters
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2025-10-16 16:37:24 +02:00
Arve Knudsen
3de3a296dd Add reviewer feedback
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2025-10-16 16:13:08 +02:00
Arve Knudsen
dd3a607d2d Add configuration parameters
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2025-10-16 16:13:08 +02:00
Arve Knudsen
7cf4b5da55 OTLP: Upgrade prometheus/otlptranslator
The upgrade to prometheus/otlptranslator@7f02967de0 fixes two label
name translation bugs, when in legacy name translation mode:
* 'key' is no longer prefixed when label names start with an underscore
* Multiple consecutive underscores are combined into one

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2025-10-16 16:13:08 +02:00
harsh kumar
16a9a827de
remote-write: Add type and unit labels to 2.0 receiver when feature flag enabled (#17329)
* feat(remote): add support for type and unit labels in write handler

Signed-off-by: Harsh <harshmastic@gmail.com>

* minor fixes

Signed-off-by: Harsh <harshmastic@gmail.com>

* fix failing tests

Signed-off-by: Harsh <harshmastic@gmail.com>

* Update storage/remote/write_handler.go

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>

* Update storage/remote/write_handler.go

Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>

* refactor: streamline label handling for type and unit in write handler tests

Signed-off-by: Harsh <harshmastic@gmail.com>

* test: enhance V2 message tests for type and unit labels

Signed-off-by: Harsh <harshmastic@gmail.com>

---------

Signed-off-by: Harsh <harshmastic@gmail.com>
Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>
Co-authored-by: Bartlomiej Plotka <bwplotka@gmail.com>
2025-10-15 18:19:41 +01:00
Augustin Husson
e67218a39e
feat(ui): Support anchored and smoothed keyword in promql editor (#17239)
* feat(ui): Support anchored and smoothed keyword in promql editor

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>

* change parser logic about smoothed/anchored expression

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>

---------

Signed-off-by: Augustin Husson <husson.augustin@gmail.com>
2025-10-15 15:46:32 +02:00
Julius Volz
8b1bd7d6c3 ui: Allow viewing detailed relabeling steps for each discovered target
This adds:

* A `ScrapePoolConfig()` method to the scrape manager that allows getting
  the scrape config for a given pool.
* An API endpoint at `/api/v1/targets/relabel_steps` that takes a pool name
  and a label set of a target and returns a detailed list of applied
  relabeling rules and their output for each step.
* A "show relabeling" link/button for each target on the discovery page
  that shows the detailed flow of all relabeling rules (based on the API
  response) for that target.

Note that this changes the JSON encoding of the relabeling rule config
struct to output the original snake_case (instead of camelCase) field names,
and before merging, we need to be sure that's ok :) See my comment about
that at https://github.com/prometheus/prometheus/pull/15383#issuecomment-3405591487

Fixes https://github.com/prometheus/prometheus/issues/17283

Signed-off-by: Julius Volz <julius.volz@gmail.com>
2025-10-15 15:33:27 +02:00
Björn Rabenstein
460d19c99a
Merge pull request #17315 from prometheus/beorn7/histogram2
Phase out native histogram feature flag, add scrape config option
2025-10-15 15:30:52 +02:00
George Krajcsovits
16f96dcd45
Merge pull request #17335 from prometheus/krajo/merge-release-307-to-main
merge release 307 to main
2025-10-15 15:04:46 +02:00
beorn7
ad7d1aed99 Phase out native histogram feature flag
The detailed plan for this is laid out in
https://github.com/prometheus/prometheus/issues/16572 .

This commit adds a global and local scrape config option
`scrape_native_histograms`, which has to be set to true to ingest
native histograms.

To ease the transition, the feature flag is changed to simply set the
default of `scrape_native_histograms` to true.

Further implications:

- The default scrape protocols now depend on the
  `scrape_native_histograms` setting.
- Everywhere else, histograms are now "on by default".

Documentation beyond the one for the feature flag and the scrape
config are deliberately left out. See
https://github.com/prometheus/prometheus/pull/17232 for that.

Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-15 14:50:52 +02:00
György Krajcsovits
dffb721529
Merge remote-tracking branch 'origin/release-3.7' into krajo/merge-release-307-to-main 2025-10-15 13:17:49 +02:00
George Krajcsovits
09814effe6
chore(release): prepare for 3.7 release (#17330)
* chore(release): prepare for 3.7 release

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
v0.307.0 v3.7.0
2025-10-15 12:08:05 +02:00
Jan-Otto Kröpke
fd421dc3b1
feat: Add OpenContainers spec labels to Dockerfile (#16483)
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
2025-10-15 09:34:06 +02:00
beorn7
72960c076d scrape: "Modernize" test files
Applied the analyzer "modernize" to the test files.

$ go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...

Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-14 19:30:22 +02:00
Will Bollock
e894a22b88 feat: add config label to refresh metrics
Adds a `config` label (similar to `prometheus_sd_discovered_targets`) to
refresh metrics to help identify the source of refresh issues or
performance stats. In particular for HTTP SD, it can be common to have
multiple disparate HTTP SD sources that should be identified and not
lumped together. For example if one HTTP SD service has failures, that
should be evident in its own time series seperate from other HTTP SD
sources.

`config` seemed more appropriate than `endpoint` as a general standard
for `prometheus_sd` metrics.

Docs were also updated for HTTP SD to point at the new refresh metrics
rather than the older metrics.

Signed-off-by: Will Bollock <wbollock@linode.com>
2025-10-14 11:36:14 -04:00
Fiona Liao
9a5bccbd4b
refactor: make OTEL temporality check easier to read (#16692)
* Make OTEL temporality check easier to read
* Add nolint comment

Signed-off-by: Fiona Liao <fiona.liao@grafana.com>
2025-10-14 13:29:23 +02:00
Bryan Boreham
88811505c6
Merge pull request #17326 from hxrshxz/test-discovery-xds-parallel
test(discovery/xds): speed up tests with t.Parallel()
2025-10-14 12:08:24 +01:00
Bryan Boreham
1e1389bec8
Merge pull request #17327 from prometheus/jkroepke-patch-1
Remove jkroepke from azure MAINTAINERS.md
2025-10-14 12:03:17 +01:00
Björn Rabenstein
a18d18e927
Merge pull request #17331 from prometheus/beorn7/promql
promql: Check 1st histogram's CRH in sum_over_time
2025-10-14 11:22:18 +02:00
beorn7
e80a3e1b21 promql: Check 1st histogram's CRH in sum_over_time
avg_over_time already correctly checked the counter reset hint fo all
histograms, but in sum_over_time, the 1st histogram was missed. In
both cases, the 1st histogram is processed outside the loop.

Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-14 00:56:07 +02:00
beorn7
ff49406cba promql: Expose bug of not checking 1st histogram for CRH
avg_over_time already correctly checked the counter reset hint fo all
histograms, but in sum_over_time, the 1st histogram was missed in the
loop. This commit exposes the bug in a test.

Signed-off-by: beorn7 <beorn@grafana.com>
2025-10-14 00:52:23 +02:00
George Krajcsovits
edbc5cfa06
Merge pull request #17305 from hxrshxz/fix-17224-remove-nhcb-check
Remove obsolete check preventing NHCB and CT zero ingestion
2025-10-13 10:50:53 +02:00
Harsh
4d7d8ebcfa lint fixes
Signed-off-by: Harsh <harshmastic@gmail.com>
2025-10-13 13:59:10 +05:30
harsh kumar
a612cd8954
Update scrape/manager_test.go
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>
2025-10-13 12:41:46 +05:30
harsh kumar
5244b0e3f7
Update scrape/manager_test.go
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>
2025-10-13 00:50:58 +05:30
harsh kumar
a1e163a462
Update scrape/manager_test.go
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: harsh kumar <135993950+hxrshxz@users.noreply.github.com>
2025-10-13 00:50:42 +05:30
Harsh
a63414b8e8 suggested changes added
Signed-off-by: Harsh <harshmastic@gmail.com>
2025-10-12 21:29:18 +05:30
Björn Rabenstein
2c2a4314b9
Merge pull request #17320 from prometheus/beorn7/histogram3
model/histogram: Fix checkHistogramCustomBounds to accept -Inf
2025-10-12 16:10:17 +02:00
Jan-Otto Kröpke
4b6635c5cc
Remove azure maintainer from MAINTAINERS.md
Removed Jan-Otto Kröpke as maintainer for azure.

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
2025-10-12 12:56:53 +02:00
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
Naman-B-Parlecha
1df1f53ea0 fix: Added Unroll support to Sparse NHCBs
Signed-off-by: Naman-B-Parlecha <namanparlecha@gmail.com>
2025-10-10 19:12:30 +05:30
NamanParlecha
167cb350f1
Merge branch 'prometheus:main' into NamanParlecha/NHCBtoCH 2025-10-10 18:59:53 +05:30
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