Skip to content

[monitoring] Drop legacy label condition. - #826

Merged
Andrei Kvapil (kvaps) merged 2 commits into
cozystack:mainfrom
xy2:265-drop-docker-label
Apr 22, 2025
Merged

[monitoring] Drop legacy label condition.#826
Andrei Kvapil (kvaps) merged 2 commits into
cozystack:mainfrom
xy2:265-drop-docker-label

Conversation

@xy2

@xy2 xy2 commented Apr 19, 2025 •
edited by NickVolynkin
Loading

Copy link
Copy Markdown
Contributor

ref: https://github.com/deckhouse/deckhouse/pull/960/files

Summary by CodeRabbit

  • Refactor
    • Updated dashboard metrics filters to exclude containers with empty names instead of specifically excluding containers named "POD". This change applies to all relevant CPU, memory, network, and storage metrics across capacity planning, controller, namespace, namespaces, and pod dashboards. No other dashboard functionality or structure was changed.

Backported to v0.30 in #852

@coderabbitai

coderabbitai Bot commented Apr 19, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Warning

Rate limit exceeded

Andrei Kvapil (@kvaps) has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 6 minutes and 53 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between 6d8a992 and 405863c.

📒 Files selected for processing (1)
  • dashboards/flux/flux-control-plane.json (1 hunks)

Walkthrough

This update modifies several dashboard JSON files by changing the Prometheus query filter condition from container!="POD" to container!="" across all relevant metrics queries. This adjustment is applied consistently to queries involving CPU, memory, network, filesystem, and other container-related metrics. The change broadens the exclusion to filter out containers with empty names instead of only those named "POD". No other structural, logical, or control flow changes are introduced, and no exported or public entities are affected.

Changes

File(s) Change Summary
dashboards/main/capacity-planning.json Replaced all container!="POD" filters with container!="" in Prometheus queries for container metrics.
dashboards/main/controller.json Updated Prometheus queries to use container!="" instead of container!="POD" for all container metrics.
dashboards/main/namespace.json Modified queries to exclude empty container names (container!="") instead of only "POD".
dashboards/main/namespaces.json Changed all container filters from container!="POD" to container!="" in panel queries.
dashboards/main/pod.json Updated all Prometheus queries to use container!="" instead of container!="POD" for container metrics.

Poem

In dashboards bright, a subtle sweep,
"POD" is gone, but not too deep.
Now empty names are shown the door,
Our metrics count just a bit more.
The queries hum, the panels gleam—
A tidy change, a data stream!
🐇✨

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ 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.

kvaps
Andrei Kvapil (kvaps) approved these changes Apr 22, 2025
View reviewed changes

@kvaps Andrei Kvapil (kvaps) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@xy2 @kvaps
Drop legacy label condition.
6d8a992 
Signed-off-by: Denis Seleznev <[email protected]>
@kvaps Andrei Kvapil (kvaps) changed the title Drop legacy label condition. [monitoring] Drop legacy label condition. Apr 22, 2025
kvaps
Andrei Kvapil (kvaps) approved these changes Apr 22, 2025
View reviewed changes

@kvaps Andrei Kvapil (kvaps) left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you.
Just added similar fix for FluxCD dashboard

@kvaps
Andrei Kvapil (kvaps) merged commit 277b438 into cozystack:main Apr 22, 2025
@kvaps Andrei Kvapil (kvaps) added the kind/backport Categorizes issue or PR as requiring a backport to the current release line label Apr 22, 2025
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @NickVolynkin
[monitoring] Drop legacy label condition. (#826)
90b9988 
ref: https://github.com/deckhouse/deckhouse/pull/960/files

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->

(cherry picked from commit 277b438)
Signed-off-by: Nick Volynkin <[email protected]>
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @klinch0 @NickVolynkin
[monitoring] Drop legacy label condition.
2e352cd 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Co-authored-by: kklinch0 <[email protected]>
Signed-off-by: Nick Volynkin <[email protected]>
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @NickVolynkin
[monitoring] Drop legacy label condition.
651d6b0 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Signed-off-by: kklinch0 <[email protected]>
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @NickVolynkin
[monitoring] Drop legacy label condition. (#826)
ed078da 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Signed-off-by: kklinch0 <[email protected]>
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @xy2 @NickVolynkin
[monitoring] Drop legacy label condition. (#826)
445b985 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Co-authored-by: Denis Seleznev <[email protected]>
Signed-off-by: Nick Volynkin <[email protected]>
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @xy2 @NickVolynkin
[monitoring] Drop legacy label condition. (#826)
7158b85 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Co-authored-by: Denis Seleznev <[email protected]>
Signed-off-by: Nick Volynkin <[email protected]>
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @xy2 @NickVolynkin
[monitoring] Drop legacy label condition. (#826)
18f09bf 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Co-authored-by: Denis Seleznev <[email protected]>
Signed-off-by: Nick Volynkin <[email protected]>
Nick Volynkin (NickVolynkin) pushed a commit that referenced this pull request Apr 23, 2025
@kvaps @xy2 @NickVolynkin
[monitoring] Drop legacy label condition. (#826)
b70df68 
Backport of #826

Updated dashboard metrics filters to exclude containers with empty
names instead of specifically excluding containers named "POD". This
change applies to all relevant CPU, memory, network, and storage metrics
across capacity planning, controller, namespace, namespaces, and pod
dashboards. No other dashboard functionality or structure was changed.

(cherry picked from commit 277b438)

Co-authored-by: Denis Seleznev <[email protected]>
Signed-off-by: Nick Volynkin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kvaps Andrei Kvapil (kvaps) kvaps approved these changes
@lllamnyp Timofei Larkin (lllamnyp) Awaiting requested review from lllamnyp lllamnyp is a code owner
@klinch0 klinch0 Awaiting requested review from klinch0

Assignees

No one assigned

Labels

kind/backport Categorizes issue or PR as requiring a backport to the current release line

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@xy2 @kvaps