diff --git a/go.mod b/go.mod index 574dff1..161550b 100644 --- a/go.mod +++ b/go.mod @@ -9,11 +9,11 @@ require ( ) require ( - gitea.hostxtra.co.uk/mrhid6/vantage/shared v0.0.0 + gitea.hostxtra.co.uk/vantage/vantage-shared v0.0.0 golang.org/x/net v0.25.0 // indirect golang.org/x/text v0.40.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect google.golang.org/protobuf v1.34.1 // indirect ) -replace gitea.hostxtra.co.uk/mrhid6/vantage/shared => ../shared +replace gitea.hostxtra.co.uk/vantage/vantage-shared => ../shared diff --git a/internal/exec/exec.go b/internal/exec/exec.go index 57dbe89..10221b3 100644 --- a/internal/exec/exec.go +++ b/internal/exec/exec.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) type streamWriter struct { diff --git a/internal/grpc/client.go b/internal/grpc/client.go index 9dacc85..1e68984 100644 --- a/internal/grpc/client.go +++ b/internal/grpc/client.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/codec" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/codec" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/inventory/collect_linux.go b/internal/inventory/collect_linux.go index 3347544..d2bbeb0 100644 --- a/internal/inventory/collect_linux.go +++ b/internal/inventory/collect_linux.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) func collect(r *pb.InventoryReport, includeStatic bool) { diff --git a/internal/inventory/collect_other.go b/internal/inventory/collect_other.go index 4740b51..d66cc9a 100644 --- a/internal/inventory/collect_other.go +++ b/internal/inventory/collect_other.go @@ -7,6 +7,6 @@ // without it this file compiles on Linux too and collides with collect_linux.go. package inventory -import "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" +import "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" func collect(r *pb.InventoryReport, includeStatic bool) {} diff --git a/internal/inventory/collect_windows.go b/internal/inventory/collect_windows.go index a6583c0..5226592 100644 --- a/internal/inventory/collect_windows.go +++ b/internal/inventory/collect_windows.go @@ -9,7 +9,7 @@ import ( "golang.org/x/sys/windows" "golang.org/x/sys/windows/registry" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) var ( diff --git a/internal/inventory/inventory.go b/internal/inventory/inventory.go index a1d5214..de5270b 100644 --- a/internal/inventory/inventory.go +++ b/internal/inventory/inventory.go @@ -1,6 +1,6 @@ package inventory -import "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" +import "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" func Collect(includeStatic bool) *pb.InventoryReport { r := &pb.InventoryReport{IncludeStatic: includeStatic, CPU: &pb.CPUReport{}, Memory: &pb.MemReport{}} diff --git a/internal/monitors/monitors.go b/internal/monitors/monitors.go index 62d6c63..5501e1d 100644 --- a/internal/monitors/monitors.go +++ b/internal/monitors/monitors.go @@ -9,7 +9,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/checker" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/config" grpcclient "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/grpc" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) const syncInterval = 30 * time.Second diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 0d0cbc4..2d25cd0 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -14,7 +14,7 @@ import ( "strconv" "time" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) const ( diff --git a/internal/sync/packages.go b/internal/sync/packages.go index c35bc55..4d3af8c 100644 --- a/internal/sync/packages.go +++ b/internal/sync/packages.go @@ -11,7 +11,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/config" grpcclient "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/grpc" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/packages" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) // collectPackagesFlag is written by the 30s key poll and read by the hourly diff --git a/internal/sync/sync.go b/internal/sync/sync.go index 4f6d06d..cac3c9f 100644 --- a/internal/sync/sync.go +++ b/internal/sync/sync.go @@ -25,7 +25,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/monitors" agentproxy "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/proxy" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/updates" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) func Run(ctx context.Context, cfg *config.Config, version string) error { diff --git a/internal/sync/workloads.go b/internal/sync/workloads.go index e7b363a..5479a6d 100644 --- a/internal/sync/workloads.go +++ b/internal/sync/workloads.go @@ -8,7 +8,7 @@ import ( "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/config" grpcclient "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/grpc" "gitea.hostxtra.co.uk/mrhid6/vantage/agent/internal/workloads" - "gitea.hostxtra.co.uk/mrhid6/vantage/shared/grpc/pb" + "gitea.hostxtra.co.uk/vantage/vantage-shared/grpc/pb" ) // workloadInterval is the report cadence. Sixty seconds is affordable because