bugfix/monitoring add nil checker

[klinch0]

Summary by CodeRabbit

• Version Update
  • Monitoring application version updated from 1.6.1 to 1.6.2
• Configuration Improvements
  • Enhanced resource configuration checks for VM cluster components
  • Improved handling of resource definitions to prevent potential errors

[coderabbitai]

Walkthrough

This pull request focuses on updating the monitoring package version from 1.6.1 to 1.6.2. The changes involve modifying the Chart.yaml file to increment the version number, updating the version mapping in the versions_map file, and refining the resource configuration logic in the vmcluster.yaml template. The modifications aim to improve the robustness of resource definition checks and track the specific commit associated with the version update.

Changes

File	Change Summary
packages/extra/monitoring/Chart.yaml	Version bumped from 1.6.1 to 1.6.2
packages/extra/monitoring/templates/vm/vmcluster.yaml	Enhanced conditional logic for resource configurations using hasKey function
packages/extra/versions_map	Updated monitoring 1.6.1 to specific commit hash and added monitoring 1.6.2 entry

Possibly related PRs

• enablePodMonitor #572: Update to Chart.yaml file with monitoring application version increment

Suggested labels

size:S

Suggested reviewers

• kvaps

Poem

🐰 Monitoring's version takes a hop,
From 1.6.1 to 1.6.2, non-stop!
Resources checked with careful might,
Ensuring configs are clean and tight.
A rabbit's update, precise and neat,
Making monitoring's journey complete! 🚀

---

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

• X
• Mastodon
• Reddit
• LinkedIn

🪧 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. (Beta)
• @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.

[coderabbitai]

Actionable comments posted: 0

🧹 Nitpick comments (1)

packages/extra/monitoring/templates/vm/vmcluster.yaml (1)

Line range hint 13-53: Consider reducing duplication in resource configuration blocks.

The resource configuration blocks for vminsert, vmselect, and vmstorage follow identical patterns. Consider extracting this into a named template to reduce duplication and improve maintainability.

Example refactor:

{{- define "monitoring.componentResources" }}
  {{- if and (hasKey . "component") (hasKey .component "resources") }}
  {{- toYaml .component.resources | nindent 6 }}
  {{- else }}
  limits:
    memory: {{ .defaultMemoryLimit }}
  requests:
    cpu: 100m
    memory: 500Mi
  {{- end }}
{{- end }}

Usage:

vminsert:
  replicaCount: 2
  resources:
    {{- include "monitoring.componentResources" (dict "component" .vminsert "defaultMemoryLimit" "1000Mi") | nindent 4 }}

🧰 Tools

🪛 yamllint (1.35.1)

[warning] 15-15: wrong indentation: expected 4 but found 6

(indentation)

---

[warning] 16-16: wrong indentation: expected 4 but found 6

(indentation)

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between 4e68e65 and 4101a12.

📒 Files selected for processing (3)

• packages/extra/monitoring/Chart.yaml (1 hunks)
• packages/extra/monitoring/templates/vm/vmcluster.yaml (2 hunks)
• packages/extra/versions_map (1 hunks)

✅ Files skipped from review due to trivial changes (1)

• packages/extra/monitoring/Chart.yaml

🧰 Additional context used

🪛 yamllint (1.35.1)

packages/extra/monitoring/templates/vm/vmcluster.yaml

[warning] 15-15: wrong indentation: expected 4 but found 6

(indentation)

---

[warning] 16-16: wrong indentation: expected 4 but found 6

(indentation)

🔇 Additional comments (4)

packages/extra/versions_map (1)

25-26: LGTM! Version mappings are properly updated.

The version mappings follow the established pattern and maintain chronological order:

• Version 1.6.1 is correctly mapped to commit 3bb9759
• Version 1.6.2 is appropriately marked as HEAD

packages/extra/monitoring/templates/vm/vmcluster.yaml (3)

13-14: LGTM! Robust nil checking for vminsert resources.

The double hasKey check properly validates both the vminsert component and its resources exist before attempting to use them.

---

25-26: LGTM! Robust nil checking for vmselect resources.

The double hasKey check properly validates both the vmselect component and its resources exist before attempting to use them.

---

51-52: LGTM! Robust nil checking for vmstorage resources.

The double hasKey check properly validates both the vmstorage component and its resources exist before attempting to use them.

[kvaps]

LGTM