Repository navigation
chore(deps): track fork's upstream config layout - #695
Open
yuri-tceretian wants to merge 3 commits into
Open
yuri-tceretian wants to merge 3 commits into
yuri-tceretian wants to merge 3 commits into
Conversation
Picks up grafana/prometheus-alertmanager#165, which mirrors upstream's config package layout (shared types moved to config/common, several notifier configs moved to notify/<channel>). This module will not compile until the fallout is fixed in a follow-up commit. Ref: #694
Update qualifiers for types that moved with grafana/prometheus-alertmanager#165: NotifierConfig, URL, SecretURL, MatchRegexps, Matchers and InhibitRule now live in config/common; DiscordConfig, WebhookConfig, MSTeamsConfig, MSTeamsV2Config, JiraConfig, PagerdutyConfig (and PagerdutyImage/Link), OpsGenieConfig (and OpsGenieConfigResponder) and TelegramConfig now live in their respective notify/<channel> packages. PagerDuty ServiceKey/RoutingKey, OpsGenie APIKey and Telegram BotToken are now commoncfg.Secret instead of the fork's own config.Secret. No behavior change: same fields, same JSON/YAML output, only import paths and type qualifiers differ. Ref: #694
konstantinmv
approved these changes
Oct 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why does bumping the fork require touching this many files, if nothing changes behaviour?
grafana/prometheus-alertmanager#165 moved the fork's config types into upstream v0.34.0's layout, so future upstream syncs compare file by file. Shared types (
NotifierConfig,URL,SecretURL,Matchers,InhibitRule, …) moved toconfig/common. Eight notifier configs moved into theirnotify/<channel>packages. Nothing was aliased, so every reference here needs a new qualifier.Two commits, so the bump and its fallout review separately:
apps/historianto27a6d009. This doesn't compile alone.definition/compat/receiver_compat.go. The pagerduty, OpsGenie and Telegram secret fields are nowcommoncfg.Secret, matching upstream, and aconfig.Secretvalue no longer assigns to them.No config field, schema, default or validation changes. The JSON encoders in
receivers/v0mimir_json.goare registered for the relocated types, so serialized output is unchanged.The config relocation also explains the new indirect dependencies in
go.mod. Go compiles the whole imported package: importingnotify/jiraforJiraConfig, for example, also compiles the Jira notifier implementation. Previously those config types lived inconfig, without pulling in the notifier implementations.notify/jirapulls ingithub.com/trivago/tgo.notify/telegrampulls ingopkg.in/telebot.v3.notify/pagerdutypulls ingithub.com/alecthomas/units.notify/webhookpulls in Alertmanager'stracingpackage, which importsotelhttpandotelhttptrace;otelhttpalso pulls ingithub.com/felixge/httpsnoop.The root module already listed all of these except
trivago/tgo, so it gains one indirect requirement.apps/historiangains all six. These dependencies follow from moving config types into the notifier packages; they do not represent additional features introduced by this PR.Part of #694
🤖 Generated with Claude Code