From ee90410d8ff9953a4c0f6b73efb0c080164d4743 Mon Sep 17 00:00:00 2001
From: davidnewhall2 <david@sleepers.pro>
Date: Thu, 25 Jun 2020 03:33:58 -0700
Subject: [PATCH] minor fixes

---
 integrations/lokiunifi/loki.go   |  3 +--
 integrations/lokiunifi/report.go | 14 ++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/integrations/lokiunifi/loki.go b/integrations/lokiunifi/loki.go
index 73f084a5..13e70d23 100644
--- a/integrations/lokiunifi/loki.go
+++ b/integrations/lokiunifi/loki.go
@@ -108,12 +108,11 @@ func (l *Loki) pollController(start time.Time) error {
 	}
 
 	report := &Report{
-		Events: events,
 		Start:  start,
 		Logger: l.Collect,
 		Client: l.client,
 		Last:   &l.last,
 	}
 
-	return report.Execute(4 * l.Interval.Duration) // nolint: gomnd
+	return report.Execute(events, 4*l.Interval.Duration) // nolint: gomnd
 }
diff --git a/integrations/lokiunifi/report.go b/integrations/lokiunifi/report.go
index 42cb69e0..c7db5514 100644
--- a/integrations/lokiunifi/report.go
+++ b/integrations/lokiunifi/report.go
@@ -27,20 +27,18 @@ type Report struct {
 	Start  time.Time
 	Last   *time.Time
 	Client *Client
-	Events *poller.Events
 	LogStreams
 	poller.Logger
 }
 
-// ReportEvents should be easy to test.
-// Reports events to Loki, updates last check time, and prints a log message.
-func (r *Report) Execute(skipDur time.Duration) error {
+// Execute processes events, reports events to Loki, updates last check time, and prints a log message.
+func (r *Report) Execute(events *poller.Events, skipDur time.Duration) error {
 	// Sometimes it gets stuck on old messages. This gets it past that.
 	if time.Since(*r.Last) > skipDur {
 		*r.Last = time.Now().Add(-skipDur)
 	}
 
-	r.ProcessEventLogs() // Compile report.
+	r.ProcessEventLogs(events) // Compile report.
 
 	// Send report to Loki.
 	if err := r.Client.Post(r.LogStreams); err != nil {
@@ -48,7 +46,7 @@ func (r *Report) Execute(skipDur time.Duration) error {
 	}
 
 	*r.Last = r.Start
-	r.Logf("Events sent to Loki. Events: %d, IDS: %d, Alarm: %d, Anomalies: %d, Dur: %v",
+	r.Logf("Events sent to Loki. Event: %d, IDS: %d, Alarm: %d, Anomaly: %d, Dur: %v",
 		r.Counts[typeEvent], r.Counts[typeIDS], r.Counts[typeAlarm], r.Counts[typeAnomaly],
 		time.Since(r.Start).Round(time.Millisecond))
 
@@ -58,8 +56,8 @@ func (r *Report) Execute(skipDur time.Duration) error {
 // ProcessEventLogs loops the event Logs, matches the interface
 // type, calls the appropriate method for the data, and compiles the report.
 // This runs once per interval, if there was no collection error.
-func (r *Report) ProcessEventLogs() {
-	for _, e := range r.Events.Logs {
+func (r *Report) ProcessEventLogs(events *poller.Events) {
+	for _, e := range events.Logs {
 		switch event := e.(type) {
 		case *unifi.IDS:
 			r.IDS(event)