Setup repeat camera down notifications #24

uptime-go/uptime/config/config.go

@@ -4,12 +4,12 @@ import "os"
 
 import "gopkg.in/yaml.v3"
 
-
 type Config struct {
 	Cameras                     map[string]string `yaml:"cameras"`
 	PingIntervalSeconds         int64             `yaml:"ping_interval_s"`
 	PingTimeoutSeconds          int64             `yaml:"ping_timeout_s"`
 	ConsecutiveDownThreshold    int               `yaml:"consecutive_down_threshold"`
+	NotificationRepeatThreshold int               `yaml:"notification_repeat_threshold"`
 }
 
 func ReadConfig(configFilename string) Config {

uptime-go/uptime/config/config.yaml

@@ -6,4 +6,4 @@ cameras:
 ping_interval_s: 60
 ping_timeout_s: 30
 consecutive_down_threshold: 3
-
+notification_repeat_threshold: 30

uptime-go/uptime/main.go

@@ -12,6 +12,6 @@ func main() {
 	var pingInterval = time.Duration(uptimeConfig.PingIntervalSeconds * int64(time.Second))
 	var pingTimeout = time.Duration(uptimeConfig.PingTimeoutSeconds * int64(time.Second))
 
-	var cameraMonitor CameraMonitor = NewCameraMonitor(pingInterval, pingTimeout, uptimeConfig.ConsecutiveDownThreshold, notify.NewNtfyNotifier())
+	var cameraMonitor CameraMonitor = NewCameraMonitor(pingInterval, pingTimeout, uptimeConfig.ConsecutiveDownThreshold, uptimeConfig.NotificationRepeatThreshold, notify.NewNtfyNotifier())
 	cameraMonitor.Run(uptimeConfig.Cameras)
 }

uptime-go/uptime/monitor.go

@@ -16,41 +16,37 @@ type CameraMonitor struct {
 	pingInterval                time.Duration
 	pingTimeout                 time.Duration
 	consecutiveDownThreshold    int
+	notificationRepeatThreshold int
 	downtime                    map[string]int
 	notify.Notifier
 }
 
-func NewCameraMonitor(pingInterval time.Duration, pingTimeout time.Duration, consecutiveDownThreshold int, notifier notify.Notifier) CameraMonitor {
+func NewCameraMonitor(pingInterval time.Duration, pingTimeout time.Duration, consecutiveDownThreshold int, notificationRepeatThreshold int, notifier notify.Notifier) CameraMonitor {
 	return CameraMonitor{
 		pingInterval:                pingInterval,
 		pingTimeout:                 pingTimeout,
 		consecutiveDownThreshold:    consecutiveDownThreshold,
+		notificationRepeatThreshold: notificationRepeatThreshold,
 		downtime:                    make(map[string]int),
 		Notifier:                    notifier,
 	}
 
 }
 
-func (c CameraMonitor) onCameraUp(camera string) {
-	c.SendNotification(camera, true)
-	slog.Info(fmt.Sprintf("%s camera is back online!", camera))
-}
-
-func (c CameraMonitor) onCameraDown(camera string) {
-	c.SendNotification(camera, false)
-	slog.Info(fmt.Sprintf("%s camera is offline!", camera))
-}
-
 func (c CameraMonitor) onCameraPingResult(camera string, online bool) {
 	if online {
 		if c.downtime[camera] >= c.consecutiveDownThreshold {
-			c.onCameraUp(camera)
+			c.SendNotification(camera, true)
+			slog.Info(fmt.Sprintf("%s camera is back online!", camera))
 		}
 		c.downtime[camera] = 0
 	} else {
 		c.downtime[camera] += 1
 		if c.downtime[camera] == c.consecutiveDownThreshold {
-			c.onCameraDown(camera)
+			c.SendNotification(camera, false)
+			slog.Info(fmt.Sprintf("%s camera is offline!", camera))
+		} else if c.notificationRepeatThreshold >= c.consecutiveDownThreshold && c.downtime[camera]%c.notificationRepeatThreshold == c.consecutiveDownThreshold {
+			c.SendNotification(camera, false)
 		}
 	}
 }

uptime-go/uptime/notify/notifier.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 )
 
-
 type Notifier interface {
 	SendNotification(camera string, online bool)
 }

uptime-go/uptime/notify/ntfy.go

@@ -1,15 +1,14 @@
 package notify
 
 import (
-	"crypto/tls"
 	"bytes"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"log/slog"
 	"net/http"
 )
 
-
 type NtfyNotifier struct {
 	client *http.Client
 }

uptime-go/uptime/ping/ip_ping.go

@@ -2,7 +2,6 @@ package ping
 
 import "os/exec"
 
-
 func IPPing(host string) bool {
 	var cmd = exec.Command("ping", "-w", "3", "-c", "1", host)
 	var err = cmd.Run()

uptime-go/uptime/ping/video_ping.go

@@ -2,7 +2,6 @@ package ping
 
 import "os/exec"
 
-
 func VideoPing(url string) bool {
 	var cmd = exec.Command("ffprobe", "-rtsp_transport", "tcp", "-i", url, "-timeout", "10000000")
 	var err = cmd.Run()