[bot] Bump openshift/prometheus to v2.46.0 by openshift-monitoring-bot[bot] · Pull Request #167 · openshift/prometheus

openshift-monitoring-bot · 2023-07-26T00:31:15Z

Description

This is an automated version bump from CI.
If you wish to perform this manually, execute the following commands from openshift/prometheus repo,

git fetch https://github.com/prometheus/prometheus --tags
if ! git merge refs/tags/v2.46.0 --no-edit; then
  git checkout --theirs CHANGELOG.md VERSION go.mod go.sum .golangci.yml
  git checkout --ours 
  git add CHANGELOG.md VERSION go.mod go.sum .golangci.yml 
  git merge --continue
fi
go mod tidy
go mod vendor
make assets-compress
find web/ui/static -type f -name '*.gz' -exec git add {} \;
git add web/ui/embed.go
git diff --cached --exit-code || git commit -s -m "[bot] assets: generate"

if [ -f scripts/rh-manifest.sh ]; then
  bash scripts/rh-manifest.sh
  git add rh-manifest.txt
  git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

Signed-off-by: songjiayang <songjiayang1@gmail.com>

Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io>

I found it hard to understand how EvalTimestamp works, so I wanted to simplify the math there. This PR should be a noop. Current formula is: ``` offset = g.hash % g.interval adjNow = startTime - offset base = adjNow - (adjNow % g.interval) EvalTimestamp = base + offset ``` I simplify `EvalTimestamp` ``` EvalTimestamp = base + offset # expand base = adjNow - (adjNow % g.interval) + offset # expand adjNow = startTime - offset - ((startTime - offset) % g.interval) + offset # cancel out offset = startTime - ((startTime - offset) % g.interval) # expand A+B (mod M) = (A (mod M) + B (mod M)) (mod M) = startTime - (startTime % g.interval - offset % g.interval) % g.interval # expand offset = startTime - (startTime % g.interval - ((g.hash % g.interval) % g.interval)) % g.interval # remove redundant mod g.interval = startTime - (startTime % g.interval - g.hash % g.interval) % g.interval # simplify (A (mod M) + B (mod M)) (mod M) = A+B (mod M) = startTime - (startTime - g.hash) % g.interval offset = (startTime - g.hash) % g.interval EvalTimestamp = startTime - offset ``` Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

Co-authored-by: Christian Hoffmann <christian@hoffie.info> Signed-off-by: Ashish Kurmi <100655670+boahc077@users.noreply.github.com>

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

…to target group Signed-off-by: Aaron George <aaron@ometria.com> Signed-off-by: Aaron George <aaron@ometria.com>

Signed-off-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl>

…dpoints Signed-off-by: Charles Korn <charles.korn@grafana.com>

Signed-off-by: Charles Korn <charles.korn@grafana.com>

…form a type assertion against Response.Data. Signed-off-by: Charles Korn <charles.korn@grafana.com>

Signed-off-by: Charles Korn <charles.korn@grafana.com>

Signed-off-by: Charles Korn <charleskorn@users.noreply.github.com>

…low overriding the default API codec. Signed-off-by: Charles Korn <charles.korn@grafana.com>

Signed-off-by: Charles Korn <charles.korn@grafana.com>

Currently github actions keep sending me mails about things that should only run on the prometheus organisation actions. This change makes sure to check who owns the repository before running the CI workflow. Signed-off-by: Francis Begyn <francis@begyn.be>

In Thanos we would like to start experimenting with custom functions that are currently not part of the PromQL spec. We would do this by adding an implementation for those functions in the Thanos engine: https://github.com/thanos-community/promql-engine and allow users to decide which engine they want to use on a per-query basis. Since we use the PromQL parser from Prometheus, injecting functions in the global `Functions` variable would mean they also become available for the Prometheus engine. To avoid this side-effect, this commit exposes a Parser interface in which the supported functions can be injected as an option. If not functions are injected, the parser implementation will default to the functions defined in the global Functions variable. Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

@damnever

Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

Signed-off-by: ianwoolf <btw515wolf2@gmail.com>

Signed-off-by: John Losito <lositojohnj@gmail.com>

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

Signed-off-by: Justin Lei <justin.lei@grafana.com>

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Prepare go dependencies for 2.46

Native histograms without a zero threshold aren't federated properly. This adds a test to prove the specific failure mode, which is that histograms with a zero threshold of zero are federated as classic histograms. The underlying reason is that the protobuf parser identifies a native histogram by detecting a zero bucket or by detecting integer buckets. Therefore, a float histogram with a zero threshold of zero and an unpopulated zero bucket falls through the cracks (no integer buckets, no zero bucket). This commit also addse a test case for the latter. Signed-off-by: beorn7 <beorn@grafana.com>

If a float histogram has a zero bucket with a threshold of zero _and_ an empty zero bucket, it wasn't identified as a native histogram because the `isNativeHistogram` helper function only looked at integer buckets. Signed-off-by: beorn7 <beorn@grafana.com>

histograms: Fix parsing of float histograms without zero bucket

scrape: Enable ingestion of multiple exemplars per sample

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Release 2.46.0-rc.0

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Release 2.46.0

v2.46.0 # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQQmXJ5XCZMypkpKK5sUxTiRCP+xLAUCZL+/yAAKCRAUxTiRCP+x # LKJeAP9abnbmnT5Ovl3U4xUbqXcdT/50q8+C02xj2JTGoCPE7wD/VegCYYydTJSg # vCUMjKuixggoYRQQtsz+mc9YYGmRvwg= # =0yXM # -----END PGP SIGNATURE----- # gpg: directory '/home/runner/.gnupg' created # gpg: keybox '/home/runner/.gnupg/pubring.kbx' created # gpg: Signature made Tue Jul 25 12:27:52 2023 UTC # gpg: using EDDSA key 265C9E57099332A64A4A2B9B14C5389108FFB12C # gpg: Can't check signature: No public key

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

openshift-ci · 2023-07-26T00:31:27Z

Hi @openshift-monitoring-bot[bot]. Thanks for your PR.

I'm waiting for a openshift 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/test-infra repository.

simonpasquier · 2023-07-26T07:59:18Z

/ok-to-test
/lgtm

openshift-ci · 2023-07-26T08:00:11Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-monitoring-bot[bot], simonpasquier

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:

~~OWNERS~~ [simonpasquier]

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

simonpasquier · 2023-07-26T13:22:05Z

/retest-required

openshift-ci · 2023-07-26T15:36:38Z

@openshift-monitoring-bot[bot]: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

When doing a config reload that need to stop some providers while also sending SIGTERM to Prometheus at the same time can sometimes hang 1: sync.WaitGroup.Wait [83 minutes] [Created by run.(*Group).Run in goroutine 1 @ group.go:37] sync sema.go:110 runtime_SemacquireWaitGroup(*uint32(#166)) sync waitgroup.go:118 (*WaitGroup).Wait(*WaitGroup(#23)) discovery manager.go:276 (*Manager).ApplyConfig(#23, #167) main main.go:964 main.func5(#120) main main.go:1505 reloadConfig({#183, 0x1b}, 1, #40, #43, #50, {#31, 0xa, 0}) main main.go:1182 main.func22() run group.go:38 (*Group).Run.func1(*Group(#26), #51) Add a test for it. Signed-off-by: Lukasz Mierzwa <l.mierzwa@gmail.com>

songjiayang and others added 30 commits June 12, 2022 08:06

make sure response error when TOC parse failed

c2af0de

Signed-off-by: songjiayang <songjiayang1@gmail.com>

ci: add minimum GitHub token permissions for workflows

00ba2f9

Signed-off-by: Ashish Kurmi <akurmi@stepsecurity.io>

Update .github/workflows/codeql-analysis.yml

ecfaa48

Co-authored-by: Christian Hoffmann <christian@hoffie.info> Signed-off-by: Ashish Kurmi <100655670+boahc077@users.noreply.github.com>

Update relabel.Process comment

28a66e1

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Add comments on EvalTimestamp

03ab8dc

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>

k8s discovery: Ensure that the pod IP is in the status before adding …

d542483

…to target group Signed-off-by: Aaron George <aaron@ometria.com> Signed-off-by: Aaron George <aaron@ometria.com>

documentation/mixin: use prometheus metrics for dashboard variables

b6caa6c

Signed-off-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl>

Add extension point for returning different content types from API en…

3e94dd8

…dpoints Signed-off-by: Charles Korn <charles.korn@grafana.com>

Move custom jsoniter code into json_codec.go.

a0dd146

Signed-off-by: Charles Korn <charles.korn@grafana.com>

Expose QueryData so that implementations of Codec.CanEncode() can per…

857b238

…form a type assertion against Response.Data. Signed-off-by: Charles Korn <charles.korn@grafana.com>

Address PR feeedback: reduce log level.

deba512

Signed-off-by: Charles Korn <charles.korn@grafana.com>

Merge branch 'main' into api-response-format-extension-point

eaad7c0

Signed-off-by: Charles Korn <charleskorn@users.noreply.github.com>

Implement fully-featured content negotiation for API requests, and al…

46a2889

…low overriding the default API codec. Signed-off-by: Charles Korn <charles.korn@grafana.com>

Merge branch 'main' into api-response-format-extension-point

38c1930

Signed-off-by: Charles Korn <charles.korn@grafana.com>

Add nolint for NewParser function

3d7783e

Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>

promtool: read from stdin if no filenames are provided in check rules

034eb2b

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

Validate the metric names and labels in the remote write handler

2b7202c

Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com>

fix: apply suggested changes

8472596

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

add Close for ActiveQueryTracker to close the file.

79e4bde

Signed-off-by: ianwoolf <btw515wolf2@gmail.com>

Update configuration.md

ecf6bfa

Signed-off-by: John Losito <lositojohnj@gmail.com>

feat(promtool): add push metrics command

b1bab7b

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

feat: add suggested changes, tests, and stdin support

3524a16

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

feat: make push metrics labels generic and repeatable

934c5dd

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

Group args to append to memSeries in chunkOpts

4c4454e

Signed-off-by: Justin Lei <justin.lei@grafana.com>

Also pass chunkOpts into appendPreprocessor

e73d8b2

Signed-off-by: Justin Lei <justin.lei@grafana.com>

fix: apply suggested changes

4341b98

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

fix: update doc

9cf1b4a

Signed-off-by: François Gouteroux <francois.gouteroux@gmail.com>

Julien Pivotto and others added 15 commits July 19, 2023 09:52

Prepare go dependencies for 2.46

5d7bcee

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Merge pull request prometheus#12578 from roidelapluie/deps-246

f44915e

Prepare go dependencies for 2.46

Merge pull request prometheus#12577 from prometheus/beorn7/histogram3

266e278

histograms: Fix parsing of float histograms without zero bucket

Merge pull request prometheus#12557 from prometheus/beorn7/histogram

7905594

scrape: Enable ingestion of multiple exemplars per sample

Release 2.46.0-rc.0

c37af1e

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Address feedback on CHANGELOG

034babb

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Merge pull request prometheus#12581 from roidelapluie/rel-246-rc0

9cd4808

Release 2.46.0-rc.0

Release 2.46.0

16c645a

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>

Merge pull request prometheus#12600 from roidelapluie/release246

cbb69e5

Release 2.46.0

[bot] vendor: revendor

ce944d2

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

[bot] assets: generate

04f7e9d

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

[bot] update rh-manifest.txt

d7200e2

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 26, 2023

openshift-ci bot requested review from raptorsun and simonpasquier July 26, 2023 00:31

openshift-ci bot assigned simonpasquier Jul 26, 2023

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. lgtm Indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 26, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 26, 2023

openshift-merge-robot merged commit 65d9696 into openshift:master Jul 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

[bot] Bump openshift/prometheus to v2.46.0#167

[bot] Bump openshift/prometheus to v2.46.0#167
openshift-merge-robot merged 183 commits intoopenshift:masterfrom
rhobs:automated-updates-master

openshift-monitoring-bot bot commented Jul 26, 2023

Uh oh!

openshift-ci bot commented Jul 26, 2023

Uh oh!

simonpasquier commented Jul 26, 2023

Uh oh!

openshift-ci bot commented Jul 26, 2023

Uh oh!

simonpasquier commented Jul 26, 2023

Uh oh!

openshift-ci bot commented Jul 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Comments

Conversation

openshift-monitoring-bot bot commented Jul 26, 2023

Description

Uh oh!

openshift-ci bot commented Jul 26, 2023

Uh oh!

simonpasquier commented Jul 26, 2023

Uh oh!

openshift-ci bot commented Jul 26, 2023

Uh oh!

simonpasquier commented Jul 26, 2023

Uh oh!

openshift-ci bot commented Jul 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants