From 44eec5aaf0b0d9a814d9f387753626f0c3fc66a9 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Sun, 7 Mar 2021 21:49:21 -0800
Subject: [PATCH] updates

---
 integrations/influxunifi/.travis.yml | 4 ++--
 integrations/influxunifi/alarms.go   | 2 +-
 integrations/influxunifi/clients.go  | 4 ++--
 integrations/influxunifi/events.go   | 4 ++--
 integrations/influxunifi/influxdb.go | 7 ++++---
 integrations/influxunifi/site.go     | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/integrations/influxunifi/.travis.yml b/integrations/influxunifi/.travis.yml
index fa14fca0..ab7da6e9 100644
--- a/integrations/influxunifi/.travis.yml
+++ b/integrations/influxunifi/.travis.yml
@@ -1,9 +1,9 @@
 language: go
 go:
-- 1.14.x
+- 1.15.x
 before_install:
   # download super-linter: golangci-lint
 - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin latest
 script:
 - go test ./...
-- golangci-lint run --enable-all
+- golangci-lint run --enable-all -D exhaustivestruct,nlreturn
diff --git a/integrations/influxunifi/alarms.go b/integrations/influxunifi/alarms.go
index 7e5391ae..db5e3b6f 100644
--- a/integrations/influxunifi/alarms.go
+++ b/integrations/influxunifi/alarms.go
@@ -12,7 +12,7 @@ const (
 )
 
 // batchAlarms generates alarm datapoints for InfluxDB.
-func (u *InfluxUnifi) batchAlarms(r report, event *unifi.Alarm) { // nolint: godupl
+func (u *InfluxUnifi) batchAlarms(r report, event *unifi.Alarm) { // nolint:dupl
 	if time.Since(event.Datetime) > u.Interval.Duration+time.Second {
 		return // The event is older than our interval, ignore it.
 	}
diff --git a/integrations/influxunifi/clients.go b/integrations/influxunifi/clients.go
index bc80baa3..87b63c7e 100644
--- a/integrations/influxunifi/clients.go
+++ b/integrations/influxunifi/clients.go
@@ -103,8 +103,8 @@ func (u *InfluxUnifi) batchClientDPI(r report, v interface{}, appTotal, catTotal
 				"rx_packets": dpi.RxPackets,
 				"tx_bytes":   dpi.TxBytes,
 				"rx_bytes":   dpi.RxBytes,
-			}},
-		)
+			},
+		})
 	}
 }
 
diff --git a/integrations/influxunifi/events.go b/integrations/influxunifi/events.go
index 12bc1a9f..070a1c98 100644
--- a/integrations/influxunifi/events.go
+++ b/integrations/influxunifi/events.go
@@ -13,7 +13,7 @@ const (
 )
 
 // batchIDS generates intrusion detection datapoints for InfluxDB.
-func (u *InfluxUnifi) batchIDS(r report, i *unifi.IDS) { // nolint: godupl
+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.
 	}
@@ -157,7 +157,7 @@ func cleanTags(tags map[string]string) map[string]string {
 }
 
 // cleanFields removes any field with a default (or empty) value.
-func cleanFields(fields map[string]interface{}) map[string]interface{} {
+func cleanFields(fields map[string]interface{}) map[string]interface{} { //nolint:cyclop
 	for s := range fields {
 		switch v := fields[s].(type) {
 		case nil:
diff --git a/integrations/influxunifi/influxdb.go b/integrations/influxunifi/influxdb.go
index 67228f7d..eaa6a73d 100644
--- a/integrations/influxunifi/influxdb.go
+++ b/integrations/influxunifi/influxdb.go
@@ -4,6 +4,7 @@ package influxunifi
 
 import (
 	"crypto/tls"
+	"fmt"
 	"io/ioutil"
 	"log"
 	"strconv"
@@ -19,7 +20,7 @@ import (
 )
 
 // PluginName is the name of this plugin.
-const PluginName = "InfluxDB"
+const PluginName = "influxdb"
 
 const (
 	defaultInterval   = 30 * time.Second
@@ -119,7 +120,7 @@ func (u *InfluxUnifi) Run(c poller.Collect) error {
 		TLSConfig: &tls.Config{InsecureSkipVerify: !u.VerifySSL}, // nolint: gosec
 	})
 	if err != nil {
-		return err
+		return fmt.Errorf("making client: %w", err)
 	}
 
 	fake := *u.Config
@@ -259,7 +260,7 @@ func (u *InfluxUnifi) loopPoints(r report) {
 	reportClientDPItotals(r, appTotal, catTotal)
 }
 
-func (u *InfluxUnifi) switchExport(r report, v interface{}) {
+func (u *InfluxUnifi) switchExport(r report, v interface{}) { //nolint:cyclop
 	switch v := v.(type) {
 	case *unifi.UAP:
 		u.batchUAP(r, v)
diff --git a/integrations/influxunifi/site.go b/integrations/influxunifi/site.go
index 4a5a9852..671e4d7c 100644
--- a/integrations/influxunifi/site.go
+++ b/integrations/influxunifi/site.go
@@ -78,7 +78,7 @@ func (u *InfluxUnifi) batchSiteDPI(r report, v interface{}) {
 				"rx_packets": dpi.RxPackets,
 				"tx_bytes":   dpi.TxBytes,
 				"rx_bytes":   dpi.RxBytes,
-			}},
-		)
+			},
+		})
 	}
 }