Merge pull request #702 from unpoller/unet-upgrade-8-1-113-catname

bump unifi client version for more catname flexstring changes

go.mod

@@ -32,7 +32,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/oapi-codegen/runtime v1.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/unpoller/unifi v0.4.2
+	github.com/unpoller/unifi v0.4.3
 	golang.org/x/mod v0.7.0 // indirect
 	golang.org/x/tools v0.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -60,8 +60,8 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/unpoller/unifi v0.4.2 h1:vEsejhyjx72eKOUnPhkN/1U58gXlYuJhRqQseC00hB4=
-github.com/unpoller/unifi v0.4.2/go.mod h1:xcaIIZjSMiu/ZZxaK62f85FWMccvYY/J0HwUXw21IUY=
+github.com/unpoller/unifi v0.4.3 h1:MyX27nf/Nq9a+p/o5qIjNJDJSS+jvxGC7BbxDk09BRg=
+github.com/unpoller/unifi v0.4.3/go.mod h1:TWzPB/1SVbvoweS3RcknQj3Ds+MclHzGGE2weqI+vO0=
 golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
 golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=

pkg/datadogunifi/alarms.go

@@ -53,11 +53,11 @@ func (u *DatadogUnifi) batchAlarms(r report, event *unifi.Alarm) { // nolint:dup
 		"usg_ip":                event.USGIP,
 		"proto":                 event.Proto,
 		"key":                   event.Key,
-		"catname":               event.Catname,
+		"catname":               event.Catname.String(),
 		"app_proto":             event.AppProto,
 		"action":                event.InnerAlertAction,
 	}
-	
+
 	r.addCount(alarmT)
 
 	tagMap = cleanTags(tagMap)

pkg/datadogunifi/events.go

@@ -113,7 +113,7 @@ func (u *DatadogUnifi) batchEvent(r report, i *unifi.Event) { // nolint: funlen
 		"gw_name":               i.GwName,
 		"sw":                    i.Sw,
 		"sw_name":               i.SwName,
-		"catname":               i.Catname,
+		"catname":               i.Catname.String(),
 		"radio":                 i.Radio,
 		"radio_from":            i.RadioFrom,
 		"radio_to":              i.RadioTo,

pkg/influxunifi/alarms.go

@@ -59,7 +59,7 @@ func (u *InfluxUnifi) batchAlarms(r report, event *unifi.Alarm) { // nolint:dupl
 			"usgip":      event.USGIP,
 			"proto":      event.Proto,
 			"key":        event.Key,
-			"catname":    event.Catname,
+			"catname":    event.Catname.String(),
 			"app_proto":  event.AppProto,
 			"action":     event.InnerAlertAction,
 		}),

pkg/influxunifi/events.go

@@ -123,7 +123,7 @@ func (u *InfluxUnifi) batchEvent(r report, i *unifi.Event) { // nolint: funlen
 			"gw_name":      i.GwName,
 			"sw":           i.Sw,
 			"sw_name":      i.SwName,
-			"catname":      i.Catname,
+			"catname":      i.Catname.String(),
 			"radio":        i.Radio,
 			"radio_from":   i.RadioFrom,
 			"radio_to":     i.RadioTo,

pkg/lokiunifi/report_alarm.go

@@ -24,7 +24,7 @@ func (r *Report) Alarm(event *unifi.Alarm, logs *Logs) {
 			"source":       event.SourceName,
 			"site_name":    event.SiteName,
 			"subsystem":    event.Subsystem,
-			"category":     event.Catname,
+			"category":     event.Catname.String(),
 			"event_type":   event.EventType,
 			"key":          event.Key,
 			"app_protocol": event.AppProto,

pkg/lokiunifi/report_event.go

@@ -34,7 +34,7 @@ func (r *Report) Event(event *unifi.Event, logs *Logs) {
 			"gw_name":      event.GwName,
 			"sw":           event.Sw,
 			"sw_name":      event.SwName,
-			"category":     event.Catname,
+			"category":     event.Catname.String(),
 			"radio":        event.Radio,
 			"radio_from":   event.RadioFrom,
 			"radio_to":     event.RadioTo,