Refactor collectors and improve error handling

Replaced "beats" with "collectors" for a unified nomenclature across different platforms. Removed unused functions, improved error messaging consistency, and enhanced code readability. Also implemented a placeholder function for macOS support as part of planned enhancements.

Author: osmontero

agent/installer/go.mod

@@ -5,7 +5,6 @@ go 1.22.5
 require (
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/threatwinds/logger v1.1.12
-	google.golang.org/grpc v1.69.2
 )
 
 require (
@@ -37,7 +36,6 @@ require (
 	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241230172942-26aa7a208def // indirect
 	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

agent/installer/main.go

@@ -27,19 +27,28 @@ func main() {
 			}
 
 			utils.Logger.WriteSimpleMessage("Installing UTMStack Agent...")
-			if !utils.IsPortOpen(ip, config.AgentManagerPort) || !utils.IsPortOpen(ip, config.LogAuthProxyPort) || !utils.IsPortOpen(ip, config.DependenciesPort) {
-				utils.Logger.WriteFatal("one or more of the requiered ports are closed. Please open ports 9000 and 50051.")
+
+			if err := utils.IsPortReachable(ip, config.AgentManagerPort); err != nil {
+				utils.Logger.WriteFatal("cannot connect to %s on port %d, %v", ip, config.AgentManagerPort, err)
+			}
+
+			if err := utils.IsPortReachable(ip, config.LogAuthProxyPort); err != nil {
+				utils.Logger.WriteFatal("cannot connect to %s on port %d, %v", ip, config.LogAuthProxyPort, err)
+			}
+
+			if err := utils.IsPortReachable(ip, config.DependenciesPort); err != nil {
+				utils.Logger.WriteFatal("cannot connect to %s on port %d: %v", ip, config.DependenciesPort, err)
 			}
 
 			certsPath := filepath.Join(path, "certs")
 			err := utils.CreatePathIfNotExist(certsPath)
 			if err != nil {
-				utils.Logger.WriteFatal("error creating path: %s", err)
+				utils.Logger.WriteFatal("error creating path: %v", err)
 			}
 
 			err = utils.GenerateCerts(certsPath)
 			if err != nil {
-				utils.Logger.WriteFatal("error generating certificates: %s", err)
+				utils.Logger.WriteFatal("error generating certificates: %v", err)
 			}
 
 			utils.Logger.WriteSimpleMessage("Downloading UTMStack dependencies...")

agent/installer/utils/files.go

@@ -29,17 +29,6 @@ func WriteStringToFile(fileName string, body string) error {
 	return err
 }
 
-func WriteBytesToFile(fileName string, data []byte) error {
-	file, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, os.ModePerm)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	_, err = file.Write(data) // Cambiado de WriteString a Write para aceptar []byte directamente
-	return err
-}
-
 func WriteJSON(path string, data interface{}) error {
 	jsonData, err := json.MarshalIndent(data, "", "    ")
 	if err != nil {

agent/installer/utils/logger.go

@@ -57,8 +57,7 @@ func (b *BeautyLogger) PrintBanner() {
 		" | |  | | | __| | '_ ` _ \\   \\___ \\  | __|  / _` |  / __| | |/ / \n" +
 		" | |__| | | |_  | | | | | |  ____) | | |_  | (_| | | (__  |   <  \n" +
 		"  \\____/   \\__| |_| |_| |_| |_____/   \\__|  \\__,_|  \\___| |_|\\_\\ \n" +
-		"..........................................................................\n" +
-		"\n"
+		".........................................................................."
 
 	fmt.Println(banner)
 }

agent/installer/utils/ports.go

@@ -6,14 +6,20 @@ import (
 	"time"
 )
 
-func IsPortOpen(ip, port string) bool {
+func IsPortReachable(ip, port string) error {
+	var (
+		conn net.Conn
+		err  error
+	)
+
 	for i := 0; i < 3; i++ {
-		conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%s", ip, port), 5*time.Second)
+		conn, err = net.DialTimeout("tcp", fmt.Sprintf("%s:%s", ip, port), 5*time.Second)
 		if err == nil {
-			defer conn.Close()
-			return true
+			conn.Close()
+			return nil
 		}
 		time.Sleep(5 * time.Second)
 	}
-	return false
+
+	return err
 }

agent/self/config/const.go

@@ -8,7 +8,7 @@ const (
 )
 
 func GetAgentBin(typ string) string {
-	var bin string = "utmstack_agent_service"
+	var bin = "utmstack_agent_service"
 	if typ == "new" {
 		bin = bin + "_new"
 	}

agent/self/main.go

@@ -27,7 +27,7 @@ func main() {
 
 	time.Sleep(10 * time.Second)
 
-	err := update.UpdateService()
+	err := update.RunUpdate()
 	if err != nil {
 		utils.SelfLogger.Fatal("error updating new %s service: %v", config.SERV_NAME, err)
 	}

agent/self/update/update.go

@@ -9,7 +9,7 @@ import (
 	"github.com/utmstack/UTMStack/agent/self/utils"
 )
 
-func UpdateService() error {
+func RunUpdate() error {
 	path := utils.GetMyPath()
 
 	newbin := config.GetAgentBin("new")

agent/self/utils/services.go

@@ -24,7 +24,7 @@ func CheckIfServiceIsActive(serv string) (bool, error) {
 		return false, nil
 	}
 
-	serviceStatus := strings.ToLower(strings.TrimSpace(string(output)))
+	serviceStatus := strings.ToLower(strings.TrimSpace(output))
 	if runtime.GOOS == "linux" {
 		return serviceStatus == "active", nil
 	} else if runtime.GOOS == "windows" {

agent/service/agent/delete.go

@@ -1,7 +1,7 @@
 package agent
 
 import (
-	context "context"
+	"context"
 	"fmt"
 	"os/user"
 	"strconv"
@@ -13,12 +13,12 @@ import (
 )
 
 func DeleteAgent(cnf *config.Config) error {
-	conn, err := conn.GetAgentManagerConnection(cnf)
+	connection, err := conn.GetAgentManagerConnection(cnf)
 	if err != nil {
 		return fmt.Errorf("error connecting to Agent Manager: %v", err)
 	}
 
-	agentClient := NewAgentServiceClient(conn)
+	agentClient := NewAgentServiceClient(connection)
 	ctx, cancel := context.WithCancel(context.Background())
 	ctx = metadata.AppendToOutgoingContext(ctx, "key", cnf.AgentKey)
 	ctx = metadata.AppendToOutgoingContext(ctx, "id", strconv.Itoa(int(cnf.AgentID)))
@@ -30,11 +30,11 @@ func DeleteAgent(cnf *config.Config) error {
 		return fmt.Errorf("error getting user: %v", err)
 	}
 
-	delet := &DeleteRequest{
+	delReq := &DeleteRequest{
 		DeletedBy: currentUser.Username,
 	}
 
-	_, err = agentClient.DeleteAgent(ctx, delet)
+	_, err = agentClient.DeleteAgent(ctx, delReq)
 	if err != nil {
 		utils.Logger.ErrorF("error removing UTMStack Agent from Agent Manager %v", err)
 	}