Skip to content

Coalesce read configuration for recent data cutoff#6507

Merged
electron0zero merged 4 commits intografana:mainfrom
mapno:query-ingesters-until-cleanup
Feb 19, 2026
Merged

Coalesce read configuration for recent data cutoff#6507
electron0zero merged 4 commits intografana:mainfrom
mapno:query-ingesters-until-cleanup

Conversation

@mapno
Copy link
Copy Markdown
Contributor

@mapno mapno commented Feb 19, 2026

What this PR does:

query_frontend.search.query_ingesters_until is removed in favor of only query_frontend.search.query_backend_after. query_frontend.search.query_ingesters_until could be updated for v3.0 to reference live-stores, but having both parameters is. redundant.

This PR also contains a change to the tools image to support git worktrees.

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

`query_frontend.search.query_ingesters_until` is removed in favor of only `query_frontend.search.query_backend_after`
reqCh := make(chan pipeline.Request, s.cfg.IngesterShards+1)

// build request to search ingesters based on query_ingesters_until config and time range
// build request to search ingesters based on query_backend_after config and time range
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

There are still references to ingesters. I'm leaving them to not conflict with when this code is cleaned up.

@mapno
Copy link
Copy Markdown
Contributor Author

mapno commented Feb 19, 2026

@codex

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Delightful!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread build/tools.mk
ifneq ($(GIT_COMMON_DIR),.git)
WORKTREE_DOCKER_MOUNT := -v $(GIT_COMMON_DIR):$(GIT_COMMON_DIR)
endif
endif
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice change!

max_result_limit: 0
max_duration: 168h0m0s
query_backend_after: 15m0s
query_ingesters_until: 30m0s
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Is this definitely cleared out of JSonnet? Pods crashloop on unknown param IIRC

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I get only docs results for the config now.

Comment thread CHANGELOG.md Outdated
* [CHANGE] Remove all traces of ingesters from the dashboards [#6352](https://github.com/grafana/tempo/pull/6352) (@javiermolinar)
* [CHANGE] **BREAKING CHANGE** tempo-cli: Support relative time (now, now-1h) for start/end args and standardize on RFC3339 in all commands. [#6458](https://github.com/grafana/tempo/pull/6458) (@electron0zero)
`query search` command no longer accepts timestamps without timezone (e.g. `2024-01-01T00:00:00`), use RFC3339 (e.g. `2024-01-01T00:00:00Z`) or relative time instead.
* [CHANGE] **BREAKING CHANGE** Coalesce read configuration for recent data cutoff. `query_frontend.search.query_ingesters_until` is removed in favor of only `query_frontend.search.query_backend_after`. [#](https://github.com/grafana/tempo/pull/) (@mapno)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nit: "consolidate" is a better word in this context

@mapno mapno enabled auto-merge (squash) February 19, 2026 10:51
@electron0zero electron0zero enabled auto-merge (squash) February 19, 2026 10:57
@electron0zero electron0zero merged commit 3d600ca into grafana:main Feb 19, 2026
25 checks passed
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.

3 participants