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

Merge release-2.48 back into main #13089

Merged
merged 14 commits into from
Nov 2, 2023
Merged

Merge release-2.48 back into main #13089

merged 14 commits into from
Nov 2, 2023

Conversation

beorn7
Copy link
Member

@beorn7 beorn7 commented Nov 2, 2023

roidelapluie and others added 14 commits November 1, 2023 15:34
Add the ability to track staleness when an explicit timestamp is set.
Useful for cAdvisor.

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
scrape: Added trackTimestampsStaleness configuration option
Signed-off-by: Levi Harrison <git@leviharrison.dev>
…d check MinTime

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
…hunks, including mixed chunks

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
…ntervals for histogram chunks as well as time-overlapping chunks

Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Add testcase and update test so that it can test native histograms as well.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
@beorn7 beorn7 merged commit 79f4e45 into main Nov 2, 2023
40 checks passed
@beorn7 beorn7 deleted the beorn7/release branch November 2, 2023 19:43
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.

None yet

6 participants