simono41/ntfy-alertmanager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow setting topic through URL query parameters

Browse source 
Closes: https://codeberg.org/xenrox/ntfy-alertmanager/issues/2
This commit is contained in:
Thorben Günther 2024-11-07 14:09:04 +01:00
parent 84a45a909b
commit bd1abedac1
No known key found for this signature in database
GPG key ID: 415CD778D8C5AFED
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.scfg
View file

@ -69,6 +69,8 @@ ntfy {
server https://ntfy.sh server https://ntfy.sh
# Name of the ntfy topic. For backwards compatibility you can specify the full URL of the # Name of the ntfy topic. For backwards compatibility you can specify the full URL of the
# topic (e.g. https://ntfy.sh/alertmanager-alerts) and the server will be parsed from it. # topic (e.g. https://ntfy.sh/alertmanager-alerts) and the server will be parsed from it.
# Furthermore the topic name can be optionally set by using URL parameters with the webhook
# endpoint: https://ntfy-alertmanager.example.com/?topic=foobar
# This setting is required. # This setting is required.
# Default: "" # Default: ""
topic alertmanager-alerts topic alertmanager-alerts

15
main.go
View file

@ -304,8 +304,13 @@ func (br *bridge) multiAlertNotification(p *payload) *notification {
return n return n
} }
func (br *bridge) publish(n *notification) error { func (br *bridge) publish(n *notification, topicParam string) error {
url, err := br.topicURL(n.topic) // precedence: topicParam > n.topic > cfg.Ntfy.Topic
if topicParam == "" {
topicParam = n.topic
}
url, err := br.topicURL(topicParam)
if err != nil { if err != nil {
return err return err
} }
@ -437,6 +442,8 @@ func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) {
return return
} }
topicParam := r.URL.Query().Get("topic")
var event payload var event payload
if err := json.NewDecoder(r.Body).Decode(&event); err != nil { if err := json.NewDecoder(r.Body).Decode(&event); err != nil {
http.Error(w, "Failed to parse payload", http.StatusInternalServerError) http.Error(w, "Failed to parse payload", http.StatusInternalServerError)
@ -451,7 +458,7 @@ func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) {
if br.cfg.AlertMode == config.Single { if br.cfg.AlertMode == config.Single {
notifications := br.singleAlertNotifications(&event) notifications := br.singleAlertNotifications(&event)
for _, n := range notifications { for _, n := range notifications {
err := br.publish(n) err := br.publish(n, topicParam)
if err != nil { if err != nil {
logger.Error("Failed to publish notification", logger.Error("Failed to publish notification",
slog.String("error", err.Error())) slog.String("error", err.Error()))
@ -465,7 +472,7 @@ func (br *bridge) handleWebhooks(w http.ResponseWriter, r *http.Request) {
} }
} else { } else {
notification := br.multiAlertNotification(&event) notification := br.multiAlertNotification(&event)
err := br.publish(notification) err := br.publish(notification, topicParam)
if err != nil { if err != nil {
logger.Error("Failed to publish notification", logger.Error("Failed to publish notification",
slog.String("error", err.Error())) slog.String("error", err.Error()))