Skip to content
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

Enable setting ThreadId for Telegram notifications #3638

Merged
merged 4 commits into from
Apr 30, 2024
+15 −1
Merged

Enable setting ThreadId for Telegram notifications #3638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ab5ae6
Enable setting ThreadId for telegram notifications
th0th Dec 15, 2023
1f275cb
Merge branch 'main' into main
gotjosh Apr 30, 2024
b8668f1
In go, int32 is int by default avoid the explicit conversion.
gotjosh Apr 30, 2024
a5f0947
Remove one more redudant reference
gotjosh Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/notifiers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,7 @@ type TelegramConfig struct {
BotToken Secret `yaml:"bot_token,omitempty" json:"token,omitempty"`
BotTokenFile string `yaml:"bot_token_file,omitempty" json:"token_file,omitempty"`
ChatID int64 `yaml:"chat_id,omitempty" json:"chat,omitempty"`
MessageThreadID int `yaml:"message_thread_id,omitempty" json:"message_thread_id,omitempty"`
Message string `yaml:"message,omitempty" json:"message,omitempty"`
DisableNotifications bool `yaml:"disable_notifications,omitempty" json:"disable_notifications,omitempty"`
ParseMode string `yaml:"parse_mode,omitempty" json:"parse_mode,omitempty"`
Expand Down
9 changes: 8 additions & 1 deletion config/notifiers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"testing"

"github.com/stretchr/testify/require"

"gopkg.in/yaml.v2"
)

Expand Down Expand Up @@ -1046,6 +1045,14 @@ bot_token_file: ''
in: `
bot_token: xyz
chat_id: 123
`,
},
{
name: "with bot_token, chat_id and message_thread_id set - it succeeds",
in: `
bot_token: xyz
chat_id: 123
message_thread_id: 456
`,
},
{
Expand Down
3 changes: 3 additions & 0 deletions docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,6 +1308,9 @@ attributes:
# ID of the chat where to send the messages.
[ chat_id: <int> ]

# Optional ID of the message thread where to send the messages.
[ message_thread_id: <int> ]

# Message template.
[ message: <tmpl_string> default = '{{ template "telegram.default.message" .}}' ]

Expand Down
1 change: 1 addition & 0 deletions notify/telegram/telegram.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ func (n *Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, err
message, err := n.client.Send(telebot.ChatID(n.conf.ChatID), messageText, &telebot.SendOptions{
DisableNotification: n.conf.DisableNotifications,
DisableWebPagePreview: true,
ThreadID: n.conf.MessageThreadID,
})
if err != nil {
return true, err
Expand Down
2 changes: 2 additions & 0 deletions notify/telegram/telegram_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ receivers:
telegram_configs:
- chat_id: 1234
bot_token: secret
message_thread_id: 1357
`
var c config.Config
err := yaml.Unmarshal([]byte(in), &c)
Expand All @@ -57,6 +58,7 @@ receivers:
require.Equal(t, "https://api.telegram.org", c.Receivers[0].TelegramConfigs[0].APIUrl.String())
require.Equal(t, config.Secret("secret"), c.Receivers[0].TelegramConfigs[0].BotToken)
require.Equal(t, int64(1234), c.Receivers[0].TelegramConfigs[0].ChatID)
require.Equal(t, 1357, c.Receivers[0].TelegramConfigs[0].MessageThreadID)
require.Equal(t, "HTML", c.Receivers[0].TelegramConfigs[0].ParseMode)
}

Expand Down
Loading