Skip to content

[ACM Obs bot] Bump stolostron/prometheus to v3.13.1 - #387

Open
acm-observability-bot[bot] wants to merge 919 commits into
stolostron:release-5.0from
rhobs:automated-updates-acm-release-5.0
Open

[ACM Obs bot] Bump stolostron/prometheus to v3.13.1#387
acm-observability-bot[bot] wants to merge 919 commits into
stolostron:release-5.0from
rhobs:automated-updates-acm-release-5.0

Conversation

@acm-observability-bot

Copy link
Copy Markdown

Description

This is an automated version bump from CI.
The logs for this run can be found in the syncbot repo actions.
If you wish to perform this manually, execute the following commands from stolostron/prometheus repo:

git fetch https://github.com/prometheus/prometheus --tags
if ! git merge refs/tags/v3.13.1 --no-edit; then
  git checkout --theirs CHANGELOG.md Makefile VERSION go.mod go.sum .golangci.yml
  git checkout --ours 
  git add CHANGELOG.md Makefile VERSION go.mod go.sum .golangci.yml 
  git merge --continue
fi
go mod tidy
go mod vendor
# Only compress assets if assets actually changed
# The git diff relies on gits remote naming. The merge-flow checks out
# $downstream as origin at the time of writing this code.
if ! git diff --exit-code --name-only  origin/main web/ui; then
  find web/ui/static -type f -name '*.gz' -exec git add {} \;
  git add web/ui
  git diff --cached --exit-code --name-only || git commit -s -m "[bot] assets: generate"
fi

bwplotka and others added 30 commits May 18, 2026 12:22
Signed-off-by: bwplotka <bwplotka@gmail.com>
tests: split 32bit x86 tests to a separate job with parallel=1
tsdb: fix init race that lets initialized() return true before maxTime is set
…y-aws-parallel

discovery/aws: run tests in parallel
Co-authored-by: Julien <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Bartlomiej Plotka <bwplotka@gmail.com>
- Fix copy-paste bug: smoothed branch in bare MatrixSelector eval now
  says "smoothed modifier is not supported with histograms" instead of
  "anchored".
- Change annosFromInterpolationError to take *annotations.Annotations,
  consistent with all other histogram helper functions.
- Rename delta to result in interpolateHistograms to avoid the misleading
  name (the variable holds the interpolated result, not a delta).
- Fix extendedRate doc comment: interpolates at boundaries, not
  extrapolates.
- Fix stale comment in correctForCounterResetsHistogram that referenced
  the nonexistent variable leftInterpolationHandledReset.
- Add comment explaining why right.Copy() is not redundant in
  extendedHistogramRate.
- Hoist s.Labels().Get(labels.MetricName) out of the per-step loop in
  smoothSeries; was called up to three times per step.
- Reset CounterResetHint to UnknownCounterReset on carry-forward
  histograms in smoothSeries; a Reset hint at a new timestamp is
  semantically misleading.
- Add TestInterpolateHistograms unit test covering exact-match, midpoint,
  counter, reset, and quarter-point cases.
- Add rate(hist_counter[1m] anchored) test.
- Add delta(hist_counter[1m] anchored/smoothed) tests with
  NativeHistogramNotGaugeWarning assertions.
- Add carry-forward test for smoothed vector selector.
- Add range eval test for rate(hist_counter[1m] smoothed).
- Add right-boundary reset interpolation test (right_boundary_reset).
- Fix stale test comment about "prev initialPrev path".

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

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

promql: support native histograms with smoothed/anchored rate
…3.12

Revert "chore: prepare 3.12.0-rc.0 release"
…eanup-funcmap

chore(promql): replace funcQueryContext with nil in FunctionCalls map
chores: Prepare 3.12.0-rc.0 release
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
…bsequence-rank

strutil/subsequence: rank exact matches above non-exact matches
…ard-nil-funcall

promql: guard against nil function call in eval
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Kai Tanaka <275430420+quyentonndbs@users.noreply.github.com>
Co-authored-by: Kai Tanaka <275430420+quyentonndbs@users.noreply.github.com>
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Each test creates its own httptest.Server and prometheus.Registry so
there is no shared global state between them. Adding t.Parallel() to
all 13 top-level test functions and the subtests in TestUnmarshalConfig
allows the Go test runner to overlap them, cutting wall-clock time.

Refs: prometheus#15185

Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>
Add t.Parallel() to the 13 top-level test functions in marathon_test.go.
Tests have no shared mutable state — each test creates its own registry,
metrics, and config — so parallelisation is safe and speeds up the suite.

Refs prometheus#15185

Signed-off-by: Ogulcan Aydogan <ogulcanaydogan@hotmail.com>
Signed-off-by: jyotishmoy12 <jyotishmoydeka62@gmail.com>
…theus#18724)

* web/api: reject 0 for limit and batch_size in search endpoints

Treat 0 as invalid for limit and batch_size query parameters; clients
must supply a positive integer or omit the parameter to use the server
default of 100. Update OpenAPI descriptions accordingly.

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

* Update web/api/v1/openapi.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Julien <291750+roidelapluie@users.noreply.github.com>

---------

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
Signed-off-by: Julien <291750+roidelapluie@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Andrew Hall <andrew.hall@grafana.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
Signed-off-by: Andrew Hall <andrew.hall@grafana.com>
…rometheus#18739)

EncXOR2 is a float encoding and must be treated like EncXOR in all
places that enumerate chunk types:

- compact.go: NumFloatSamples was not incremented for EncXOR2 chunks
  during compaction, leading to under-reported block stats.
- head_wal.go: encodeToSnapshotRecord fell through to the default
  (FloatHistogram) branch for EncXOR2 head chunks, which would corrupt
  chunk snapshots; the decode path already handled EncXOR2 correctly.
- ooo_head.go: update stale comment to mention EncXOR2.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
krajorama and others added 3 commits July 9, 2026 10:46
…134-head-chunk-cache

tsdb: fix stale head-chunk cache after head-chunk truncation (prometheus#19134)
Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
chore: prep release 3.13.1 with tsdb related fix
@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown

Hi @acm-observability-bot[bot]. Thanks for your PR.

I'm waiting for a stolostron member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@coleenquadros

Copy link
Copy Markdown

/ok-to-test

@coleenquadros

Copy link
Copy Markdown

/retest

@simonpasquier
simonpasquier removed their request for review July 23, 2026 12:16
@acm-observability-commit-bot
acm-observability-commit-bot Bot force-pushed the automated-updates-acm-release-5.0 branch from a338e83 to 607253f Compare July 24, 2026 09:43
@coleenquadros

Copy link
Copy Markdown

/ok-to-test

github-actions Bot added 3 commits July 28, 2026 11:51
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@acm-observability-commit-bot
acm-observability-commit-bot Bot force-pushed the automated-updates-acm-release-5.0 branch from 607253f to 6f84b1b Compare July 28, 2026 11:52
The compliance directory is a separate Go module with its own go.mod.
The test command needs to be run from within the compliance directory,
not from the repository root.

Error was:
  pattern ./compliance/...: directory prefix compliance does not contain
  main module or its selected dependencies
The buf-breaking action was comparing against prometheus/prometheus:main
instead of the actual base branch (stolostron/prometheus:release-5.0).
This caused false breaking change failures when merging upstream versions.

Now correctly compares against stolostron/prometheus:release-5.0.
@coleenquadros
coleenquadros force-pushed the automated-updates-acm-release-5.0 branch from eb022ac to 8047693 Compare July 29, 2026 08:47
Functions end, start, step, range, max_of, and min_of were removed
in upstream Prometheus v3.13.1 but the generated TypeScript files
still contained them. This caused the generated parser check to fail.

Removes these 6 obsolete function signatures to match the current
Go source code.

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@coleenquadros

Copy link
Copy Markdown

/retest-required

For syncbot upgrade PRs, comparing against upstream prometheus/prometheus:main
makes more sense than comparing against stolostron's own release branch, since
we're pulling in upstream changes that were already validated upstream.

This avoids false positives on breaking changes that upstream intentionally made.

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: acm-observability-bot[bot]
Once this PR has been reviewed and has the lgtm label, please assign bjoydeep for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

After upgrading to Prometheus v3.13.1, rebuilt UI assets using
'BUILD_UI=mantine make assets-compress' to generate only mantine-ui
assets, excluding the legacy react-app.

This updates embed.go and compressed assets to match the v3.13.1
mantine-ui build output.

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@coleenquadros

Copy link
Copy Markdown

/retest

The remote_storage example's go.mod referenced prometheus v0.308.1,
but the code uses APIs from v3.13.1 (ToMetadata signature changed).

Added a replace directive to use the local v3.13.1 code instead of
downloading the old v0.308.1 version. This fixes the golangci-lint
type mismatch error:
  assignment mismatch: 2 variables but ts.ToMetadata returns 1 value

Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
@coleenquadros

Copy link
Copy Markdown

/retest

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.