Minor fix

This commit is contained in:
TwinProduction 2020-09-04 22:15:22 -04:00
parent d4623f5c61
commit 5a7164b17d

View File

@ -93,21 +93,21 @@ func handleAlerting(service *core.Service, result *core.Result) {
var alertProvider *core.CustomAlertProvider var alertProvider *core.CustomAlertProvider
if alert.Type == core.SlackAlert { if alert.Type == core.SlackAlert {
if len(cfg.Alerting.Slack) > 0 { if len(cfg.Alerting.Slack) > 0 {
log.Printf("[watchdog][monitor] Sending Slack alert because alert with description=%s has been resolved", alert.Description) log.Printf("[watchdog][handleAlerting] Sending Slack alert because alert with description=%s has been resolved", alert.Description)
alertProvider = core.CreateSlackCustomAlertProvider(cfg.Alerting.Slack, service, alert, result, true) alertProvider = core.CreateSlackCustomAlertProvider(cfg.Alerting.Slack, service, alert, result, true)
} else { } else {
log.Printf("[watchdog][monitor] Not sending Slack alert despite being triggered, because there is no Slack webhook configured") log.Printf("[watchdog][handleAlerting] Not sending Slack alert despite being triggered, because there is no Slack webhook configured")
} }
} else if alert.Type == core.TwilioAlert { } else if alert.Type == core.TwilioAlert {
if cfg.Alerting.Twilio != nil && cfg.Alerting.Twilio.IsValid() { if cfg.Alerting.Twilio != nil && cfg.Alerting.Twilio.IsValid() {
log.Printf("[watchdog][monitor] Sending Twilio alert because alert with description=%s has been resolved", alert.Description) log.Printf("[watchdog][handleAlerting] Sending Twilio alert because alert with description=%s has been resolved", alert.Description)
alertProvider = core.CreateTwilioCustomAlertProvider(cfg.Alerting.Twilio, fmt.Sprintf("RESOLVED: %s - %s", service.Name, alert.Description)) alertProvider = core.CreateTwilioCustomAlertProvider(cfg.Alerting.Twilio, fmt.Sprintf("RESOLVED: %s - %s", service.Name, alert.Description))
} else { } else {
log.Printf("[watchdog][monitor] Not sending Twilio alert despite being resolved, because Twilio isn't configured properly") log.Printf("[watchdog][handleAlerting] Not sending Twilio alert despite being resolved, because Twilio isn't configured properly")
} }
} else if alert.Type == core.CustomAlert { } else if alert.Type == core.CustomAlert {
if cfg.Alerting.Custom != nil && cfg.Alerting.Custom.IsValid() { if cfg.Alerting.Custom != nil && cfg.Alerting.Custom.IsValid() {
log.Printf("[watchdog][monitor] Sending custom alert because alert with description=%s has been resolved", alert.Description) log.Printf("[watchdog][handleAlerting] Sending custom alert because alert with description=%s has been resolved", alert.Description)
alertProvider = &core.CustomAlertProvider{ alertProvider = &core.CustomAlertProvider{
Url: cfg.Alerting.Custom.Url, Url: cfg.Alerting.Custom.Url,
Method: cfg.Alerting.Custom.Method, Method: cfg.Alerting.Custom.Method,
@ -115,13 +115,13 @@ func handleAlerting(service *core.Service, result *core.Result) {
Headers: cfg.Alerting.Custom.Headers, Headers: cfg.Alerting.Custom.Headers,
} }
} else { } else {
log.Printf("[watchdog][monitor] Not sending custom alert despite being resolved, because the custom provider isn't configured properly") log.Printf("[watchdog][handleAlerting] Not sending custom alert despite being resolved, because the custom provider isn't configured properly")
} }
} }
if alertProvider != nil { if alertProvider != nil {
err := alertProvider.Send(service.Name, alert.Description, true) err := alertProvider.Send(service.Name, alert.Description, true)
if err != nil { if err != nil {
log.Printf("[watchdog][monitor] Ran into error sending an alert: %s", err.Error()) log.Printf("[watchdog][handleAlerting] Ran into error sending an alert: %s", err.Error())
} }
} }
} }
@ -137,21 +137,21 @@ func handleAlerting(service *core.Service, result *core.Result) {
var alertProvider *core.CustomAlertProvider var alertProvider *core.CustomAlertProvider
if alert.Type == core.SlackAlert { if alert.Type == core.SlackAlert {
if len(cfg.Alerting.Slack) > 0 { if len(cfg.Alerting.Slack) > 0 {
log.Printf("[watchdog][monitor] Sending Slack alert because alert with description=%s has been triggered", alert.Description) log.Printf("[watchdog][handleAlerting] Sending Slack alert because alert with description=%s has been triggered", alert.Description)
alertProvider = core.CreateSlackCustomAlertProvider(cfg.Alerting.Slack, service, alert, result, false) alertProvider = core.CreateSlackCustomAlertProvider(cfg.Alerting.Slack, service, alert, result, false)
} else { } else {
log.Printf("[watchdog][monitor] Not sending Slack alert despite being triggered, because there is no Slack webhook configured") log.Printf("[watchdog][handleAlerting] Not sending Slack alert despite being triggered, because there is no Slack webhook configured")
} }
} else if alert.Type == core.TwilioAlert { } else if alert.Type == core.TwilioAlert {
if cfg.Alerting.Twilio != nil && cfg.Alerting.Twilio.IsValid() { if cfg.Alerting.Twilio != nil && cfg.Alerting.Twilio.IsValid() {
log.Printf("[watchdog][monitor] Sending Twilio alert because alert with description=%s has been triggered", alert.Description) log.Printf("[watchdog][handleAlerting] Sending Twilio alert because alert with description=%s has been triggered", alert.Description)
alertProvider = core.CreateTwilioCustomAlertProvider(cfg.Alerting.Twilio, fmt.Sprintf("TRIGGERED: %s - %s", service.Name, alert.Description)) alertProvider = core.CreateTwilioCustomAlertProvider(cfg.Alerting.Twilio, fmt.Sprintf("TRIGGERED: %s - %s", service.Name, alert.Description))
} else { } else {
log.Printf("[watchdog][monitor] Not sending Twilio alert despite being triggered, because Twilio config settings missing") log.Printf("[watchdog][handleAlerting] Not sending Twilio alert despite being triggered, because Twilio config settings missing")
} }
} else if alert.Type == core.CustomAlert { } else if alert.Type == core.CustomAlert {
if cfg.Alerting.Custom != nil && cfg.Alerting.Custom.IsValid() { if cfg.Alerting.Custom != nil && cfg.Alerting.Custom.IsValid() {
log.Printf("[watchdog][monitor] Sending custom alert because alert with description=%s has been triggered", alert.Description) log.Printf("[watchdog][handleAlerting] Sending custom alert because alert with description=%s has been triggered", alert.Description)
alertProvider = &core.CustomAlertProvider{ alertProvider = &core.CustomAlertProvider{
Url: cfg.Alerting.Custom.Url, Url: cfg.Alerting.Custom.Url,
Method: cfg.Alerting.Custom.Method, Method: cfg.Alerting.Custom.Method,
@ -159,13 +159,13 @@ func handleAlerting(service *core.Service, result *core.Result) {
Headers: cfg.Alerting.Custom.Headers, Headers: cfg.Alerting.Custom.Headers,
} }
} else { } else {
log.Printf("[watchdog][monitor] Not sending custom alert despite being triggered, because there is no custom url configured") log.Printf("[watchdog][handleAlerting] Not sending custom alert despite being triggered, because there is no custom url configured")
} }
} }
if alertProvider != nil { if alertProvider != nil {
err := alertProvider.Send(service.Name, alert.Description, false) err := alertProvider.Send(service.Name, alert.Description, false)
if err != nil { if err != nil {
log.Printf("[watchdog][monitor] Ran into error sending an alert: %s", err.Error()) log.Printf("[watchdog][handleAlerting] Ran into error sending an alert: %s", err.Error())
} }
} }
} }