Skip to content
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.

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

Rewrite subqueries that have the same range and resolution (#10445) #10459

Merged
merged 1 commit into from
Jan 16, 2025

Conversation

56quarters
Copy link
Contributor

  • Rewrite subqueries that have the same range and resolution

Fix queries that have the same range and resolution since this will only return a single point when using Prometheus 3 selectors, left open and right closed (compared to Prometheus 2 left closed and right closed).

  • Changelog

Signed-off-by: Nick Pillitteri nick.pillitteri@grafana.com


Signed-off-by: Nick Pillitteri nick.pillitteri@grafana.com
(cherry picked from commit b812677)

* Rewrite subqueries that have the same range and resolution

Fix queries that have the same range and resolution since this will
only return a single point when using Prometheus 3 selectors, left
open and right closed (compared to Prometheus 2 left closed and right
closed).

* Changelog

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>

---------

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
(cherry picked from commit b812677)
@56quarters 56quarters marked this pull request as ready for review January 16, 2025 17:12
@56quarters 56quarters requested review from tacole02 and a team as code owners January 16, 2025 17:12
@@ -28,6 +28,8 @@
* [BUGFIX] MQE: Fix deriv with histograms #10383
* [BUGFIX] PromQL: Fix <aggr_over_time> functions with histograms https://github.com/prometheus/prometheus/pull/15711 #10400
* [BUGFIX] MQE: Fix <aggr_over_time> functions with histograms #10400
* [BUGFIX] Distributor: return HTTP status 415 Unsupported Media Type instead of 200 Success for Remote Write 2.0 until we support it. #10423
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Might have messed up the cherry-pick here, but it's the changelog so it's harmless.

@56quarters 56quarters merged commit d5e7264 into r325 Jan 16, 2025
29 checks passed
@56quarters 56quarters deleted the backport-10445-to-r325 branch January 16, 2025 17:52
56quarters added a commit that referenced this pull request Jan 16, 2025
From feedback #10459 (comment)

Related #10445

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
56quarters added a commit that referenced this pull request Jan 16, 2025
* docs: Fix help text for query-frontend.prom2-range-compat flag

From feedback #10459 (comment)

Related #10445

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>

* Changelog

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>

---------

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants