Skip to content

fix: add release labels to servicemonitors#1880

Merged
tommartensen merged 1 commit into
masterfrom
tm/fix-prometheusrule
Jul 13, 2026
Merged

fix: add release labels to servicemonitors#1880
tommartensen merged 1 commit into
masterfrom
tm/fix-prometheusrule

Conversation

@tommartensen

@tommartensen tommartensen commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Proof:

Screenshot 2026-07-13 at 11 13 58

(deployed to dev.infra.rox.systems and triggered a failed cluster)

Currently, Info level alerts (like cluster failures) are not sent to Slack because of the InfoInhibitor. I think this is fine for now, as we battle with the cluster provisioning issues.
We should provide more specific alerts for the infra service and argo deployment later.

@tommartensen tommartensen self-assigned this Jul 13, 2026
@coderabbitai

coderabbitai Bot commented Jul 13, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

Changes

Monitoring template behavior

Layer / File(s) Summary
Workflow alert label updates
chart/infra-server/templates/monitoring/rules.yaml
Workflow Error and Workflow Failure alert queries now filter argo_workflows_gauge by phase while retaining the five-minute increase conditions.
Conditional metrics service rendering
chart/infra-server/templates/monitoring/services.yaml
Metrics Service definitions render only when .Values.monitoring.enabled is true.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning The title mentions release labels on servicemonitors, but the changes update monitoring alerts and gate metrics services on monitoring.enabled. Rename the title to reflect the monitoring changes, e.g. "fix: update monitoring alerts and conditionally render metrics services".
✅ Passed checks (4 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description check ✅ Passed The description is related to alerting and cluster failures, which matches the monitoring-focused changes.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch tm/fix-prometheusrule

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

Comment @coderabbitai help to get the list of available commands.

@rhacs-bot

Copy link
Copy Markdown
Contributor

A single node development cluster (infra-pr-1880) was allocated in production infra for this PR.

CI will attempt to deploy quay.io/rhacs-eng/infra-server: to it.

🔌 You can connect to this cluster with:

gcloud container clusters get-credentials infra-pr-1880 --zone us-central1-a --project acs-team-temp-dev

🛠️ And pull infractl from the deployed dev infra-server with:

nohup kubectl -n infra port-forward svc/infra-server-service 8443:8443 &
make pull-infractl-from-dev-server

🔓 You must go to to export an . Your token from the prod infra instance will not work with dev environments.

🚲 You can then use the dev infra instance e.g.:

bin/infractl -k -e localhost:8443 whoami

⚠️ Any clusters that you start using your dev infra instance should have a lifespan shorter then the development cluster instance. Otherwise they will not be destroyed when the dev infra instance ceases to exist when the development cluster is deleted. ⚠️

Further Development

☕ If you make changes, you can commit and push and CI will take care of updating the development cluster.

🚀 If you only modify configuration (chart/infra-server/configuration) or templates (chart/infra-server/{static,templates}), you can get a faster update with:

make helm-deploy

Logs

Logs for the development infra depending on your @redhat.com authuser:

Or:

kubectl -n infra logs -l app=infra-server --tail=1 -f

@tommartensen tommartensen marked this pull request as ready for review July 13, 2026 09:15
@tommartensen tommartensen requested review from a team and rhacs-bot as code owners July 13, 2026 09:15

@davdhacs davdhacs left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm

@tommartensen tommartensen merged commit a7a8b93 into master Jul 13, 2026
12 checks passed
@tommartensen tommartensen deleted the tm/fix-prometheusrule branch July 13, 2026 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants