From 29de6b5f004e008b13420b3210ad71e389398837 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 02:47:39 +0000 Subject: [PATCH 1/3] Bump github.com/prometheus/client_golang from 1.19.1 to 1.20.3 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.1 to 1.20.3. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.3/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.19.1...v1.20.3) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 9 ++++++--- go.sum | 12 ++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 611da87e..32145248 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/gorilla/mux v1.8.1 github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.3 github.com/prometheus/common v0.55.0 github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c github.com/stretchr/testify v1.9.0 @@ -21,13 +21,16 @@ require ( golift.io/version v0.0.2 ) -require github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect +require ( + github.com/klauspost/compress v1.17.9 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect +) require ( github.com/Microsoft/go-winio v0.6.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/brianvoe/gofakeit/v6 v6.28.0 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/google/uuid v1.3.1 // indirect github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect diff --git a/go.sum b/go.sum index 50863d5f..9ccea281 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/brianvoe/gofakeit/v6 v6.28.0 h1:Xib46XXuQfmlLS2EXRuJpqcw8St6qSZz75OUo0tgAW4= github.com/brianvoe/gofakeit/v6 v6.28.0/go.mod h1:Xj58BMSnFqcn/fAQeSK+/PLtC5kSb7FJIq4JyGa8vEs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -31,10 +31,14 @@ github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7wlPfJLvMCdtV4zPulc4uCPrlywQOmbFOhgQNU= github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo= @@ -43,8 +47,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= +github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From 45a9e0d1eb0a9b3ec8e91db44736a53ab136eba5 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Mon, 9 Sep 2024 08:50:21 -0500 Subject: [PATCH 2/3] update base go toolchain, upgrade golangci-lint to address symbol issues --- .github/workflows/build.yml | 2 +- go.mod | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a015adb..6b8735d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,4 +48,4 @@ jobs: uses: golangci/golangci-lint-action@v6 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.54 + version: v1.60 diff --git a/go.mod b/go.mod index 32145248..843b14ab 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/unpoller/unpoller -go 1.21 +go 1.23 -toolchain go1.22.1 +toolchain go1.23.1 require ( github.com/DataDog/datadog-go v4.8.3+incompatible From 9bdc6e8d0fd58a057ff3d6b6b00bffeee90ec4b3 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Mon, 9 Sep 2024 08:55:12 -0500 Subject: [PATCH 3/3] auto fix lint rules --- pkg/datadogunifi/datadog.go | 4 ++-- pkg/datadogunifi/events.go | 6 +++--- pkg/influxunifi/events.go | 6 +++--- pkg/influxunifi/influxdb.go | 22 +++++++++++----------- pkg/inputunifi/collectevents.go | 12 ++++++------ pkg/inputunifi/input.go | 12 ++++++------ pkg/inputunifi/interface.go | 12 ++++++------ pkg/inputunifi/updateweb.go | 8 ++++---- pkg/lokiunifi/report.go | 4 ++-- pkg/lokiunifi/report_ids.go | 6 +++--- pkg/unittest/dep.go | 4 ++-- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pkg/datadogunifi/datadog.go b/pkg/datadogunifi/datadog.go index b14b4b14..0290fc0e 100644 --- a/pkg/datadogunifi/datadog.go +++ b/pkg/datadogunifi/datadog.go @@ -140,7 +140,7 @@ func (u *DatadogUnifi) setConfigDefaults() { u.options = append(u.options, statsd.WithNamespace(*u.Namespace)) } - if u.Tags != nil && len(u.Tags) > 0 { + if len(u.Tags) > 0 { u.options = append(u.options, statsd.WithTags(u.Tags)) } @@ -378,7 +378,7 @@ func (u *DatadogUnifi) switchExport(r report, v any) { //nolint:cyclop case *unifi.Event: u.batchEvent(r, v) case *unifi.IDS: - u.batchIDS(r, v) + u.batchIDs(r, v) case *unifi.Alarm: u.batchAlarms(r, v) case *unifi.Anomaly: diff --git a/pkg/datadogunifi/events.go b/pkg/datadogunifi/events.go index 33451614..81c52ff3 100644 --- a/pkg/datadogunifi/events.go +++ b/pkg/datadogunifi/events.go @@ -11,11 +11,11 @@ import ( // These constants are used as names for printed/logged counters. const ( eventT = item("Event") - idsT = item("IDS") + idsT = item("IDs") ) -// batchIDS generates intrusion detection datapoints for Datadog. -func (u *DatadogUnifi) batchIDS(r report, i *unifi.IDS) { // nolint:dupl +// batchIDs generates intrusion detection datapoints for Datadog. +func (u *DatadogUnifi) batchIDs(r report, i *unifi.IDS) { // nolint:dupl if time.Since(i.Datetime) > u.Interval.Duration+time.Second { return // The event is older than our interval, ignore it. } diff --git a/pkg/influxunifi/events.go b/pkg/influxunifi/events.go index fd85d5fc..ecbeb333 100644 --- a/pkg/influxunifi/events.go +++ b/pkg/influxunifi/events.go @@ -9,11 +9,11 @@ import ( // These constants are used as names for printed/logged counters. const ( eventT = item("Event") - idsT = item("IDS") + idsT = item("IDs") ) -// batchIDS generates intrusion detection datapoints for InfluxDB. -func (u *InfluxUnifi) batchIDS(r report, i *unifi.IDS) { // nolint:dupl +// batchIDs generates intrusion detection datapoints for InfluxDB. +func (u *InfluxUnifi) batchIDs(r report, i *unifi.IDS) { // nolint:dupl if time.Since(i.Datetime) > u.Interval.Duration+time.Second { return // The event is older than our interval, ignore it. } diff --git a/pkg/influxunifi/influxdb.go b/pkg/influxunifi/influxdb.go index 8b280b93..6cf2dd39 100644 --- a/pkg/influxunifi/influxdb.go +++ b/pkg/influxunifi/influxdb.go @@ -103,11 +103,11 @@ func (u *InfluxUnifi) PollController() { interval := u.Interval.Round(time.Second) ticker := time.NewTicker(interval) version := "1" - + if u.IsVersion2 { version = "2" } - + u.Logf("Poller->InfluxDB started, version: %s, interval: %v, dp: %v, db: %s, url: %s, bucket: %s, org: %s", version, interval, u.DeadPorts, u.DB, u.URL, u.Bucket, u.Org) @@ -120,7 +120,7 @@ func (u *InfluxUnifi) Poll(interval time.Duration) { metrics, err := u.Collector.Metrics(&poller.Filter{Name: "unifi"}) if err != nil { u.LogErrorf("metric fetch for InfluxDB failed: %v", err) - + return } @@ -146,11 +146,11 @@ func (u *InfluxUnifi) Enabled() bool { if u == nil { return false } - + if u.Config == nil { return false } - + return !u.Disable } @@ -158,13 +158,13 @@ func (u *InfluxUnifi) DebugOutput() (bool, error) { if u == nil { return true, nil } - + if !u.Enabled() { return true, nil } - + u.setConfigDefaults() - + _, err := url.Parse(u.Config.URL) if err != nil { return false, fmt.Errorf("invalid influx URL: %v", err) @@ -175,7 +175,7 @@ func (u *InfluxUnifi) DebugOutput() (bool, error) { tlsConfig := &tls.Config{InsecureSkipVerify: !u.VerifySSL} // nolint: gosec serverOptions := influx.DefaultOptions().SetTLSConfig(tlsConfig).SetBatchSize(u.BatchSize) u.InfluxV2Client = influx.NewClientWithOptions(u.URL, u.AuthToken, serverOptions) - + ctx, cancel := context.WithTimeout(context.Background(), time.Second*2) defer cancel() @@ -210,7 +210,7 @@ func (u *InfluxUnifi) DebugOutput() (bool, error) { // Run runs a ticker to poll the unifi server and update influxdb. func (u *InfluxUnifi) Run(c poller.Collect) error { u.Collector = c - + if !u.Enabled() { u.LogDebugf("InfluxDB config missing (or disabled), InfluxDB output disabled!") @@ -452,7 +452,7 @@ func (u *InfluxUnifi) switchExport(r report, v any) { //nolint:cyclop case *unifi.Event: u.batchEvent(r, v) case *unifi.IDS: - u.batchIDS(r, v) + u.batchIDs(r, v) case *unifi.Alarm: u.batchAlarms(r, v) case *unifi.Anomaly: diff --git a/pkg/inputunifi/collectevents.go b/pkg/inputunifi/collectevents.go index b4f19f49..58ab74dd 100644 --- a/pkg/inputunifi/collectevents.go +++ b/pkg/inputunifi/collectevents.go @@ -12,7 +12,7 @@ import ( func (u *InputUnifi) collectControllerEvents(c *Controller) ([]any, error) { u.LogDebugf("Collecting controller events: %s (%s)", c.URL, c.ID) - + if u.isNill(c) { u.Logf("Re-authenticating to UniFi Controller: %s", c.URL) @@ -34,7 +34,7 @@ func (u *InputUnifi) collectControllerEvents(c *Controller) ([]any, error) { type caller func([]any, []*unifi.Site, *Controller) ([]any, error) - for _, call := range []caller{u.collectIDS, u.collectAnomalies, u.collectAlarms, u.collectEvents} { + for _, call := range []caller{u.collectIDs, u.collectAnomalies, u.collectAlarms, u.collectEvents} { if newLogs, err = call(logs, sites, c); err != nil { return logs, err } @@ -123,9 +123,9 @@ func (u *InputUnifi) collectEvents(logs []any, sites []*unifi.Site, c *Controlle return logs, nil } -func (u *InputUnifi) collectIDS(logs []any, sites []*unifi.Site, c *Controller) ([]any, error) { - if *c.SaveIDS { - u.LogDebugf("Collecting controller IDS data: %s (%s)", c.URL, c.ID) +func (u *InputUnifi) collectIDs(logs []any, sites []*unifi.Site, c *Controller) ([]any, error) { + if *c.SaveIDs { + u.LogDebugf("Collecting controller IDs data: %s (%s)", c.URL, c.ID) for _, s := range sites { events, err := c.Unifi.GetIDSSite(s) @@ -159,7 +159,7 @@ func redactEvent(e *unifi.Event, hash *bool, dropPII *bool) *unifi.Event { // metrics.Events[i].Msg <-- not sure what to do here. e.DestIPGeo = unifi.IPGeo{} e.SourceIPGeo = unifi.IPGeo{} - + if *dropPII { e.Host = "" e.Hostname = "" diff --git a/pkg/inputunifi/input.go b/pkg/inputunifi/input.go index 85b163ef..7a650c42 100644 --- a/pkg/inputunifi/input.go +++ b/pkg/inputunifi/input.go @@ -38,7 +38,7 @@ type Controller struct { SaveAnomal *bool `json:"save_anomalies" toml:"save_anomalies" xml:"save_anomalies" yaml:"save_anomalies"` SaveAlarms *bool `json:"save_alarms" toml:"save_alarms" xml:"save_alarms" yaml:"save_alarms"` SaveEvents *bool `json:"save_events" toml:"save_events" xml:"save_events" yaml:"save_events"` - SaveIDS *bool `json:"save_ids" toml:"save_ids" xml:"save_ids" yaml:"save_ids"` + SaveIDs *bool `json:"save_ids" toml:"save_ids" xml:"save_ids" yaml:"save_ids"` SaveDPI *bool `json:"save_dpi" toml:"save_dpi" xml:"save_dpi" yaml:"save_dpi"` SaveRogue *bool `json:"save_rogue" toml:"save_rogue" xml:"save_rogue" yaml:"save_rogue"` HashPII *bool `json:"hash_pii" toml:"hash_pii" xml:"hash_pii" yaml:"hash_pii"` @@ -132,7 +132,7 @@ func (u *InputUnifi) getUnifi(c *Controller) error { }) if err != nil { c.Unifi = nil - + return fmt.Errorf("unifi controller: %w", err) } @@ -231,8 +231,8 @@ func (u *InputUnifi) setDefaults(c *Controller) { //nolint:cyclop c.SaveRogue = &f } - if c.SaveIDS == nil { - c.SaveIDS = &f + if c.SaveIDs == nil { + c.SaveIDs = &f } if c.SaveEvents == nil { @@ -296,8 +296,8 @@ func (u *InputUnifi) setControllerDefaults(c *Controller) *Controller { //nolint c.SaveDPI = u.Default.SaveDPI } - if c.SaveIDS == nil { - c.SaveIDS = u.Default.SaveIDS + if c.SaveIDs == nil { + c.SaveIDs = u.Default.SaveIDs } if c.SaveRogue == nil { diff --git a/pkg/inputunifi/interface.go b/pkg/inputunifi/interface.go index 1ed897a5..67f8b984 100644 --- a/pkg/inputunifi/interface.go +++ b/pkg/inputunifi/interface.go @@ -26,7 +26,7 @@ func (u *InputUnifi) Initialize(l poller.Logger) error { if u.Logger = l; u.Disable { u.Logf("UniFi input plugin disabled or missing configuration!") - + return nil } @@ -63,7 +63,7 @@ func (u *InputUnifi) DebugInput() (bool, error) { if u == nil || u.Config == nil { return true, nil } - + if u.setDefaults(&u.Default); len(u.Controllers) == 0 && !u.Dynamic { u.Controllers = []*Controller{&u.Default} } @@ -80,7 +80,7 @@ func (u *InputUnifi) DebugInput() (bool, error) { for i, c := range u.Controllers { if err := u.getUnifi(u.setControllerDefaults(c)); err != nil { u.LogErrorf("Controller %d of %d Auth or Connection Error, retrying: %v", i+1, len(u.Controllers), err) - + allOK = false if allErrors != nil { @@ -94,7 +94,7 @@ func (u *InputUnifi) DebugInput() (bool, error) { if err := u.checkSites(c); err != nil { u.LogErrorf("checking sites on %s: %v", c.URL, err) - + allOK = false if allErrors != nil { @@ -127,12 +127,12 @@ func (u *InputUnifi) logController(c *Controller) { u.Logf(" => Username: %s (has password: %v)", c.User, c.Pass != "") u.Logf(" => Hash PII %v / Drop PII %v / Poll Sites: %s", *c.HashPII, *c.DropPII, strings.Join(c.Sites, ", ")) u.Logf(" => Save Sites %v / Save DPI %v (metrics)", *c.SaveSites, *c.SaveDPI) - u.Logf(" => Save Events %v / Save IDS %v (logs)", *c.SaveEvents, *c.SaveIDS) + u.Logf(" => Save Events %v / Save IDs %v (logs)", *c.SaveEvents, *c.SaveIDs) u.Logf(" => Save Alarms %v / Anomalies %v (logs)", *c.SaveAlarms, *c.SaveAnomal) u.Logf(" => Save Rogue APs: %v", *c.SaveRogue) } -// Events allows you to pull only events (and IDS) from the UniFi Controller. +// Events allows you to pull only events (and IDs) from the UniFi Controller. // This does not fully respect HashPII, but it may in the future! // Use Filter.Path to pick a specific controller, otherwise poll them all! func (u *InputUnifi) Events(filter *poller.Filter) (*poller.Events, error) { diff --git a/pkg/inputunifi/updateweb.go b/pkg/inputunifi/updateweb.go index ca12dc20..5ac9f450 100644 --- a/pkg/inputunifi/updateweb.go +++ b/pkg/inputunifi/updateweb.go @@ -44,7 +44,7 @@ func formatControllers(controllers []*Controller) []*Controller { SaveAlarms: c.SaveAlarms, SaveRogue: c.SaveRogue, SaveEvents: c.SaveEvents, - SaveIDS: c.SaveIDS, + SaveIDs: c.SaveIDs, SaveDPI: c.SaveDPI, HashPII: c.HashPII, DropPII: c.DropPII, @@ -191,7 +191,7 @@ func (u *InputUnifi) Logf(msg string, v ...any) { Msg: fmt.Sprintf(msg, v...), Tags: map[string]string{"type": "info"}, }) - + if u.Logger != nil { u.Logger.Logf(msg, v...) } @@ -204,7 +204,7 @@ func (u *InputUnifi) LogErrorf(msg string, v ...any) { Msg: fmt.Sprintf(msg, v...), Tags: map[string]string{"type": "error"}, }) - + if u.Logger != nil { u.Logger.LogErrorf(msg, v...) } @@ -217,7 +217,7 @@ func (u *InputUnifi) LogDebugf(msg string, v ...any) { Msg: fmt.Sprintf(msg, v...), Tags: map[string]string{"type": "debug"}, }) - + if u.Logger != nil { u.Logger.LogDebugf(msg, v...) } diff --git a/pkg/lokiunifi/report.go b/pkg/lokiunifi/report.go index edc876c5..0b1f5c42 100644 --- a/pkg/lokiunifi/report.go +++ b/pkg/lokiunifi/report.go @@ -48,7 +48,7 @@ func (r *Report) ProcessEventLogs(events *poller.Events) *Logs { for _, e := range events.Logs { switch event := e.(type) { case *unifi.IDS: - r.IDS(event, logs) + r.IDs(event, logs) case *unifi.Event: r.Event(event, logs) case *unifi.Alarm: @@ -65,7 +65,7 @@ func (r *Report) ProcessEventLogs(events *poller.Events) *Logs { func (r *Report) String() string { return fmt.Sprintf("%s: %d, %s: %d, %s: %d, %s: %d, Dur: %v", - typeEvent, r.Counts[typeEvent], typeIDS, r.Counts[typeIDS], + typeEvent, r.Counts[typeEvent], typeIDs, r.Counts[typeIDs], typeAlarm, r.Counts[typeAlarm], typeAnomaly, r.Counts[typeAnomaly], time.Since(r.Start).Round(time.Millisecond)) } diff --git a/pkg/lokiunifi/report_ids.go b/pkg/lokiunifi/report_ids.go index 53ee384e..b6a1ef9c 100644 --- a/pkg/lokiunifi/report_ids.go +++ b/pkg/lokiunifi/report_ids.go @@ -6,15 +6,15 @@ import ( "github.com/unpoller/unifi" ) -const typeIDS = "IDS" +const typeIDs = "IDs" // event stores a structured event Event for batch sending to Loki. -func (r *Report) IDS(event *unifi.IDS, logs *Logs) { +func (r *Report) IDs(event *unifi.IDS, logs *Logs) { if event.Datetime.Before(r.Oldest) { return } - r.Counts[typeIDS]++ // increase counter and append new log line. + r.Counts[typeIDs]++ // increase counter and append new log line. logs.Streams = append(logs.Streams, LogStream{ Entries: [][]string{{strconv.FormatInt(event.Datetime.UnixNano(), 10), event.Msg}}, diff --git a/pkg/unittest/dep.go b/pkg/unittest/dep.go index ddd2c3b3..725c7e65 100644 --- a/pkg/unittest/dep.go +++ b/pkg/unittest/dep.go @@ -24,7 +24,7 @@ func NewTestSetup(t *testing.T) *TestRig { SaveAnomal: &enabled, SaveAlarms: &enabled, SaveEvents: &enabled, - SaveIDS: &enabled, + SaveIDs: &enabled, SaveDPI: &enabled, SaveRogue: &enabled, SaveSites: &enabled, @@ -42,7 +42,7 @@ func NewTestSetup(t *testing.T) *TestRig { Name: "unifi", Input: in, }) - + return &TestRig{ MockServer: srv, Collector: testCollector,