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

[r306] OTLP: Convert start timestamps to Prom created timestamps #9178

Merged
merged 1 commit into from
Sep 2, 2024

Conversation

grafanabot
Copy link
Contributor

Backport b58a08b from #9131

* OTLP: Convert start timestamps to Mimir created timestamps

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* bump to latest mimir-prometheus

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>

* make use of annotations

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Co-authored-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
(cherry picked from commit b58a08b)
Copy link
Contributor

@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.

no conflict backport

@krajorama krajorama enabled auto-merge (squash) September 2, 2024 13:44
@krajorama krajorama merged commit 28db790 into r306 Sep 2, 2024
31 checks passed
@krajorama krajorama deleted the backport-9131-to-r306 branch September 2, 2024 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants