Skip to content

MON-4129: adjust Prometheus classic histograms 'le' related selectors in relabel config to accommodate the update to Prometheus v3#611

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
machine424:adjst-prom3
Jan 31, 2025
Merged

MON-4129: adjust Prometheus classic histograms 'le' related selectors in relabel config to accommodate the update to Prometheus v3#611
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
machine424:adjst-prom3

Conversation

@machine424
Copy link
Contributor

@machine424 machine424 commented Jan 15, 2025

No description provided.

@machine424 machine424 changed the title adjust histograms 'le' related regex WIP: adjust histograms 'le' related regex Jan 15, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 15, 2025
@openshift-ci openshift-ci bot requested review from benluddy and p0lyn0mial January 15, 2025 18:00
@machine424 machine424 mentioned this pull request Jan 15, 2025
Merged
2 tasks
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 16, 2025

@machine424: This PR was included in a payload test run from openshift/cluster-monitoring-operator#2554
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-rosa-sts-hypershift-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/50647e70-d3fb-11ef-84ae-020c1e634813-0

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 16, 2025

@machine424: This PR was included in a payload test run from openshift/cluster-monitoring-operator#2554
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-rosa-sts-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6c58b6a0-d3fb-11ef-9ad3-ed24ac0f8204-0

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 16, 2025

@machine424: This PR was included in a payload test run from openshift/cluster-monitoring-operator#2554
trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-nightly-4.19-e2e-rosa-sts-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/88b2b380-d411-11ef-93dc-3c642b2d31ff-0

@machine424
Copy link
Contributor Author

machine424 commented Jan 17, 2025 •
edited by openshift-ci bot
Loading

/retitle MON-4129: adjust Prometheus histograms 'le' related selectors in relabel config

@openshift-ci openshift-ci bot changed the title WIP: adjust histograms 'le' related regex MON-4129: adjust Prometheus histograms 'le' related selectors in relabel config Jan 17, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 17, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 17, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 17, 2025 •
edited by openshift-ci bot
Loading

@machine424: This pull request references MON-4129 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.19.0" version, but no target version was set.

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.

@machine424 machine424 changed the title MON-4129: adjust Prometheus histograms 'le' related selectors in relabel config WIP: MON-4129: adjust Prometheus histograms 'le' related selectors in relabel config Jan 17, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 17, 2025
@machine424
Copy link
Contributor Author

machine424 commented Jan 30, 2025

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 30, 2025

@machine424: 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-sigs/prow repository. I understand the commands that are listed here.

@machine424
Copy link
Contributor Author

machine424 commented Jan 30, 2025 •
edited by openshift-ci bot
Loading

/retitle MON-4129: adjust Prometheus classic histograms 'le' related selectors in relabel config to accommodate the update to Prometheus v3

@openshift-ci openshift-ci bot changed the title WIP: MON-4129: adjust Prometheus histograms 'le' related selectors in relabel config MON-4129: adjust Prometheus classic histograms 'le' related selectors in relabel config to accommodate the update to Prometheus v3 Jan 30, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2025
p0lyn0mial
p0lyn0mial reviewed Jan 31, 2025
View reviewed changes
manifests/0000_90_openshift-apiserver-operator_04_servicemonitor-apiserver.yaml
- __name__
- action: drop
regex: apiserver_request_duration_seconds_bucket;(0.15|0.25|0.3|0.35|0.4|0.45|0.6|0.7|0.8|0.9|1.25|1.5|1.75|2.5|3|3.5|4.5|6|7|8|9|15|25|30|50)
regex: apiserver_request_duration_seconds_bucket;(0.15|0.25|0.3|0.35|0.4|0.45|0.6|0.7|0.8|0.9|1.25|1.5|1.75|2.5|3|3.5|4.5|6|7|8|9|15|25|30|50)(\.0)?
Copy link
Contributor

@p0lyn0mial p0lyn0mial Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this reg pattern allows an optional .0 at the end. Am I right ?

Copy link
Contributor

@p0lyn0mial p0lyn0mial Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example apiserver_request_duration_seconds_bucket;30.0

Copy link
Contributor Author

@machine424 machine424 Jan 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right.
In Prometheus v3, the values are floats and we should account for that, more details in https://issues.redhat.com//browse/MON-4129

@p0lyn0mial
Copy link
Contributor

p0lyn0mial commented Jan 31, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 31, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 31, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: machine424, p0lyn0mial

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 Jan 31, 2025
@machine424
Copy link
Contributor Author

machine424 commented Jan 31, 2025

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jan 31, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 2583fad into openshift:master Jan 31, 2025
8 checks passed
@openshift-bot
Copy link
Contributor

openshift-bot commented Jan 31, 2025

[ART PR BUILD NOTIFIER]

Distgit: ose-cluster-openshift-apiserver-operator
This PR has been included in build ose-cluster-openshift-apiserver-operator-container-v4.19.0-202501311438.p0.g2583fad.assembly.stream.el9.
All builds following this will include this PR.

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

Reviewers

@benluddy benluddy Awaiting requested review from benluddy

1 more reviewer

@p0lyn0mial p0lyn0mial p0lyn0mial left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@p0lyn0mial p0lyn0mial

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. 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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@machine424 @openshift-ci-robot @p0lyn0mial @openshift-bot

Comments