Skip to content

fix(base-cluster/deadMansSwitch): fix alertmanager healthchecks URL#2019

Merged
cwrau merged 2 commits intomainfrom
fix/base-cluster/add-missing-monitoring-suffix
Mar 13, 2026
Merged

fix(base-cluster/deadMansSwitch): fix alertmanager healthchecks URL#2019
cwrau merged 2 commits intomainfrom
fix/base-cluster/add-missing-monitoring-suffix

Conversation

@cwrau
Copy link
Copy Markdown
Member

@cwrau cwrau commented Mar 13, 2026

Summary by CodeRabbit

  • Bug Fixes

    • Improved health check resource cleanup to ensure monitoring resources are consistently removed regardless of configuration state
  • Chores

    • Updated health check naming convention and standardized identifiers across monitoring components
    • Modified alertmanager webhook configuration to use unified health check naming format across all monitoring systems

Copilot AI review requested due to automatic review settings March 13, 2026 10:35
@cwrau cwrau enabled auto-merge March 13, 2026 10:35
@gemini-code-assist
Copy link
Copy Markdown

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses an issue with the Alertmanager healthchecks URL by standardizing the naming convention for dead man's switch checks across various Kubernetes configurations. The changes ensure that both scheduling and monitoring healthcheck URLs are consistently formatted, improving the reliability of the monitoring system and preventing potential misconfigurations. Additionally, the unregistration process for these checks has been made more robust.

Highlights

  • Standardized Healthcheck URLs: Updated the healthcheck URL generation logic across cronjob and Alertmanager configurations to ensure consistent naming, specifically for scheduling and monitoring checks.
  • Improved Dead Man's Switch Unregistration: Enhanced the unregistration script for the dead man's switch by ensuring the monitoring check deletion is always attempted and fails gracefully, regardless of Prometheus enablement.
Changelog
  • charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml
    • Updated the hc-ping.com URL to use the base-cluster.deadMansSwitch.checkName template for consistent naming of the scheduling check.
  • charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml
    • Removed the conditional if .Values.monitoring.prometheus.enabled block around the deleteCheck "$checkName-monitoring" command.
    • Added || true to the deleteCheck "$checkName-monitoring" command to ensure the script continues execution even if the deletion fails.
  • charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
    • Modified the hc-ping.com webhook URL to explicitly append -monitoring to the check name, aligning it with the intended monitoring check.
Activity
  • No specific activity has been recorded for this pull request yet.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 13, 2026

Warning

Rate limit exceeded

@cwrau has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 17 minutes and 43 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.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: e271b453-2c84-43e0-8b1d-2b83bc0c0ce2

📥 Commits

Reviewing files that changed from the base of the PR and between 9cd529d and 7772579.

📒 Files selected for processing (3)
  • charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml
  • charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml
  • charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
📝 Walkthrough

Walkthrough

This pull request updates health check naming conventions across monitoring templates in the base-cluster Helm chart. The changes introduce a consistent "-monitoring" suffix pattern for alertmanager health checks and simplify the deletion logic to always attempt removing monitoring checks regardless of Prometheus enablement status.

Changes

Cohort / File(s) Summary
Health Check Naming Conventions
charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml, charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml, charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml
Updates health check URL paths to use standardized check names with "-monitoring" suffix appended to the check name variable in three locations. Additionally, changes the unregister script to unconditionally attempt deletion of monitoring health checks with error suppression, removing the previous Prometheus enablement condition.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested labels

base-cluster

Suggested reviewers

  • tasches
  • marvinWolff
  • teutonet-bot

Poem

🐰 The health checks now align so fine,
With "-monitoring" appended to each line,
The watchdog cronjobs sing in perfect key,
While alertmanager checks dance wild and free! 🔔✨

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: fixing the alertmanager healthchecks URL in the dead man's switch monitoring configuration by adding the missing '-monitoring' suffix.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch fix/base-cluster/add-missing-monitoring-suffix
📝 Coding Plan
  • Generate coding plan for human review comments

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 and usage tips.

Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request aims to fix the health check URLs for the dead man's switch. The changes in cronjob.yaml and _alertmanager-config.yaml correctly align the check names, using a helper for consistency and adding the -monitoring suffix for the alertmanager check. However, the change in unregister.yaml has a critical issue. While it correctly attempts to make the cleanup process more robust by always trying to delete the monitoring check, it calls the deleteCheck function which is currently broken due to a typo in a variable name. The addition of || true will silence the error, leading to the cleanup job succeeding without actually deleting the health check. I've added a specific comment with more details.

Comment thread charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml Outdated
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Updates the base-cluster Helm chart’s Dead Man’s Switch / Healthchecks integration to use consistent check slugs, ensuring Alertmanager pings the intended “monitoring” check.

Changes:

  • Fix Alertmanager’s Healthchecks ping URL to target the *-monitoring check slug.
  • Align the scheduling CronJob ping URL to use the shared deadMansSwitch.checkName helper.
  • Make the pre-delete unregister job attempt deletion of the monitoring check unconditionally (and tolerate failures).

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
charts/base-cluster/templates/monitoring/kube-prometheus-stack/_alertmanager-config.yaml Adjusts Alertmanager webhook ping URL to use the -monitoring check slug.
charts/base-cluster/templates/monitoring/deadMansSwitch/cronjob.yaml Uses the shared check-name helper when constructing the scheduling ping URL.
charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml Changes unregister behavior to always attempt monitoring check deletion and ignore failures.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

Comment thread charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml Outdated
Comment thread charts/base-cluster/templates/monitoring/deadMansSwitch/unregister.yaml Outdated
@cwrau cwrau force-pushed the fix/base-cluster/add-missing-monitoring-suffix branch from c4bd183 to 0e11750 Compare March 13, 2026 10:46
@cwrau cwrau force-pushed the fix/base-cluster/add-missing-monitoring-suffix branch from 0e11750 to 7772579 Compare March 13, 2026 10:46
@cwrau cwrau added this pull request to the merge queue Mar 13, 2026
Merged via the queue into main with commit d874a56 Mar 13, 2026
20 checks passed
@cwrau cwrau deleted the fix/base-cluster/add-missing-monitoring-suffix branch March 13, 2026 11:22
github-merge-queue Bot pushed a commit that referenced this pull request Mar 17, 2026
🤖 I have created a release *beep* *boop*
---


##
[11.1.0](base-cluster-v11.0.1...base-cluster-v11.1.0)
(2026-03-16)


### Features

* **base-cluster/ingress:** add auto detection of need for proxy
protocol
([#1951](#1951))
([a94de1a](a94de1a))
* **base-cluster/ingress:** allow external ingress controller
([#1859](#1859))
([1442431](1442431))
* **base-cluster/kyverno:** allow setting kyverno resources
([#1986](#1986))
([71b9db4](71b9db4))
* **base-cluster/monitoring:** add alert about base-cluster updates
([#1937](#1937))
([a3c63a7](a3c63a7))
* **base-cluster/monitoring:** add alert about deprecated APIs
([#2021](#2021))
([cb334dd](cb334dd))


### Bug Fixes

* **base-cluster/deadMansSwitch:** fix alertmanager healthchecks URL
([#2019](#2019))
([d874a56](d874a56))
* **base-cluster/ingress:** disable traefik apiCheck
([#1902](#1902))
([d45bd69](d45bd69))
* **base-cluster/ingress:** they now have the redirections nested under
http
([#1952](#1952))
([dca2502](dca2502))
* **base-cluster/monitoring:** adjust for short-lived certificates
([#1921](#1921))
([41062b2](41062b2))
* **base-cluster/monitoring:** only roll out alloy tracing ports if
enabled
([#2005](#2005))
([ea44c4d](ea44c4d))
* **base-cluster:** Revert "chore(base-cluster/dependencies): update
helm release traefik to v39
([#1936](#1936))"
([#1954](#1954))
([5d2ae36](5d2ae36))


### Miscellaneous Chores

* **base-cluster/dependencies:** update common docker tag to v1.8.0
([#1939](#1939))
([38b1c7e](38b1c7e))
* **base-cluster/dependencies:** update docker.io/curlimages/curl docker
tag to v8.18.0
([#1896](#1896))
([f046977](f046977))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.0.13
([#1885](#1885))
([474e903](474e903))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.2.3
([#1897](#1897))
([84b647b](84b647b))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.3.0
([#1922](#1922))
([ef6f80f](ef6f80f))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.4.0
([#1931](#1931))
([50171d8](50171d8))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.5.0
([#1968](#1968))
([ee276e2](ee276e2))
* **base-cluster/dependencies:** update
docker.io/grafana/grafana-image-renderer docker tag to v5.5.1
([#1988](#1988))
([f765f5e](f765f5e))
* **base-cluster/dependencies:** update docker.io/vladgh/gpg docker tag
to v1.3.7
([#1886](#1886))
([4b2c33b](4b2c33b))
* **base-cluster/dependencies:** update helm release alloy to v1.5.2
([#1891](#1891))
([41b25e9](41b25e9))
* **base-cluster/dependencies:** update helm release alloy to v1.5.3
([#1949](#1949))
([d8bda90](d8bda90))
* **base-cluster/dependencies:** update helm release alloy to v1.6.0
([#1975](#1975))
([76632e4](76632e4))
* **base-cluster/dependencies:** update helm release external-dns to
v1.20.0
([#1905](#1905))
([ff53477](ff53477))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v80.13.3
([#1892](#1892))
([9775868](9775868))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v80.14.4
([#1906](#1906))
([f62458d](f62458d))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81
([#1923](#1923))
([9e9915d](9e9915d))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.2.1
([#1934](#1934))
([30fa0dd](30fa0dd))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.3.2
([#1950](#1950))
([95a9398](95a9398))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.5.0
([#1962](#1962))
([1a9bab8](1a9bab8))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.5.2
([#1982](#1982))
([07c2249](07c2249))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v81.6.6
([#1989](#1989))
([2bf4f3c](2bf4f3c))
* **base-cluster/dependencies:** update helm release
kube-prometheus-stack to v82
([#1995](#1995))
([45ef213](45ef213))
* **base-cluster/dependencies:** update helm release loki to v6.49.0
([#1908](#1908))
([f36dd6d](f36dd6d))
* **base-cluster/dependencies:** update helm release loki to v6.51.0
([#1928](#1928))
([6ac27d6](6ac27d6))
* **base-cluster/dependencies:** update helm release loki to v6.53.0
([#1974](#1974))
([0bc6e68](0bc6e68))
* **base-cluster/dependencies:** update helm release oauth2-proxy to v10
([#1913](#1913))
([7e551b5](7e551b5))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.1
([#1944](#1944))
([3f97108](3f97108))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.2
([#1961](#1961))
([c0bc91d](c0bc91d))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.3
([#1979](#1979))
([9b95c4b](9b95c4b))
* **base-cluster/dependencies:** update helm release oauth2-proxy to
v10.1.4
([#2001](#2001))
([8ffa211](8ffa211))
* **base-cluster/dependencies:** update helm release reflector to v10
([#1924](#1924))
([0051c34](0051c34))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.19
([#1999](#1999))
([a2b5189](a2b5189))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.2
([#1935](#1935))
([333393e](333393e))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.4
([#1956](#1956))
([3eef9a0](3eef9a0))
* **base-cluster/dependencies:** update helm release reflector to
v10.0.8
([#1978](#1978))
([b2f97f9](b2f97f9))
* **base-cluster/dependencies:** update helm release reflector to
v9.1.45
([#1893](#1893))
([ff100d9](ff100d9))
* **base-cluster/dependencies:** update helm release tempo to v1.24.3
([#1904](#1904))
([99099bf](99099bf))
* **base-cluster/dependencies:** update helm release tempo to v1.24.4
([#1957](#1957))
([7d67bf3](7d67bf3))
* **base-cluster/dependencies:** update helm release tempo to v1.26.1
([#1976](#1976))
([517da93](517da93))
* **base-cluster/dependencies:** update helm release tempo to v1.26.7
([#2000](#2000))
([6cabd54](6cabd54))
* **base-cluster/dependencies:** update helm release traefik to v38
([#1914](#1914))
([106c7cf](106c7cf))
* **base-cluster/dependencies:** update helm release traefik to v39
([#1936](#1936))
([5b39257](5b39257))
* **base-cluster/dependencies:** update helm release traefik to v39
([#1959](#1959))
([6efe111](6efe111))
* **base-cluster/dependencies:** update helm release traefik to v39.0.1
([#1992](#1992))
([27d7316](27d7316))
* **base-cluster/monitoring:** migrate helm repo to new URL
([#1955](#1955))
([9263d6a](9263d6a))
* **base-cluster/tetragon:** update flux apiVersion
([#1900](#1900))
([ff93afb](ff93afb))
* **base-cluster:** update kyverno
([#1918](#1918))
([a503ef6](a503ef6))
* migrate kyverno config
([71b9db4](71b9db4))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
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.

4 participants