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.

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

feat: add bot_token_file in TelegramConfig #5882

Merged
merged 1 commit into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 34 additions & 2 deletions Documentation/api.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions bundle.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion jsonnet/prometheus-operator/alertmanagerconfigs-crd.json
Original file line number Diff line number Diff line change
Expand Up @@ -3331,7 +3331,7 @@
"type": "string"
},
"botToken": {
"description": "Telegram bot token The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.",
"description": "Telegram bot token. It is mutually exclusive with `botTokenFile`. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. \n Either `botToken` or `botTokenFile` is required.",
"properties": {
"key": {
"description": "The key of the secret to select from. Must be a valid secret key.",
Expand All @@ -3351,6 +3351,10 @@
],
"type": "object"
},
"botTokenFile": {
"description": "File to read the Telegram bot token from. It is mutually exclusive with `botToken`. Either `botToken` or `botTokenFile` is required. \n It requires Alertmanager >= v0.26.0.",
"type": "string"
},
"chatID": {
"description": "The Telegram chat ID.",
"format": "int64",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3186,7 +3186,7 @@
type: 'string',
},
botToken: {
description: 'Telegram bot token The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.',
description: 'Telegram bot token. It is mutually exclusive with `botTokenFile`. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. \n Either `botToken` or `botTokenFile` is required.',
properties: {
key: {
description: 'The key of the secret to select from. Must be a valid secret key.',
Expand All @@ -3205,6 +3205,10 @@
],
type: 'object',
},
botTokenFile: {
description: 'File to read the Telegram bot token from. It is mutually exclusive with `botToken`. Either `botToken` or `botTokenFile` is required. \n It requires Alertmanager >= v0.26.0.',
type: 'string',
},
chatID: {
description: 'The Telegram chat ID.',
format: 'int64',
Expand Down
18 changes: 16 additions & 2 deletions pkg/alertmanager/amcfg.go
Original file line number Diff line number Diff line change
Expand Up @@ -1979,7 +1979,9 @@ func (sc *snsConfig) sanitize(amVersion semver.Version, logger log.Logger) error
}

func (tc *telegramConfig) sanitize(amVersion semver.Version, logger log.Logger) error {
lessThanV0_26 := amVersion.LT(semver.MustParse("0.26.0"))
telegramAllowed := amVersion.GTE(semver.MustParse("0.24.0"))

if !telegramAllowed {
return fmt.Errorf(`invalid syntax in receivers config; telegram integration is available in Alertmanager >= 0.24.0`)
}
Expand All @@ -1988,8 +1990,20 @@ func (tc *telegramConfig) sanitize(amVersion semver.Version, logger log.Logger)
return errors.Errorf("mandatory field %q is empty", "chatID")
}

if tc.BotToken == "" {
return fmt.Errorf("mandatory field %q is empty", "botToken")
if tc.BotTokenFile != "" && lessThanV0_26 {
msg := "'bot_token_file' supported in Alertmanager >= 0.26.0 only - dropping field from provided config"
level.Warn(logger).Log("msg", msg, "current_version", amVersion.String())
tc.BotTokenFile = ""
}

if tc.BotToken == "" && tc.BotTokenFile == "" {
return fmt.Errorf("missing mandatory field botToken or botTokenFile")
}

if tc.BotToken != "" && tc.BotTokenFile != "" {
msg := "'bot_token' and 'bot_token_file' are mutually exclusive for telegram receiver config - 'bot_token' has taken precedence"
level.Warn(logger).Log("msg", msg)
tc.BotTokenFile = ""
}

return tc.HTTPConfig.sanitize(amVersion, logger)
Expand Down
126 changes: 126 additions & 0 deletions pkg/alertmanager/amcfg_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1964,6 +1964,9 @@ func TestSanitizeConfig(t *testing.T) {
versionWebexAllowed := semver.Version{Major: 0, Minor: 25}
versionWebexNotAllowed := semver.Version{Major: 0, Minor: 24}

versionTelegramBotTokenFileAllowed := semver.Version{Major: 0, Minor: 26}
versionTelegramBotTokenFileNotAllowed := semver.Version{Major: 0, Minor: 25}

for _, tc := range []struct {
name string
againstVersion semver.Version
Expand Down Expand Up @@ -2364,6 +2367,129 @@ func TestSanitizeConfig(t *testing.T) {
},
expectErr: true,
},
{
name: "bot_token_file field for Telegram config",
againstVersion: versionTelegramBotTokenFileAllowed,
in: &alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{
{
ChatID: 12345,
BotTokenFile: "/test",
},
},
},
},
},
expect: alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{
{
ChatID: 12345,
BotTokenFile: "/test",
},
},
},
},
},
},
{
name: "bot_token_file and bot_token fields for Telegram config",
againstVersion: versionTelegramBotTokenFileAllowed,
in: &alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{
{
ChatID: 12345,
BotToken: "test",
BotTokenFile: "/test",
},
},
},
},
},
expect: alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{{
ChatID: 12345,
BotToken: "test",
}},
},
},
},
},
{
name: "bot_token not specified and bot_token_file is dropped for unsupported versions",
againstVersion: versionTelegramBotTokenFileNotAllowed,
in: &alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{
{
ChatID: 12345,
BotTokenFile: "/test",
},
},
},
},
},
expectErr: true,
},
{
name: "bot_token specified and bot_token_file is dropped for unsupported versions",
againstVersion: versionTelegramBotTokenFileNotAllowed,
in: &alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{
{
ChatID: 12345,
BotToken: "test",
BotTokenFile: "/test",
slashpai marked this conversation as resolved.
Show resolved Hide resolved
},
},
},
},
},
expect: alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{{
ChatID: 12345,
BotToken: "test",
}},
},
},
},
},
{
name: "bot_token and bot_token_file empty",
againstVersion: versionTelegramBotTokenFileAllowed,
in: &alertmanagerConfig{
Receivers: []*receiver{
{
Name: "telegram",
TelegramConfigs: []*telegramConfig{
{
ChatID: 12345,
},
},
},
},
},
expectErr: true,
},
} {
t.Run(tc.name, func(t *testing.T) {
err := tc.in.sanitize(tc.againstVersion, logger)
Expand Down
1 change: 1 addition & 0 deletions pkg/alertmanager/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ type telegramConfig struct {
VSendResolved *bool `yaml:"send_resolved,omitempty" json:"send_resolved,omitempty"`
APIUrl string `yaml:"api_url,omitempty" json:"api_url,omitempty"`
BotToken string `yaml:"bot_token,omitempty" json:"bot_token,omitempty"`
BotTokenFile string `yaml:"bot_token_file,omitempty" json:"bot_token_file,omitempty"`
ChatID int64 `yaml:"chat_id,omitempty" json:"chat_id,omitempty"`
Message string `yaml:"message,omitempty" json:"message,omitempty"`
DisableNotifications bool `yaml:"disable_notifications,omitempty" json:"disable_notifications,omitempty"`
Expand Down
4 changes: 2 additions & 2 deletions pkg/alertmanager/validation/v1alpha1/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,8 @@ func validateSnsConfigs(configs []monitoringv1alpha1.SNSConfig) error {
func validateTelegramConfigs(configs []monitoringv1alpha1.TelegramConfig) error {
for _, config := range configs {

if config.BotToken == nil {
return fmt.Errorf("mandatory field %q is empty", "botToken")
if config.BotToken == nil && config.BotTokenFile == nil {
return fmt.Errorf("mandatory field botToken or botTokenfile is empty")
}
slashpai marked this conversation as resolved.
Show resolved Hide resolved

if config.ChatID == 0 {
Expand Down