Skip to content

Commit ffa1783

Browse files
committed
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.
1 parent 7761391 commit ffa1783

44 files changed

Lines changed: 307 additions & 420 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

agent/installer/go.mod

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ go 1.22.5
55
require (
66
github.com/logrusorgru/aurora v2.0.3+incompatible
77
github.com/threatwinds/logger v1.1.12
8-
google.golang.org/grpc v1.69.2
98
)
109

1110
require (
@@ -37,7 +36,6 @@ require (
3736
golang.org/x/net v0.33.0 // indirect
3837
golang.org/x/sys v0.28.0 // indirect
3938
golang.org/x/text v0.21.0 // indirect
40-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241230172942-26aa7a208def // indirect
4139
google.golang.org/protobuf v1.36.1 // indirect
4240
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
4341
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

agent/installer/main.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,28 @@ func main() {
2727
}
2828

2929
utils.Logger.WriteSimpleMessage("Installing UTMStack Agent...")
30-
if !utils.IsPortOpen(ip, config.AgentManagerPort) || !utils.IsPortOpen(ip, config.LogAuthProxyPort) || !utils.IsPortOpen(ip, config.DependenciesPort) {
31-
utils.Logger.WriteFatal("one or more of the requiered ports are closed. Please open ports 9000 and 50051.")
30+
31+
if err := utils.IsPortReachable(ip, config.AgentManagerPort); err != nil {
32+
utils.Logger.WriteFatal("cannot connect to %s on port %d, %v", ip, config.AgentManagerPort, err)
33+
}
34+
35+
if err := utils.IsPortReachable(ip, config.LogAuthProxyPort); err != nil {
36+
utils.Logger.WriteFatal("cannot connect to %s on port %d, %v", ip, config.LogAuthProxyPort, err)
37+
}
38+
39+
if err := utils.IsPortReachable(ip, config.DependenciesPort); err != nil {
40+
utils.Logger.WriteFatal("cannot connect to %s on port %d: %v", ip, config.DependenciesPort, err)
3241
}
3342

3443
certsPath := filepath.Join(path, "certs")
3544
err := utils.CreatePathIfNotExist(certsPath)
3645
if err != nil {
37-
utils.Logger.WriteFatal("error creating path: %s", err)
46+
utils.Logger.WriteFatal("error creating path: %v", err)
3847
}
3948

4049
err = utils.GenerateCerts(certsPath)
4150
if err != nil {
42-
utils.Logger.WriteFatal("error generating certificates: %s", err)
51+
utils.Logger.WriteFatal("error generating certificates: %v", err)
4352
}
4453

4554
utils.Logger.WriteSimpleMessage("Downloading UTMStack dependencies...")

agent/installer/utils/files.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@ func WriteStringToFile(fileName string, body string) error {
2929
return err
3030
}
3131

32-
func WriteBytesToFile(fileName string, data []byte) error {
33-
file, err := os.OpenFile(fileName, os.O_CREATE|os.O_RDWR|os.O_TRUNC, os.ModePerm)
34-
if err != nil {
35-
return err
36-
}
37-
defer file.Close()
38-
39-
_, err = file.Write(data) // Cambiado de WriteString a Write para aceptar []byte directamente
40-
return err
41-
}
42-
4332
func WriteJSON(path string, data interface{}) error {
4433
jsonData, err := json.MarshalIndent(data, "", " ")
4534
if err != nil {

agent/installer/utils/logger.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ func (b *BeautyLogger) PrintBanner() {
5757
" | | | | | __| | '_ ` _ \\ \\___ \\ | __| / _` | / __| | |/ / \n" +
5858
" | |__| | | |_ | | | | | | ____) | | |_ | (_| | | (__ | < \n" +
5959
" \\____/ \\__| |_| |_| |_| |_____/ \\__| \\__,_| \\___| |_|\\_\\ \n" +
60-
"..........................................................................\n" +
61-
"\n"
60+
".........................................................................."
6261

6362
fmt.Println(banner)
6463
}

agent/installer/utils/ports.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ import (
66
"time"
77
)
88

9-
func IsPortOpen(ip, port string) bool {
9+
func IsPortReachable(ip, port string) error {
10+
var (
11+
conn net.Conn
12+
err error
13+
)
14+
1015
for i := 0; i < 3; i++ {
11-
conn, err := net.DialTimeout("tcp", fmt.Sprintf("%s:%s", ip, port), 5*time.Second)
16+
conn, err = net.DialTimeout("tcp", fmt.Sprintf("%s:%s", ip, port), 5*time.Second)
1217
if err == nil {
13-
defer conn.Close()
14-
return true
18+
conn.Close()
19+
return nil
1520
}
1621
time.Sleep(5 * time.Second)
1722
}
18-
return false
23+
24+
return err
1925
}

agent/self/config/const.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const (
88
)
99

1010
func GetAgentBin(typ string) string {
11-
var bin string = "utmstack_agent_service"
11+
var bin = "utmstack_agent_service"
1212
if typ == "new" {
1313
bin = bin + "_new"
1414
}

agent/self/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func main() {
2727

2828
time.Sleep(10 * time.Second)
2929

30-
err := update.UpdateService()
30+
err := update.RunUpdate()
3131
if err != nil {
3232
utils.SelfLogger.Fatal("error updating new %s service: %v", config.SERV_NAME, err)
3333
}

agent/self/update/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/utmstack/UTMStack/agent/self/utils"
1010
)
1111

12-
func UpdateService() error {
12+
func RunUpdate() error {
1313
path := utils.GetMyPath()
1414

1515
newbin := config.GetAgentBin("new")

agent/self/utils/services.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func CheckIfServiceIsActive(serv string) (bool, error) {
2424
return false, nil
2525
}
2626

27-
serviceStatus := strings.ToLower(strings.TrimSpace(string(output)))
27+
serviceStatus := strings.ToLower(strings.TrimSpace(output))
2828
if runtime.GOOS == "linux" {
2929
return serviceStatus == "active", nil
3030
} else if runtime.GOOS == "windows" {

agent/service/agent/delete.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package agent
22

33
import (
4-
context "context"
4+
"context"
55
"fmt"
66
"os/user"
77
"strconv"
@@ -13,12 +13,12 @@ import (
1313
)
1414

1515
func DeleteAgent(cnf *config.Config) error {
16-
conn, err := conn.GetAgentManagerConnection(cnf)
16+
connection, err := conn.GetAgentManagerConnection(cnf)
1717
if err != nil {
1818
return fmt.Errorf("error connecting to Agent Manager: %v", err)
1919
}
2020

21-
agentClient := NewAgentServiceClient(conn)
21+
agentClient := NewAgentServiceClient(connection)
2222
ctx, cancel := context.WithCancel(context.Background())
2323
ctx = metadata.AppendToOutgoingContext(ctx, "key", cnf.AgentKey)
2424
ctx = metadata.AppendToOutgoingContext(ctx, "id", strconv.Itoa(int(cnf.AgentID)))
@@ -30,11 +30,11 @@ func DeleteAgent(cnf *config.Config) error {
3030
return fmt.Errorf("error getting user: %v", err)
3131
}
3232

33-
delet := &DeleteRequest{
33+
delReq := &DeleteRequest{
3434
DeletedBy: currentUser.Username,
3535
}
3636

37-
_, err = agentClient.DeleteAgent(ctx, delet)
37+
_, err = agentClient.DeleteAgent(ctx, delReq)
3838
if err != nil {
3939
utils.Logger.ErrorF("error removing UTMStack Agent from Agent Manager %v", err)
4040
}

0 commit comments

Comments
 (0)