Skip to content

[release-12.1.2] Alerting: Fix bug where rules with identical mute/active intervals produced conflicting routes #110973

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 11, 2025
Merged

[release-12.1.2] Alerting: Fix bug where rules with identical mute/active intervals produced conflicting routes #110973

merged 1 commit into from
Sep 11, 2025

Conversation

@grafana-delivery-bot
Copy link
Contributor

@grafana-delivery-bot grafana-delivery-bot bot commented Sep 11, 2025

Backport fc3636a from #110935

What is this feature?

When two alert rules use almost the same notification settings, except for the time interval configuration:

  • Rule 1 uses default settings with time interval A as an active time interval
  • Rule 2 uses default settings with time interval A as a mute time interval

then these configuration settings should generate two different routes. Because of the bug, they were generating the same fingerprint hash, and one route was overriding another. Added a field separator (byte{255}) between MuteTimeIntervals and ActiveTimeIntervals arrays in the Fingerprint() method to ensure different notification settings produce unique hashes.

@alexander-akhmetov @github-actions
Alerting: Fix bug where rules with identical mute/active intervals pr…
cf81373 
…oduced conflicting routes (#110935)

Alerting: Fix hash collision in NotificationSettings fingerprint
(cherry picked from commit fc3636a)
@grafana-delivery-bot grafana-delivery-bot bot requested a review from a team as a code owner September 11, 2025 17:14
@github-project-automation github-project-automation bot moved this to In review in Alerting Sep 11, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Sep 11, 2025

😢 zizmor failed with exit code 14.

Expand for full output 
error[bot-conditions]: spoofable bot actor check
  --> ./.github/workflows/pr-dependabot-update-go-workspace.yml:18:3
   |
18 | /   update:
19 | |     runs-on: "ubuntu-latest"
20 | |     if: ${{ github.actor == 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository }}
   | |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ actor context may be spoofable
21 | |     continue-on-error: true
...  |
68 | |           git push origin "$BRANCH_NAME"
69 | |         fi
   | |___________^ this job
   |
   = note: audit confidence → Medium
   = note: this finding has an auto-fix

192 findings (63 ignored, 128 suppressed, 1 fixable): 0 unknown, 0 informational, 0 low, 0 medium, 1 high

@alexander-akhmetov alexander-akhmetov merged commit 93c1372 into release-12.1.2 Sep 11, 2025
93 of 94 checks passed
@alexander-akhmetov alexander-akhmetov deleted the backport-110935-to-release-12.1.2 branch September 11, 2025 17:44
@github-project-automation github-project-automation bot moved this from In review to Done in Alerting Sep 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexander-akhmetov alexander-akhmetov alexander-akhmetov approved these changes

Assignees

No one assigned

Labels

add to changelog area/alerting Grafana Alerting area/backend backport A backport PR

Projects

Alerting
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@alexander-akhmetov