Updates to support BI6 & syslog to loki documentation and configs

Author: wymangr

.gitignore

@@ -1 +1,2 @@
-logs/*
+logs/*
+*.exe

README.md

@@ -1,8 +1,9 @@
 # blueiris_exporter
 Prometheus exporter for Blue Iris.
-Confirmed working on Blue Iris version's 5.5.0.12 to 5.9.2.2
+Confirmed working on Blue Iris version's 5.5.0.12 to 6.0.1.22
 
->**Attention: blueiris_exporter is currently not combitible with Blue Iris version >=6. There is currently no ETA on when/if support will be added.**
+In newer versions of Blue Iris, there is an option to export the logs to a SysLog server.
+As an alternative to the blueiris_exporter (or in addition to), you can follow [this guide](syslog/syslog_to_loki.md) to learn how to set this up.
 
 If you increment `parse_errors` metrics, please send me the details and I will work on adding support for it. Blue Iris has changed it's log format for AI a few times and I'm working on adding support for all of it. Also, if you have any ideas for different metrics, let me know! 
 
@@ -160,6 +161,12 @@ profile | Count of activation of profiles
 ai_error | Count of AI error log lines
 
 
-## Grafana Dashboard
-https://grafana.com/grafana/dashboards/17432-blueiris/
-![Grafana Dashboard](images/grafana-dashboard.png)
+## Grafana Dashboards
+
+### blueiris_exporter
+https://grafana.com/grafana/dashboards/17432-blueiris/<br>
+grafana_dashboard.json
+![Grafana Dashboard](images/grafana-dashboard.png)
+
+### Blue Iris Loki
+syslog/grafana_dashboard_loki.json

blueiris/blueirisMetrics.go

@@ -58,7 +58,6 @@ func BlueIris(ch chan<- prometheus.Metric, m common.MetricInfo, SecMet []common.
 	scrapeTime := time.Now()
 	mutex.Lock()
 
-	parseErrors = make(map[string]float64)
 	startScanning := false
 
 	dir := logpath
@@ -336,19 +335,46 @@ func findObject(line string) (match []string, r *regexp.Regexp, matchType string
 	} else if strings.HasSuffix(line, "AI: not responding") {
 		notrespondingcount++
 
-	} else if strings.Contains(line, "EXTERNAL") || strings.Contains(line, "MOTION") || strings.Contains(line, "DIO") || strings.Contains(line, "Triggered") || strings.Contains(line, "Re-triggered") {
-		r := regexp.MustCompile(`(?P<camera>[^\s\\]*)(\s*(?P<motion>EXTERNAL|MOTION|DIO|Triggered|Re-triggered))`)
+	} else if strings.Contains(line, "AI:") || strings.Contains(line, "DeepStack:") || strings.Contains(line, "Trigger: Alert canceled") {
+		newLine := strings.Join(strings.Fields(line), " ")
+		r := regexp.MustCompile(`(?P<camera>[^\s\\]*)(\sAI:\s|\sDeepStack:\s|\sTrigger:\s)(\[Objects\]\s|Alert\s|\[.+\]\s|)(?P<object>[aA-zZ]*|cancelled|canceled)(\s|:)(\[|)(?P<detail>[0-9]*|.*)(%|\])(\s)(\[.+\]\s|)(?P<duration>[0-9]*)ms`)
+		match := r.FindStringSubmatch(newLine)
+
+		if strings.Contains(newLine, "CodeProject.AI") {
+			return nil, nil, ""
+		}
+
+		if len(match) == 0 {
+			r2 := regexp.MustCompile(`(?P<camera>[^\s\\]*)(\sAI:\s|\sDeepStack:\s)(\[Objects\]\s|Alert\s|\[.+\]\s|)(?P<object>[aA-zZ]*|cancelled|canceled)(\s|:)(\[|)(?P<detail>[0-9]*|.*)`)
+			match2 := r2.FindStringSubmatch(newLine)
+			if len(match2) == 0 {
+				parseErrors = appendCounterMap(parseErrors, line)
+				parseErrorsTotal++
+			}
+			return nil, nil, ""
+		} else {
+			if strings.Contains(newLine, "cancelled") || strings.Contains(newLine, "canceled") {
+				return match, r, "canceled"
+			} else {
+				return match, r, "alert"
+			}
+		}
+
+	} else if strings.Contains(line, "EXTERNAL") || strings.Contains(line, "MOTION") || strings.Contains(line, "DIO") || strings.Contains(line, "Triggered") || strings.Contains(line, "Re-triggered") || strings.Contains(line, "Trigger") {
+		r := regexp.MustCompile(`(?P<camera>[^\s\\]*)(\s*(?P<motion>EXTERNAL|MOTION|DIO|Triggered|Re-triggered|Trigger))`)
 		match := r.FindStringSubmatch(line)
 		if len(match) == 0 {
 			parseErrors = appendCounterMap(parseErrors, line)
 			parseErrorsTotal++
 		} else {
-			cameraMatch := r.SubexpIndex("camera")
-			camera := match[cameraMatch]
-			triggerCount[camera]++
-			makeMap(camera, camerastatus)
-			camerastatus[camera]["status"] = 0.0
-			camerastatus[camera]["detail"] = "trigger"
+			if !strings.Contains(line, "Alert canceled") || !strings.Contains(line, "Alert confirmed") {
+				cameraMatch := r.SubexpIndex("camera")
+				camera := match[cameraMatch]
+				triggerCount[camera]++
+				makeMap(camera, camerastatus)
+				camerastatus[camera]["status"] = 0.0
+				camerastatus[camera]["detail"] = "trigger"
+			}
 		}
 
 	} else if strings.Contains(line, "Push:") {
@@ -368,27 +394,6 @@ func findObject(line string) (match []string, r *regexp.Regexp, matchType string
 			pushCount[camera+"|"+status+"|"+detail]++
 		}
 
-	} else if strings.Contains(line, "AI:") || strings.Contains(line, "DeepStack:") {
-		newLine := strings.Join(strings.Fields(line), " ")
-		r := regexp.MustCompile(`(?P<camera>[^\s\\]*)(\sAI:\s|\sDeepStack:\s)(\[Objects\]\s|Alert\s|\[.+\]\s|)(?P<object>[aA-zZ]*|cancelled|canceled)(\s|:)(\[|)(?P<detail>[0-9]*|.*)(%|\])(\s)(\[.+\]\s|)(?P<duration>[0-9]*)ms`)
-		match := r.FindStringSubmatch(newLine)
-
-		if len(match) == 0 {
-			r2 := regexp.MustCompile(`(?P<camera>[^\s\\]*)(\sAI:\s|\sDeepStack:\s)(\[Objects\]\s|Alert\s|\[.+\]\s|)(?P<object>[aA-zZ]*|cancelled|canceled)(\s|:)(\[|)(?P<detail>[0-9]*|.*)`)
-			match2 := r2.FindStringSubmatch(newLine)
-			if len(match2) == 0 {
-				parseErrors = appendCounterMap(parseErrors, line)
-				parseErrorsTotal++
-			}
-			return nil, nil, ""
-		} else {
-			if strings.Contains(newLine, "cancelled") || strings.Contains(newLine, "canceled") {
-				return match, r, "canceled"
-			} else {
-				return match, r, "alert"
-			}
-		}
-
 	} else if strings.Contains(line, "Signal:") {
 		r := regexp.MustCompile(`(?P<camera>[^\s\\]*)(\s*Signal:\s)(?P<status>.+)`)
 		match := r.FindStringSubmatch(line)
@@ -615,11 +620,20 @@ func findObject(line string) (match []string, r *regexp.Regexp, matchType string
 }
 
 func appendCounterMap(m map[string]float64, key string) map[string]float64 {
-	if val, ok := m[key]; ok {
+	logr := regexp.MustCompile(`^.+(\.\d\d\d|\s[APM]{2})\s(?P<log>.+)`)
+	logmatch := logr.FindStringSubmatch(key)
+	
+	logKey := key
+	if len(logmatch) != 0 {
+		loglineMatch := logr.SubexpIndex("log")
+		logKey = logmatch[loglineMatch]
+	}
+	
+	if val, ok := m[logKey]; ok {
 		val++
-		m[key] = val
+		m[logKey] = val
 	} else {
-		m[key] = 1
+		m[logKey] = 1
 	}
 	return m
 }

go.mod

@@ -1,23 +1,23 @@
 module github.com/wymangr/blueiris_exporter
 
-go 1.18
+go 1.25
 
 require (
-	github.com/prometheus/client_golang v1.13.1
-	golang.org/x/sys v0.1.0
+	github.com/prometheus/client_golang v1.23.2
+	golang.org/x/sys v0.40.0
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 )
 
 require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/stretchr/testify v1.8.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.67.5 // indirect
+	github.com/prometheus/procfs v0.19.2 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 )