rename package

integrations/inputunifi/influxunifi/clients.go

@@ -1,4 +1,4 @@
-package influx
+package influxunifi
 
 import (
 	"time"

integrations/inputunifi/influxunifi/ids.go

@@ -1,4 +1,4 @@
-package influx
+package influxunifi
 
 import (
 	influx "github.com/influxdata/influxdb1-client/v2"

integrations/inputunifi/influxunifi/metrics.go

@@ -1,6 +1,6 @@
 // Package influx provides the methods to turn UniFi measurements into influx
 // data-points with appropriate tags and fields.
-package influx
+package influxunifi
 
 import (
 	"github.com/davidnewhall/unifi-poller/metrics"

integrations/inputunifi/influxunifi/site.go

@@ -1,4 +1,4 @@
-package influx
+package influxunifi
 
 import (
 	"strings"

integrations/inputunifi/influxunifi/uap.go

@@ -1,4 +1,4 @@
-package influx
+package influxunifi
 
 import (
 	"time"

integrations/inputunifi/influxunifi/udm.go

@@ -1,4 +1,4 @@
-package influx
+package influxunifi
 
 import (
 	"time"

integrations/inputunifi/influxunifi/usg.go

@@ -1,4 +1,4 @@
-package influx
+package influxunifi
 
 import (
 	"strings"

integrations/inputunifi/influxunifi/usw.go

@@ -1,4 +1,4 @@
-package influx
+package influxunifi
 
 import (
 	"time"

integrations/inputunifi/poller/unifi.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/davidnewhall/unifi-poller/influx"
+	"github.com/davidnewhall/unifi-poller/influxunifi"
 	"github.com/davidnewhall/unifi-poller/metrics"
 	client "github.com/influxdata/influxdb1-client/v2"
 	"golift.io/unifi"
@@ -90,7 +90,7 @@ func (u *UnifiPoller) CollectAndProcess(process func(*metrics.Metrics) error) er
 }
 
 // ExportMetrics updates the internal metrics provided via
-// HTTP at /metrics for prometheus collection.
+// HTTP at /metrics for prometheus collection. This is run by Prometheus.
 func (u *UnifiPoller) ExportMetrics() *metrics.Metrics {
 	if u.Config.ReAuth {
 		u.LogDebugf("Re-authenticating to UniFi Controller")
@@ -100,7 +100,7 @@ func (u *UnifiPoller) ExportMetrics() *metrics.Metrics {
 			return nil
 		}
 	}
-
+	u.LastCheck = time.Now()
 	m, err := u.CollectMetrics()
 	if err != nil {
 		u.LogErrorf("collecting metrics: %v", err)
@@ -177,7 +177,7 @@ func (u *UnifiPoller) AugmentMetrics(metrics *metrics.Metrics) {
 // This creates an InfluxDB writer, and returns an error if the write fails.
 func (u *UnifiPoller) ReportMetrics(metrics *metrics.Metrics) error {
 	// Batch (and send) all the points.
-	m := &influx.Metrics{Metrics: metrics}
+	m := &influxunifi.Metrics{Metrics: metrics}
 	// Make a new Influx Points Batcher.
 	var err error
 	m.BatchPoints, err = client.NewBatchPoints(client.BatchPointsConfig{Database: u.Config.InfluxDB})
@@ -195,7 +195,7 @@ func (u *UnifiPoller) ReportMetrics(metrics *metrics.Metrics) error {
 }
 
 // LogInfluxReport writes a log message after exporting to influxdb.
-func (u *UnifiPoller) LogInfluxReport(m *influx.Metrics) {
+func (u *UnifiPoller) LogInfluxReport(m *influxunifi.Metrics) {
 	var fields, points int
 	for _, p := range m.Points() {
 		points++

integrations/inputunifi/promunifi/collector.go

@@ -50,6 +50,7 @@ func NewUnifiCollector(opts UnifiCollectorOpts) prometheus.Collector {
 	if opts.CollectFn == nil {
 		panic("nil collector function")
 	}
+
 	return &unifiCollector{
 		opts:   opts,
 		Client: descClient(opts.Namespace),
@@ -76,6 +77,7 @@ func (u *unifiCollector) Describe(ch chan<- *prometheus.Desc) {
 			}
 		}
 	}
+
 	describe(u.Client)
 	describe(u.UAP)
 	describe(u.USG)