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

User-configurable overrides: add scope query parameter to return merged overrides for tenant #2915

Merged
merged 4 commits into from
Sep 22, 2023

Conversation

yvrhdn
Copy link
Member

@yvrhdn yvrhdn commented Sep 11, 2023

What this PR does:
Add a query parameter scope to the GET request.

GET /api/overrides?scope=api

Default behaviour: returns overrides stored by the API

GET /api/overrides?scope=merged

New behaviour: returns the merged overrides, these are actually used by Tempo.

Note: there is a delay between storing the overrides and them showing up in the merged result since we populate this through polling. I think this is fine but it might cause confusion if people immediately poll their overrides after setting them.
Thoughts?

Which issue(s) this PR fixes:
Fixes #

Checklist

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

@yvrhdn yvrhdn force-pushed the kvrhdn/overrides-api-merged branch from e3e12fd to 1aa1eea Compare September 13, 2023 16:24
@yvrhdn yvrhdn marked this pull request as ready for review September 13, 2023 16:29
@yvrhdn yvrhdn enabled auto-merge (squash) September 22, 2023 16:09
@yvrhdn yvrhdn merged commit c031394 into grafana:main Sep 22, 2023
@yvrhdn yvrhdn deleted the kvrhdn/overrides-api-merged branch September 22, 2023 16:24
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