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

fix(operator): Add missing groupBy label for all rules on OpenShift #14279

Merged
merged 4 commits into from
Sep 30, 2024

Conversation

periklis
Copy link
Collaborator

What this PR does / why we need it:
Routing of alerts in OCP managed Alertmanager instances requires all rules to be grouped by namespace. This fix renders in general all rule types to include the label by default.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

Copy link
Collaborator

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

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

Just minor comments overall lgtm

operator/internal/manifests/openshift/recordngrule.go Outdated Show resolved Hide resolved
operator/internal/manifests/openshift/recordngrule.go Outdated Show resolved Hide resolved
operator/internal/manifests/openshift/alertingrule.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

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

small nit but lgtm

operator/internal/manifests/openshift/recordingrule.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

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

lgtm

@periklis periklis merged commit ce7b2e8 into grafana:main Sep 30, 2024
69 checks passed
periklis added a commit to openshift/loki that referenced this pull request Sep 30, 2024
periklis added a commit to openshift/loki that referenced this pull request Oct 1, 2024
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.

2 participants