From 1f53ecb0936df377772806d0920664281bc19cd2 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Mon, 13 May 2024 20:37:27 +0100 Subject: [PATCH] Refactor package names and imports in InfrastructureAgent code files --- InfrastructureAgent/{cmd => }/config.go | 0 InfrastructureAgent/{cmd => }/main.go | 2 +- InfrastructureAgent/model/cpu_metrics.go | 2 +- InfrastructureAgent/model/disk_metrics.go | 2 +- InfrastructureAgent/model/infrastructure_metrics.go | 2 +- InfrastructureAgent/model/memory_metrics.go | 2 +- InfrastructureAgent/model/server_monitor_report.go | 2 +- InfrastructureAgent/model/server_process.go | 2 +- InfrastructureAgent/shutdown.go | 2 +- InfrastructureAgent/utils/agent.go | 2 +- InfrastructureAgent/utils/cpu.go | 2 +- InfrastructureAgent/utils/disk.go | 2 +- InfrastructureAgent/utils/memory.go | 3 ++- InfrastructureAgent/utils/procs.go | 5 +++-- 14 files changed, 16 insertions(+), 14 deletions(-) rename InfrastructureAgent/{cmd => }/config.go (100%) rename InfrastructureAgent/{cmd => }/main.go (99%) diff --git a/InfrastructureAgent/cmd/config.go b/InfrastructureAgent/config.go similarity index 100% rename from InfrastructureAgent/cmd/config.go rename to InfrastructureAgent/config.go diff --git a/InfrastructureAgent/cmd/main.go b/InfrastructureAgent/main.go similarity index 99% rename from InfrastructureAgent/cmd/main.go rename to InfrastructureAgent/main.go index 1306da69b4..a37a07ef00 100644 --- a/InfrastructureAgent/cmd/main.go +++ b/InfrastructureAgent/main.go @@ -4,7 +4,7 @@ import ( "flag" "fmt" "log/slog" - agentgo "oneuptime-infrastructure-agent" + agentgo "oneuptime_infrastructure_agent" "os" "github.com/gookit/config/v2" diff --git a/InfrastructureAgent/model/cpu_metrics.go b/InfrastructureAgent/model/cpu_metrics.go index 5772644fa0..fd4a3c2d23 100644 --- a/InfrastructureAgent/model/cpu_metrics.go +++ b/InfrastructureAgent/model/cpu_metrics.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package model type CPUMetrics struct { PercentUsed float64 `json:"percentUsed"` diff --git a/InfrastructureAgent/model/disk_metrics.go b/InfrastructureAgent/model/disk_metrics.go index 6f8bf54059..721fa019bb 100644 --- a/InfrastructureAgent/model/disk_metrics.go +++ b/InfrastructureAgent/model/disk_metrics.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package model type BasicDiskMetrics struct { Total uint64 `json:"total"` diff --git a/InfrastructureAgent/model/infrastructure_metrics.go b/InfrastructureAgent/model/infrastructure_metrics.go index 98f051cff0..0f8d1f53f7 100644 --- a/InfrastructureAgent/model/infrastructure_metrics.go +++ b/InfrastructureAgent/model/infrastructure_metrics.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package model type BasicInfrastructureMetrics struct { CpuMetrics *CPUMetrics `json:"cpuMetrics"` diff --git a/InfrastructureAgent/model/memory_metrics.go b/InfrastructureAgent/model/memory_metrics.go index 6c8c5c7d37..7621450c36 100644 --- a/InfrastructureAgent/model/memory_metrics.go +++ b/InfrastructureAgent/model/memory_metrics.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package model type MemoryMetrics struct { Total uint64 `json:"total"` diff --git a/InfrastructureAgent/model/server_monitor_report.go b/InfrastructureAgent/model/server_monitor_report.go index 548fcc547f..47a57909b8 100644 --- a/InfrastructureAgent/model/server_monitor_report.go +++ b/InfrastructureAgent/model/server_monitor_report.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package model type ServerMonitorReport struct { SecretKey string `json:"secretKey"` diff --git a/InfrastructureAgent/model/server_process.go b/InfrastructureAgent/model/server_process.go index 5c4a3d7dc4..3a74ff303f 100644 --- a/InfrastructureAgent/model/server_process.go +++ b/InfrastructureAgent/model/server_process.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package model type ServerProcess struct { Pid int32 `json:"pid"` diff --git a/InfrastructureAgent/shutdown.go b/InfrastructureAgent/shutdown.go index 18e13ae08e..214aee2b85 100644 --- a/InfrastructureAgent/shutdown.go +++ b/InfrastructureAgent/shutdown.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package main import ( "os" diff --git a/InfrastructureAgent/utils/agent.go b/InfrastructureAgent/utils/agent.go index 2e63e2a32c..62584d3281 100644 --- a/InfrastructureAgent/utils/agent.go +++ b/InfrastructureAgent/utils/agent.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package utils import ( "encoding/json" diff --git a/InfrastructureAgent/utils/cpu.go b/InfrastructureAgent/utils/cpu.go index 526b40e9d2..4e3d5b0510 100644 --- a/InfrastructureAgent/utils/cpu.go +++ b/InfrastructureAgent/utils/cpu.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package utils import ( "fmt" diff --git a/InfrastructureAgent/utils/disk.go b/InfrastructureAgent/utils/disk.go index d39607eeec..467612901a 100644 --- a/InfrastructureAgent/utils/disk.go +++ b/InfrastructureAgent/utils/disk.go @@ -1,4 +1,4 @@ -package oneuptime_infrastructure_agent +package utils import ( "log/slog" diff --git a/InfrastructureAgent/utils/memory.go b/InfrastructureAgent/utils/memory.go index 605d0bedd2..f87e407964 100644 --- a/InfrastructureAgent/utils/memory.go +++ b/InfrastructureAgent/utils/memory.go @@ -1,7 +1,8 @@ -package oneuptime_infrastructure_agent +package utils import ( "log/slog" + "github.com/shirou/gopsutil/v3/mem" ) diff --git a/InfrastructureAgent/utils/procs.go b/InfrastructureAgent/utils/procs.go index 8e081c524c..7d4aa96dcf 100644 --- a/InfrastructureAgent/utils/procs.go +++ b/InfrastructureAgent/utils/procs.go @@ -1,8 +1,9 @@ -package oneuptime_infrastructure_agent +package utils import ( - "github.com/shirou/gopsutil/v3/process" "log/slog" + + "github.com/shirou/gopsutil/v3/process" ) // getServerProcesses retrieves the list of server processes