Skip to content

operations/mimir: Upstream Jsonnet changes from r334 #11602

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

Merged
merged 8 commits into from
Jun 4, 2025

Conversation

aknuds1
Copy link
Contributor

@aknuds1 aknuds1 commented Jun 2, 2025

What this PR does

Upstream operations/mimir Jsonnet changes from r334:

  1. Don't depend on Memcached on startup
  2. Set max buffered bytes in the Kafka client used by the ruler

The first is upstreamed through upgrading to latest dskit, in which the corresponding flag -dns-ignore-startup-failures's default changes to true. Therefore, we don't need to set the flag via Jsonnet any longer.

I've tested applying the PR's changes, and can see there are no differences versus our r334 cloud deployment (given that Jsonnet corresponding to change 1 is kept until the right Mimir release).

Which issue(s) this PR fixes or relates to

Fixes #

Checklist

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

@aknuds1 aknuds1 added the chore label Jun 2, 2025
@aknuds1 aknuds1 force-pushed the arve/upstream-jsonnet branch 5 times, most recently from 15b5caa to f3bff18 Compare June 2, 2025 12:11
@aknuds1 aknuds1 added the jsonnet label Jun 2, 2025
@aknuds1 aknuds1 marked this pull request as ready for review June 2, 2025 14:44
@aknuds1 aknuds1 requested a review from a team as a code owner June 2, 2025 14:44
@aknuds1 aknuds1 force-pushed the arve/upstream-jsonnet branch from 5a3180f to fdfefa1 Compare June 2, 2025 16:32
@aknuds1 aknuds1 force-pushed the arve/upstream-jsonnet branch from fdfefa1 to 3a35b7c Compare June 3, 2025 05:23
@aknuds1 aknuds1 requested a review from Copilot June 3, 2025 06:29
Copilot

This comment was marked as outdated.

@aknuds1 aknuds1 requested a review from charleskorn June 3, 2025 12:56
aknuds1 and others added 2 commits June 3, 2025 18:30
Co-authored-by: Taylor C <[email protected]>
Co-authored-by: Taylor C <[email protected]>
Copy link
Contributor

github-actions bot commented Jun 4, 2025

💻 Deploy preview deleted.

Signed-off-by: Arve Knudsen <[email protected]>
@aknuds1 aknuds1 force-pushed the arve/upstream-jsonnet branch from b8fb399 to da6795c Compare June 4, 2025 06:00
@aknuds1 aknuds1 requested review from Copilot and 56quarters June 4, 2025 06:00
@aknuds1 aknuds1 marked this pull request as ready for review June 4, 2025 06:00
@aknuds1 aknuds1 requested a review from stevesg as a code owner June 4, 2025 06:00
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR applies upstream Jsonnet changes from r334 to the operations/mimir component, addressing Memcached dependency on startup and configuring the Kafka client for the ruler. Key changes include:

  • Conditionally adding a Kafka producer buffered-bytes setting in the ruler configuration based on ingest storage.
  • Consistently updating test files to include the new Kafka configuration parameter.
  • Updating default values in documentation, help text, and config descriptors for Memcached DNS resolution.

Reviewed Changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
operations/mimir/ruler.libsonnet Adds a conditional block to set Kafka producer-max-buffered-bytes when ingest storage is enabled.
operations/mimir-tests/*.yaml (multiple files) Each test file now includes the new Kafka producer-max-buffered-bytes configuration parameter.
go.mod Updates the dependency for github.com/grafana/dskit to a newer commit.
docs/sources/mimir/configure/configuration-parameters/index.md Updates the default value for dns-ignore-startup-failures to true.
cmd/mimir/help-all.txt.tmpl Updates help text to reflect the new default value for dns-ignore-startup-failures.
cmd/mimir/config-descriptor.json Updates configuration descriptors to reflect the new default value for dns-ignore-startup-failures.
CHANGELOG.md Adds entries to document the changes made in this PR.
Comments suppressed due to low confidence (1)

operations/mimir/ruler.libsonnet:34

  • There is a typo in the comment ('ot he ingester' should be 'to the ingester').
// Increased from 2s to 10s in order to accommodate writing large rule results ot he ingester.

@aknuds1 aknuds1 enabled auto-merge (squash) June 4, 2025 06:26
@aknuds1 aknuds1 merged commit d52663f into main Jun 4, 2025
32 checks passed
@aknuds1 aknuds1 deleted the arve/upstream-jsonnet branch June 4, 2025 06:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants