Skip to content

Commit

Permalink
Telegram required arguments are not required when using notificat… (#23)
Browse files Browse the repository at this point in the history
Telegram required arguments are not required when using notification dry run mode
  • Loading branch information
slok authored Dec 20, 2019
2 parents f5d7af8 + 00d1fc6 commit ab033c9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

- Forward alerts by custom chat ID based on alert labels.

### Changed

- Telegram required flags/envs are not required when using notify dry run mode.

## [0.2.1] - 2019-12-17

### Added
Expand Down
14 changes: 12 additions & 2 deletions cmd/alertgram/config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"errors"
"os"
"time"

Expand Down Expand Up @@ -90,8 +91,8 @@ func (c *Config) registerFlags() {
c.app.Flag("alertmanager.webhook-path", descAMWebhookPath).Default(defAMWebhookPath).StringVar(&c.AlertmanagerWebhookPath)
c.app.Flag("alertmanager.chat-id-query-string", descAMChatIDQS).Default(defAMChatIDQS).StringVar(&c.AlertmanagerChatIDQQueryString)
c.app.Flag("alertmanager.dead-mans-switch-path", descAMDMSPath).Default(defAMDMSPath).StringVar(&c.AlertmanagerDMSPath)
c.app.Flag("telegram.api-token", descTelegramAPIToken).Required().StringVar(&c.TeletramAPIToken)
c.app.Flag("telegram.chat-id", descTelegramDefChatID).Required().Int64Var(&c.TelegramChatID)
c.app.Flag("telegram.api-token", descTelegramAPIToken).StringVar(&c.TeletramAPIToken)
c.app.Flag("telegram.chat-id", descTelegramDefChatID).Int64Var(&c.TelegramChatID)
c.app.Flag("metrics.listen-address", descMetricsListenAddr).Default(defMetricsListenAddr).StringVar(&c.MetricsListenAddr)
c.app.Flag("metrics.path", descMetricsPath).Default(defMetricsPath).StringVar(&c.MetricsPath)
c.app.Flag("metrics.health-path", descMetricsHCPath).Default(defMetricsHCPath).StringVar(&c.MetricsHCPath)
Expand All @@ -105,5 +106,14 @@ func (c *Config) registerFlags() {
}

func (c *Config) validate() error {
if !c.NotifyDryRun {
if c.TeletramAPIToken == "" {
return errors.New("telegram api token is required")
}

if c.TelegramChatID == 0 {
return errors.New("telegram default chat ID is required")
}
}
return nil
}

0 comments on commit ab033c9

Please sign in to comment.