Sync upstream at ab1b1db #880
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: carrychair <linghuchong404@gmail.com>
Signed-off-by: machine424 <ayoubmrini424@gmail.com>
…rences Signed-off-by: machine424 <ayoubmrini424@gmail.com>
* ci: address zizmor gh action vulnerabilities --------- Signed-off-by: Joe Harvey <51208233+jharvey10@users.noreply.github.com> Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Add support for promoting all OTel resource attributes via `promote_all_resource_attributes`, except for those ignored using 'ignore_resource_attributes'. --------- Signed-off-by: Antonio Jimenez <antonjim@thousandEyes.com> Signed-off-by: Antonio Jimenez <123171955+antonjim-te@users.noreply.github.com>
Builds over prometheus/prometheus#16462 Addresses comments, adds invalid rules file Signed-off-by: subhramit <subhramit.bb@live.in> Co-authored-by: marcodebba <marcodebonis74@gmail.com>
fix: add reproducer for a dangling-reference issue in parsers and fix
…ling tests (#16200) * chore: Add comment about DNS resolution issue for failing tests Signed-off-by: zhengkezhou1 <madzhou1@gmail.com> * remove unexported-return Signed-off-by: zhengkezhou1 <madzhou1@gmail.com> --------- Signed-off-by: zhengkezhou1 <madzhou1@gmail.com>
Signed-off-by: carrychair <linghuchong404@gmail.com>
Signed-off-by: tongjicoder <tongjicoder@icloud.com>
chore: fix some comments
…f `WithSegmentSize` not called (#16635) * tsdb: fix issue where a new segment file is created for every chunk Signed-off-by: Charles Korn <charles.korn@grafana.com> * Address PR feedback Signed-off-by: Charles Korn <charles.korn@grafana.com> --------- Signed-off-by: Charles Korn <charles.korn@grafana.com>
# Conflicts: # .github/workflows/buf-lint.yml # .github/workflows/buf.yml # .github/workflows/ci.yml # .github/workflows/codeql-analysis.yml # .github/workflows/container_description.yml # .github/workflows/fuzzing.yml # .github/workflows/prombench.yml # .github/workflows/repo_sync.yml # storage/remote/otlptranslator/prometheusremotewrite/helper_test.go # storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go
|
|
jhalterman
approved these changes
May 30, 2025
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
May 30, 2025
1 task
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Jun 2, 2025
* Update mimir-prometheus * Replace references to `InstanceName` removed in prometheus/prometheus#16228 * Fix native histogram mangling behaviour to be compatible with prometheus/prometheus#16565 * Make build tags consistent with Prometheus * Update MQE tests to match upstream * Reinstate test cases that were skipped due to upstream issues * Bring in changes from grafana/mimir-prometheus#880 * Add changelog entries * Regenerate OTLP files * Fix breaking change * Update upstream tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Diff: prometheus/prometheus@14fc57e...ab1b1db
New features
Bug fixes
WithSegmentSizenot called prometheus/prometheus#16635Refactoring and code cleanup
Non-production code changes
Changes not relevant to Mimir