all to pkg

main.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 	// Load input plugins!
 	_ "github.com/unpoller/unpoller/pkg/inputunifi"
 	// Load output plugins!

pkg/datadogunifi/datadog.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/DataDog/datadog-go/statsd"
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 	"golift.io/cnfg"
 )
 

pkg/datadogunifi/report.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/DataDog/datadog-go/statsd"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 )
 
 // Report is a will report the current collection run data.

pkg/influxunifi/influxdb.go

@@ -13,8 +13,8 @@ import (
 
 	influx "github.com/influxdata/influxdb1-client/v2"
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/poller"
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/poller"
+	"github.com/unpoller/unpoller/pkg/webserver"
 	"golift.io/cnfg"
 )
 

pkg/influxunifi/logger.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/webserver"
 )
 
 // Logf logs a message.

pkg/influxunifi/report.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	influx "github.com/influxdata/influxdb1-client/v2"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 )
 
 // Report is returned to the calling procedure after everything is processed.

pkg/inputunifi/collectevents.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/webserver"
 )
 
 /* Event collection. Events are also sent to the webserver for display. */

pkg/inputunifi/collector.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 )
 
 var ErrScrapeFilterMatchFailed = fmt.Errorf("scrape filter match failed, and filter is not http URL")

pkg/inputunifi/input.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 )
 
 // PluginName is the name of this input plugin.

pkg/inputunifi/interface.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/poller"
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/poller"
+	"github.com/unpoller/unpoller/pkg/webserver"
 )
 
 var (

pkg/inputunifi/updateweb.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/webserver"
 )
 
 /* This code reformats our data to be displayed on the built-in web interface. */

pkg/lokiunifi/logger.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/webserver"
 )
 
 // Logf logs a message.

pkg/lokiunifi/loki.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/unpoller/unpoller/core/poller"
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/poller"
+	"github.com/unpoller/unpoller/pkg/webserver"
 	"golift.io/cnfg"
 )
 

pkg/lokiunifi/report.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 )
 
 // LogStream contains a stream of logs (like a log file).

pkg/mysqlunifi/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 	"golift.io/cnfg"
 )
 

pkg/promunifi/collector.go

@@ -13,8 +13,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	promver "github.com/prometheus/common/version"
 	"github.com/unpoller/unifi"
-	"github.com/unpoller/unpoller/core/poller"
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/poller"
+	"github.com/unpoller/unpoller/pkg/webserver"
 	"golift.io/version"
 )
 

pkg/promunifi/logger.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/unpoller/unpoller/core/webserver"
+	"github.com/unpoller/unpoller/pkg/webserver"
 )
 
 // Logf logs a message.

pkg/promunifi/report.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 )
 
 // This file contains the report interface.

pkg/webserver/server.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 	"golang.org/x/crypto/bcrypt"
 )
 

pkg/webserver/shared.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/unpoller/unpoller/core/poller"
+	"github.com/unpoller/unpoller/pkg/poller"
 )
 
 /* This file has the methods that help the content-methods. Shared helpers. */