From 1367ddbd38bf65cc972fdd7a6af517b94fcff301 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Fri, 19 Apr 2024 15:38:24 -0500 Subject: [PATCH 1/2] bump unifi client version for more catname flexstring changes --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4a3a46f9..192a216d 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index ad3648ca..125ab01b 100644 --- a/go.sum +++ b/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= From 4bd56677c9764f8d213395cacce5fb1d89ba0eff Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Fri, 19 Apr 2024 15:43:00 -0500 Subject: [PATCH 2/2] fix type --- pkg/datadogunifi/alarms.go | 4 ++-- pkg/datadogunifi/events.go | 2 +- pkg/influxunifi/alarms.go | 2 +- pkg/influxunifi/events.go | 2 +- pkg/lokiunifi/report_alarm.go | 2 +- pkg/lokiunifi/report_event.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/datadogunifi/alarms.go b/pkg/datadogunifi/alarms.go index 83688e75..90c5dfe1 100644 --- a/pkg/datadogunifi/alarms.go +++ b/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) diff --git a/pkg/datadogunifi/events.go b/pkg/datadogunifi/events.go index aa38de94..33451614 100644 --- a/pkg/datadogunifi/events.go +++ b/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, diff --git a/pkg/influxunifi/alarms.go b/pkg/influxunifi/alarms.go index 238de6c7..072a9ff8 100644 --- a/pkg/influxunifi/alarms.go +++ b/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, }), diff --git a/pkg/influxunifi/events.go b/pkg/influxunifi/events.go index 1d791a5c..fd85d5fc 100644 --- a/pkg/influxunifi/events.go +++ b/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, diff --git a/pkg/lokiunifi/report_alarm.go b/pkg/lokiunifi/report_alarm.go index 47780dba..a9006c0e 100644 --- a/pkg/lokiunifi/report_alarm.go +++ b/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, diff --git a/pkg/lokiunifi/report_event.go b/pkg/lokiunifi/report_event.go index 3c5aaa72..8ec3e47c 100644 --- a/pkg/lokiunifi/report_event.go +++ b/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,