Skip to content

NO-JIRA: Upgrade Prometheus to 3.11.2#305

Open
machine424 wants to merge 675 commits intoopenshift:mainfrom
machine424:proaa
Open

NO-JIRA: Upgrade Prometheus to 3.11.2#305
machine424 wants to merge 675 commits intoopenshift:mainfrom
machine424:proaa

Conversation

@machine424
Copy link
Copy Markdown

@machine424 machine424 commented Apr 24, 2026

SuperQ and others added 30 commits February 22, 2026 08:27
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… v2.28.0 (prometheus#18159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… to v1.37.0 (prometheus#18158)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ometheus#18157)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…s#18165)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* AWS SD: Elasticache

This change adds Elasticache to the AWS SD.

Co-authored-by: Ben Kochie <superq@gmail.com>
Signed-off-by: Matt <small_minority@hotmail.com>

---------

Signed-off-by: Matt <small_minority@hotmail.com>
Co-authored-by: Ben Kochie <superq@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
… v1.3.3 (prometheus#18137)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…s#18166)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…prometheus#18161)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: bwplotka <bwplotka@gmail.com>
* Isolate fix: Remove 5s sleep for 99% speedup. Discarded unwanted code.

Signed-off-by: 3Juhwan <13selfesteem91@naver.com>
Signed-off-by: Sammy Tran <sammyqtran@gmail.com>

* Add regex optimization for simple contains alternations

Signed-off-by: Casie Chen <casie.chen@grafana.com>

* enable experimental functions in promql benchmarks

Signed-off-by: Dan Cech <dcech@grafana.com>

* Fix a couple of broken links in configuration.md (prometheus#18045)

Signed-off-by: kakabisht <kakabisht07@gmail.com>

* promql: info function: support multiple name matchers (prometheus#17968)

* Add new test cases for multiple name matchers in PromQL info function
* Fix handling of multiple name matchers in PromQL info function

---------

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>

* tsdb: Optimize LabelValues for sparse intersections (Fixes prometheus#14551)

Signed-off-by: Divyansh Mishra <divyanshmishra@Divyanshs-MacBook-Air-3.local>

* fix: handle ErrTooOldSample as 400 Bad Request in OTLP and v2 histogram write paths

The OTLP write handler and the PRW v2 histogram append path were missing
ErrTooOldSample from their error type checks, causing these errors to
fall through to the default case and return HTTP 500 Internal Server Error.
This triggered unnecessary retries in OTLP clients like the Python SDK.

The PRW v1 write handler (line 115) and the PRW v2 sample append path
(line 377) already correctly handle ErrTooOldSample as a 400, and this
change makes the remaining paths consistent.

Also adds ErrTooOldSample to the v1 sample/histogram log checks so
these errors are properly logged instead of silently returned.

Fixes prometheus#16645

Signed-off-by: Varun Chawla <varun_6april@hotmail.com>

* fix: prevent stale exemplars leaking to histogram _sum/_count across data points (prometheus#18056)

In addHistogramDataPoints, exemplars assigned to the +Inf bucket of one
data point were carried over into the _sum and _count Append calls of
the next data point via the shared appOpts. Clear appOpts.Exemplars at
the start of each loop iteration to restore the nil-exemplar semantics
that existed before the AppenderV2 migration.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* tsdb: fix flaky TestBlockRanges by using explicit compaction

Replace polling loops (for range 100 { time.Sleep }) with explicit
db.Compact() calls after disabling background compaction, eliminating
CI flakiness on slow machines. Also fix incorrect overlap assertions
that were checking the wrong direction (LessOrEqual -> GreaterOrEqual).

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* rules: fix flaky TestAsyncRuleEvaluation on Windows (prometheus#17965)

Convert all timing-sensitive subtests of TestAsyncRuleEvaluation to use
synctest for deterministic testing. This fixes flakiness on Windows
caused by timer granularity and scheduling variance.

The timing assertions are preserved using synctest's fake time, which
allows accurate verification of sequential vs concurrent execution
timing without relying on wall-clock time.

Fixes prometheus#17961

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Move krajorama to general maintainer (prometheus#18095)

He's been participating in the bug scrub for a year and provides
reviews all over the code base. Also fix name spelling.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>

* promtool: fix --enable-feature flags ignored in check config and test rules (prometheus#18097)

Both are regressions from the parser refactoring in prometheus#17977.

- Fixes prometheus#18092
- Fixes prometheus#18093

Signed-off-by: Martin Valiente Ainz <64830185+tinitiuset@users.noreply.github.com>

* tsdb/wlog: Remove any temproary checkpoints when creating a Checkpoint (prometheus#17598)

* RemoveTmpDirs function to tsdbutil
* Refactor db to use RemoveTmpDirs and no longer cleanup checkpoint tmp dirs
* Use RemoveTmpDirs in wlog checkpoint to cleanup all checkpoint tmp folders
* Add tests for RemoveTmpDirs
* Ensure db.Open will still cleanup extra temporary checkpoints

Signed-off-by: Kyle Eckhart <kgeckhart@users.noreply.github.com>

* chore(lint): enable wg.Go

Since our minimum supported go version is now go 1.25, we can use wg.Go.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>

* chore: enable staticcheck linter and update golangci-lint to 2.10.1

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

* PromQL: Add experimental histogram_quantiles variadic function (prometheus#17285)

Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com>
Signed-off-by: Björn Rabenstein <github@rabenste.in>
Signed-off-by: beorn7 <beorn@grafana.com>
Co-authored-by: Björn Rabenstein <github@rabenste.in>
Co-authored-by: beorn7 <beorn@grafana.com>

* Upgrade `mongo-driver` to v1.17.9 (prometheus#18077)

Signed-off-by: Sayuru <71478576+samaras3@users.noreply.github.com>

* tests: add CI job for ompliance testing (prometheus#18121)

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

* chore: Add consistent closing logging (prometheus#18119)

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

* fix(deps): update github.com/hashicorp/nomad/api digest to daca79d (prometheus#18128)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update aws go dependencies (prometheus#18135)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix renovate PR body (prometheus#18154)

* chore(deps): update actions/stale action to v10.2.0 (prometheus#18144)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update actions/setup-node action to v6.2.0 (prometheus#18143)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update github/codeql-action action to v4.32.4 (prometheus#18147)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update kubernetes go dependencies to v0.35.1 (prometheus#18136)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependabot/fetch-metadata action to v2.5.0 (prometheus#18145)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update module github.com/prometheus/alertmanager to v0.31.1 (prometheus#18142)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update module github.com/klauspost/compress to v1.18.4 (prometheus#18138)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update github.com/nsf/jsondiff digest to 8e8d90c (prometheus#18129)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update google.golang.org/genproto/googleapis/api digest to 42d3e9b (prometheus#18132)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fixup renovate PR note (prometheus#18156)

* fix(deps): update module golang.org/x/sys to v0.41.0 (prometheus#18163)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update module github.com/grpc-ecosystem/grpc-gateway/v2 to v2.28.0 (prometheus#18159)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update module github.com/envoyproxy/go-control-plane/envoy to v1.37.0 (prometheus#18158)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update module github.com/digitalocean/godo to v1.175.0 (prometheus#18157)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update module google.golang.org/api to v0.267.0 (prometheus#18165)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* [FEATURE] AWS SD:  Add Elasticache Role (prometheus#18099)

* AWS SD: Elasticache

This change adds Elasticache to the AWS SD.

Co-authored-by: Ben Kochie <superq@gmail.com>
Signed-off-by: Matt <small_minority@hotmail.com>

---------

Signed-off-by: Matt <small_minority@hotmail.com>
Co-authored-by: Ben Kochie <superq@gmail.com>

* fix(deps): update module golang.org/x/text to v0.34.0 (prometheus#18164)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update module github.com/envoyproxy/protoc-gen-validate to v1.3.3 (prometheus#18137)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix test after merge

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

---------

Signed-off-by: 3Juhwan <13selfesteem91@naver.com>
Signed-off-by: Sammy Tran <sammyqtran@gmail.com>
Signed-off-by: Casie Chen <casie.chen@grafana.com>
Signed-off-by: Dan Cech <dcech@grafana.com>
Signed-off-by: kakabisht <kakabisht07@gmail.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Divyansh Mishra <divyanshmishra@Divyanshs-MacBook-Air-3.local>
Signed-off-by: Varun Chawla <varun_6april@hotmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: Martin Valiente Ainz <64830185+tinitiuset@users.noreply.github.com>
Signed-off-by: Kyle Eckhart <kgeckhart@users.noreply.github.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Signed-off-by: Linas Medziunas <linas.medziunas@gmail.com>
Signed-off-by: Björn Rabenstein <github@rabenste.in>
Signed-off-by: beorn7 <beorn@grafana.com>
Signed-off-by: Sayuru <71478576+samaras3@users.noreply.github.com>
Signed-off-by: bwplotka <bwplotka@gmail.com>
Signed-off-by: Matt <small_minority@hotmail.com>
Co-authored-by: 3Juhwan <13selfesteem91@naver.com>
Co-authored-by: Casie Chen <casie.chen@grafana.com>
Co-authored-by: Dan Cech <dcech@grafana.com>
Co-authored-by: hridyesh bisht <41201308+kakabisht@users.noreply.github.com>
Co-authored-by: Julien <291750+roidelapluie@users.noreply.github.com>
Co-authored-by: zenador <zenador@users.noreply.github.com>
Co-authored-by: Divyansh Mishra <divyanshmishra@Divyanshs-MacBook-Air-3.local>
Co-authored-by: Varun Chawla <varun_6april@hotmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Co-authored-by: Martin Valiente Ainz <64830185+tinitiuset@users.noreply.github.com>
Co-authored-by: Bryan Boreham <bjboreham@gmail.com>
Co-authored-by: Kyle Eckhart <kgeckhart@users.noreply.github.com>
Co-authored-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Co-authored-by: Linas Medžiūnas <linasm@users.noreply.github.com>
Co-authored-by: Björn Rabenstein <github@rabenste.in>
Co-authored-by: beorn7 <beorn@grafana.com>
Co-authored-by: Sayuru <71478576+samaras3@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ben Kochie <superq@gmail.com>
Co-authored-by: Matt <small_minority@hotmail.com>
This adds documentation for the external_id parameter when assuming
AWS roles in the sigv4 configuration.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
…gv4up

Add AWS external_id support in sigv4 configuration
Remove the separate scrapeFailureLoggerMtx and use targetMtx instead
for synchronizing access to scrapeFailureLogger. This fixes a data race
where Sync() would read scrapeFailureLogger while holding targetMtx but
SetScrapeFailureLogger() would write to it while holding a different mutex.

Add regression test to catch concurrent access issues.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
* Bump promu to latest release.
* Update actions/checkout.
* Update Go to 1.26.x for golangci-lint in synced repos.
* Improve golangci-lint push filter for synced repos.

Signed-off-by: SuperQ <superq@gmail.com>
…ometheus#18133)

Signed-off-by: Aurelien Duboc <aurelienduboc96@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
…us#17338)

* test(tsdb): Enable parallel execution for chunk write queue tests

Signed-off-by: Harsh <harshmastic@gmail.com>
…r-health-endpoint

discovery/consul: Fix filter parameter not applied to health endpoint
…x-scrape-logger-race

scrape: Fix race condition in scrapeFailureLogger access
…iteMetaFile-fd-leak

fix(tsdb): close file descriptor on json.MarshalIndent failure in writeMetaFile
Signed-off-by: Jérôme LOYET <822436+fatpat@users.noreply.github.com>
Signed-off-by: Laurent Dufresne <laurent.dufresne@grafana.com>
…ding

Signed-off-by: Laurent Dufresne <laurent.dufresne@grafana.com>
Signed-off-by: Laurent Dufresne <laurent.dufresne@grafana.com>
…ze-percentage

Add percentage based retention
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
promql: Implement </ and >/ operators for trimming native histograms
roidelapluie and others added 13 commits April 9, 2026 16:03
The filter field was documented as targeting the Catalog API but since
PR prometheus#17349 it was also passed to the Health API. This broke existing
configs using Catalog-only fields like ServiceTags, which the Health API
rejects (it uses Service.Tags instead).

Introduce a separate health_filter field that is passed exclusively to
the Health API, while filter remains catalog-only. Update the docs to
explain the two-phase discovery (Catalog for service listing, Health for
instances) and the field name differences between the two APIs.

Fixes prometheus#18479

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
When health_filter is set without explicit services, the catalog needs
to be watched to enumerate services. Add watchedFilter to the condition
that triggers catalog watching.

Improve the filter test suite:
- Replace defer with t.Cleanup for stub servers.
- Rewrite TestFilterOption to assert that the catalog receives the filter
  and the health endpoint does not.
- Rewrite TestHealthFilterOption to assert that health_filter is routed
  correctly to the health endpoint only.
- Add TestBothFiltersOption to verify both filters are routed to their
  respective endpoints when both are configured.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Metric names, label names, and label values containing HTML/JavaScript were
inserted into `innerHTML` without escaping in several UI code paths, enabling
stored XSS attacks via crafted metrics. This mostly becomes exploitable in
Prometheus 3.x, since it defaults to allowing any UTF-8 characters in metric
and label names.

Apply `escapeHTML()` to all user-controlled values before innerHTML
insertion in:

* Mantine UI chart tooltip
* Old React UI chart tooltip
* Old React UI metrics explorer fuzzy search
* Old React UI heatmap tooltip

See GHSA-vffh-x6r8-xx99

Signed-off-by: Julius Volz <julius.volz@gmail.com>
…ckport-xss-issue

UI: Fix stored XSS via unescaped metric names and labels
Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Signed-off-by: Julien <291750+roidelapluie@users.noreply.github.com>
…nsul-health-filter-3.11

discovery/consul: add health_filter for Health API filtering
Signed-off-by: Mohammad Varmazyar <mrvarmazyar@gmail.com>
…h-filter-config-fixtures

config: add consul health_filter fixture coverage
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Ayoub Mrini <ayoubmrini424@gmail.com>
Signed-off-by: Ayoub Mrini <ayoubmrini424@gmail.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 24, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@machine424: This pull request explicitly references no jira issue.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 24, 2026

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 8fa3afd1-ea8f-4e43-8b84-b89e3899f532

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from jan--f and marioferh April 24, 2026 15:25
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 24, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: machine424

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 24, 2026
@jan--f
Copy link
Copy Markdown

jan--f commented Apr 24, 2026

I added a switch to exclude the react ui: prometheus@6a9866e

Should we set BUILD_UI=mantine? Maybe that avoids some js CVE reports...or at least allows us to close them without much investigation.

remove go.work.sum from .gitignore

force add vendor/go.yaml.in/yaml/v4/.golangci.yaml vendor/go.yaml.in/yaml/v4/.ls-lint.yaml vendor/go.yaml.in/yaml/v4/.yamllint.yaml
see yaml/go-yaml#339

Signed-off-by: Ayoub Mrini <ayoubmrini424@gmail.com>
@machine424
Copy link
Copy Markdown
Author

opened yaml/go-yaml#339 so we don't have to hack around (let's see if my hack would work) go.yaml.in/yaml/v4 vendoring to make ci/prow/verify-deps pass.

also opened openshift/release#78351 to adjust our vendor job.

I added a switch to exclude the react ui: prometheus@6a9866e

Should we set BUILD_UI=mantine? Maybe that avoids some js CVE reports...or at least allows us to close them without much investigation.

Cool, should have missed that. I can take care of that here.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 24, 2026

@machine424: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-agnostic-cmo 421c3ab link true /test e2e-agnostic-cmo
ci/prow/vendor 421c3ab link true /test vendor

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.