From 5a7164b17d7c811e20e64b4e0b64b675046b83d2 Mon Sep 17 00:00:00 2001 From: TwinProduction Date: Fri, 4 Sep 2020 22:15:22 -0400 Subject: [PATCH] Minor fix --- watchdog/watchdog.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/watchdog/watchdog.go b/watchdog/watchdog.go index 952e44b7..2b5bb45e 100644 --- a/watchdog/watchdog.go +++ b/watchdog/watchdog.go @@ -93,21 +93,21 @@ func handleAlerting(service *core.Service, result *core.Result) { var alertProvider *core.CustomAlertProvider if alert.Type == core.SlackAlert { 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) } 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 { 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)) } 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 { 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{ Url: cfg.Alerting.Custom.Url, Method: cfg.Alerting.Custom.Method, @@ -115,13 +115,13 @@ func handleAlerting(service *core.Service, result *core.Result) { Headers: cfg.Alerting.Custom.Headers, } } 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 { err := alertProvider.Send(service.Name, alert.Description, true) 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 if alert.Type == core.SlackAlert { 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) } 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 { 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)) } 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 { 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{ Url: cfg.Alerting.Custom.Url, Method: cfg.Alerting.Custom.Method, @@ -159,13 +159,13 @@ func handleAlerting(service *core.Service, result *core.Result) { Headers: cfg.Alerting.Custom.Headers, } } 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 { err := alertProvider.Send(service.Name, alert.Description, false) 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()) } } }