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

Escape mustaches in prometheus rules for Helm. #645

Merged
merged 2 commits into from
Feb 27, 2025
Merged

Conversation

xy2
Copy link
Contributor

@xy2 xy2 commented Feb 24, 2025

Summary by CodeRabbit

  • New Features
    • Introduced a dynamic alert configuration system that aggregates multiple alert settings into a single, streamlined document for easier management.

@xy2 xy2 requested a review from kvaps as a code owner February 24, 2025 15:42
@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label Feb 24, 2025
Copy link
Contributor

coderabbitai bot commented Feb 24, 2025

Walkthrough

A new template file alerts.yaml has been added to the Kafka operator package. This template uses Helm's templating language to dynamically search for and include all YAML files from the alerts directory. For each file found, it adds a comment noting the source path and converts the file's content to a string for inclusion. This change aggregates multiple alert configurations into a single YAML output.

Changes

File(s) Change Summary
packages/system/kafka-operator/templates/alerts.yaml New template file that uses Helm's glob to integrate all YAML files from the alerts directory, adding source path comments.

Sequence Diagram(s)

sequenceDiagram
    participant H as Helm CLI
    participant T as alerts.yaml Template
    participant G as Glob Matcher
    participant F as Alert Files
    participant O as Aggregated YAML Output

    H->>T: Execute helm template command
    T->>G: Search for "alerts/*.yaml"
    G->>F: Return matching alert files
    T->>F: Read file content and add source comments
    T->>O: Aggregate all file contents
    O-->>H: Render complete YAML document
Loading

Poem

Oh, I’m a rabbit, leaping with glee,
In a code field, as spry as can be.
Alerts hop in from files afar,
Gathered in YAML, a shining star.
With each line a joyful jig,
I celebrate changes quick as a twig!
🐇 Happy hops to our new config gig!


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@dosubot dosubot bot added the enhancement New feature or request label Feb 24, 2025
Copy link
Member

@kvaps kvaps left a comment

Choose a reason for hiding this comment

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

We usually solve this by importing alerts from the separated alerts directory

https://github.com/aenix-io/cozystack/blob/main/packages/system/postgres-operator/templates/alerts.yaml

Could you please update PR to use the similar logic?

@xy2 xy2 marked this pull request as draft February 25, 2025 09:10
@xy2 xy2 marked this pull request as ready for review February 27, 2025 12:03
@dosubot dosubot bot added size:XS This PR changes 0-9 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Feb 27, 2025
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Nitpick comments (1)
packages/system/kafka-operator/templates/alerts.yaml (1)

1-1: YAML Linter Compatibility Note

Since this file is a Helm template, YAML linter errors (such as the one reported on line 1) may occur because of the templating syntax. Consider adding an appropriate YAML linter disable comment (or configuring your linter accordingly) to avoid false positives.

🧰 Tools
🪛 YAMLlint (1.35.1)

[error] 1-1: syntax error: expected the node content, but found '-'

(syntax)

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 9f07563 and 303a062.

📒 Files selected for processing (1)
  • packages/system/kafka-operator/templates/alerts.yaml (1 hunks)
🧰 Additional context used
🪛 YAMLlint (1.35.1)
packages/system/kafka-operator/templates/alerts.yaml

[error] 1-1: syntax error: expected the node content, but found '-'

(syntax)

{{- range $path, $file := $files }}
---
# from: {{ $path }}
{{ toString $file }}
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Escape Mustaches in Alert File Contents

To prevent Helm from misinterpreting Prometheus rule mustaches within the alert files, pipe the file content through a replacement function. For example, using Sprig’s replace function, convert each opening and closing mustache into an escaped version. This ensures that the raw alert definitions (which likely contain mustache syntax) are rendered literally.

Below is a proposed diff change for line 5:

-{{ toString $file }}
+{{ toString $file | replace "{{" "{{\"{{\"}}" | replace "}}" "{{\"}}\"}}" }}

This diff replaces all occurrences of {{ with {{"{{"}} and }} with {{"}}"}}, which should effectively escape the mustaches.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{{ toString $file }}
{{ toString $file | replace "{{" "{{\"{{\"}}" | replace "}}" "{{\"}}\"}}" }}

Copy link
Member

@kvaps kvaps left a comment

Choose a reason for hiding this comment

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

LGTM

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Feb 27, 2025
@kvaps kvaps merged commit 79eadda into aenix-io:main Feb 27, 2025
1 check passed
@xy2 xy2 deleted the mustaches branch February 27, 2025 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request lgtm This PR has been approved by a maintainer size:XS This PR changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants