From 7f91dff9d39ad6c498713288cb2b0bc426850d3b Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Wed, 23 Nov 2022 21:21:24 -0600 Subject: [PATCH] cleanup --- go.mod | 1 - integrations/promunifi/clients.go | 2 +- integrations/promunifi/collector.go | 6 +++--- integrations/promunifi/logger.go | 2 +- integrations/promunifi/report.go | 2 +- integrations/promunifi/site.go | 2 +- integrations/promunifi/uap.go | 2 +- integrations/promunifi/udm.go | 2 +- integrations/promunifi/usg.go | 2 +- integrations/promunifi/usw.go | 2 +- integrations/promunifi/uxg.go | 2 +- main.go | 2 +- 12 files changed, 13 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 6e57f90f..54a9be1b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.19 require ( github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c - github.com/unpoller/promunifi v0.0.0-20210623101918-b986e661ac99 golift.io/cnfg v0.2.1 golift.io/version v0.0.2 ) diff --git a/integrations/promunifi/clients.go b/integrations/promunifi/clients.go index 3806a1e8..119554c1 100644 --- a/integrations/promunifi/clients.go +++ b/integrations/promunifi/clients.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unpoller/core/unifi" ) type uclient struct { diff --git a/integrations/promunifi/collector.go b/integrations/promunifi/collector.go index 61889fc0..3e931bbb 100644 --- a/integrations/promunifi/collector.go +++ b/integrations/promunifi/collector.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" promver "github.com/prometheus/common/version" - "github.com/unpoller/poller" - "github.com/unpoller/unifi" - "github.com/unpoller/webserver" + "github.com/unpoller/unpoller/core/poller" + "github.com/unpoller/unpoller/core/unifi" + "github.com/unpoller/unpoller/core/webserver" "golift.io/version" ) diff --git a/integrations/promunifi/logger.go b/integrations/promunifi/logger.go index 86b007bb..c54f9132 100644 --- a/integrations/promunifi/logger.go +++ b/integrations/promunifi/logger.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/unpoller/webserver" + "github.com/unpoller/unpoller/core/webserver" ) // Logf logs a message. diff --git a/integrations/promunifi/report.go b/integrations/promunifi/report.go index 1e8bf99d..b12bfaa5 100644 --- a/integrations/promunifi/report.go +++ b/integrations/promunifi/report.go @@ -5,7 +5,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/poller" + "github.com/unpoller/unpoller/core/poller" ) // This file contains the report interface. diff --git a/integrations/promunifi/site.go b/integrations/promunifi/site.go index d17539cf..eba1997c 100644 --- a/integrations/promunifi/site.go +++ b/integrations/promunifi/site.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unpoller/core/unifi" ) type site struct { diff --git a/integrations/promunifi/uap.go b/integrations/promunifi/uap.go index aa760ec2..16744b5a 100644 --- a/integrations/promunifi/uap.go +++ b/integrations/promunifi/uap.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unpoller/core/unifi" ) type uap struct { diff --git a/integrations/promunifi/udm.go b/integrations/promunifi/udm.go index 82df7172..e5e36f8e 100644 --- a/integrations/promunifi/udm.go +++ b/integrations/promunifi/udm.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unpoller/core/unifi" ) // These are shared by all four device types: UDM, UAP, USG, USW. diff --git a/integrations/promunifi/usg.go b/integrations/promunifi/usg.go index 92d6d478..8f9f2c61 100644 --- a/integrations/promunifi/usg.go +++ b/integrations/promunifi/usg.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unpoller/core/unifi" ) type usg struct { diff --git a/integrations/promunifi/usw.go b/integrations/promunifi/usw.go index e531b7ca..3b21005f 100644 --- a/integrations/promunifi/usw.go +++ b/integrations/promunifi/usw.go @@ -2,7 +2,7 @@ package promunifi import ( "github.com/prometheus/client_golang/prometheus" - "github.com/unpoller/unifi" + "github.com/unpoller/unpoller/core/unifi" ) type usw struct { diff --git a/integrations/promunifi/uxg.go b/integrations/promunifi/uxg.go index 904cd2d4..f4d0593b 100644 --- a/integrations/promunifi/uxg.go +++ b/integrations/promunifi/uxg.go @@ -1,7 +1,7 @@ package promunifi import ( - "github.com/unpoller/unifi" + "github.com/unpoller/unpoller/core/unifi" ) // exportUXG is a collection of stats from USG and USW. It has no unique stats. diff --git a/main.go b/main.go index 8fe0a81f..7963ef03 100644 --- a/main.go +++ b/main.go @@ -13,7 +13,7 @@ import ( _ "github.com/unpoller/integrations/datadogunifi" _ "github.com/unpoller/integrations/influxunifi" _ "github.com/unpoller/integrations/lokiunifi" - _ "github.com/unpoller/promunifi" + _ "github.com/unpoller/integrations/promunifi" ) // Keep it simple.