Skip to content

Add step(), min() and max() in promql duration expressions #16777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Jul 2, 2025
Merged

Add step(), min() and max() in promql duration expressions #16777

merged 4 commits into from
Jul 2, 2025

Conversation

roidelapluie
Copy link
Member

No description provided.

@roidelapluie roidelapluie force-pushed the add-step-promql branch 5 times, most recently from 6253826 to ff7572c Compare June 26, 2025 12:00
@roidelapluie roidelapluie changed the title [WIP] Add step() in promql duration expressions Add step() in promql duration expressions Jun 26, 2025
@roidelapluie roidelapluie force-pushed the add-step-promql branch 3 times, most recently from b549206 to 140abe4 Compare June 26, 2025 12:50
@roidelapluie roidelapluie requested review from beorn7 and krajorama June 26, 2025 12:51
@roidelapluie roidelapluie marked this pull request as ready for review June 26, 2025 12:52
beorn7
beorn7 requested changes Jun 26, 2025
View reviewed changes
Copy link
Member

@beorn7 beorn7 left a comment

Choose a reason for hiding this comment

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

Thanks for doing this.

@roidelapluie
Copy link
Member Author

Thanks for doing this.

I have updated the PR with your comments.

@roidelapluie
Copy link
Member Author

Funnily enough, rate [5m x 5m] was parsed correctly.

Fixed by this PR too.

@roidelapluie roidelapluie force-pushed the add-step-promql branch 3 times, most recently from 0eeced5 to 532e386 Compare June 27, 2025 09:04
@roidelapluie roidelapluie mentioned this pull request Jun 27, 2025
Closed
darshanime
darshanime reviewed Jun 29, 2025
View reviewed changes
krajorama
krajorama reviewed Jun 30, 2025
View reviewed changes
Copy link
Member

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

Looks good, but I wonder if adding min/max was intentional?

If yes, please update PR description as well.

@roidelapluie roidelapluie force-pushed the add-step-promql branch 4 times, most recently from c4bdbb7 to 02cca53 Compare June 30, 2025 15:06
@roidelapluie roidelapluie changed the title Add step() in promql duration expressions Add step(), min() and max() in promql duration expressions Jun 30, 2025
@roidelapluie roidelapluie requested a review from krajorama June 30, 2025 15:20
krajorama
krajorama reviewed Jul 1, 2025
View reviewed changes
Copy link
Member

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

LGTM, just a couple of more unit test cases 2x2 and you're done I think

krajorama
krajorama approved these changes Jul 1, 2025
View reviewed changes
Copy link
Member

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

LGTM. I'm OK with this, especially since this is experimental and I'm not likely to spot random edge cases.

beorn7
beorn7 requested changes Jul 1, 2025
View reviewed changes
Copy link
Member

@beorn7 beorn7 left a comment

Choose a reason for hiding this comment

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

Just nit-picking left for documentation. Otherwise LGTM.

@roidelapluie
Add step(), min(a,b) and max(a,b) in promql duration expressions
ee7d515 
step() is a new keyword introduced to represent the query step width in duration expressions.

min(a,b) and max(a,b) return the min and max from two duration expressions.

Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
@roidelapluie
PromQL: min/max/step: add more tests
3af0bde 
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
@roidelapluie
PromQL: Fix printing +min()
984c8de 
Signed-off-by: Julien Pivotto <291750+roidelapluie@users.noreply.github.com>
@roidelapluie
PromQL: min/max/step: Address review comments
432f130 
Signed-off-by: Julien <291750+roidelapluie@users.noreply.github.com>
krajorama
krajorama approved these changes Jul 2, 2025
View reviewed changes
Copy link
Member

@krajorama krajorama left a comment

Choose a reason for hiding this comment

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

LGTM

@roidelapluie roidelapluie merged commit f62d0e0 into prometheus:main Jul 2, 2025
27 checks passed
This was referenced Jul 31, 2025
Closed
Open
Open
Open
@ringerc
Copy link
Contributor

ringerc commented Aug 1, 2025

Adding a quick summary of what's added here as best I can tell:

  • A new step() pseudo function that returns the step interval in float seconds of the current range-query step. It looks (unconfirmed) like this doesn't work in subqueries inside instant queries, and always returns the outermost query's step in range queries.
  • support for min() and max() in PromQL duration expressions guarded by --enable-feature=promql-duration-expr

@ringerc ringerc mentioned this pull request Aug 1, 2025
Open
@beorn7
Copy link
Member

beorn7 commented Aug 1, 2025

Yes, it returns the step parameter from the range query. This is deliberate. (You know the step for a sub query anyway as it is set in the very same query.)

@ringerc ringerc mentioned this pull request Aug 4, 2025
Open
@bboreham
Copy link
Member

Ref #15862 (comment) where step() was requested.

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

@beorn7 beorn7 beorn7 approved these changes

@krajorama krajorama krajorama approved these changes

+1 more reviewer

@darshanime darshanime darshanime left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@roidelapluie @ringerc @beorn7 @bboreham @darshanime @krajorama