Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions agent-manager/go.mod
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
module github.com/utmstack/UTMStack/agent-manager

go 1.22.4
go 1.23.0

toolchain go1.23.4
toolchain go1.24.2

require (
github.com/AtlasInsideCorp/AtlasInsideAES v1.0.0
github.com/gin-contrib/gzip v1.2.2
github.com/gin-gonic/gin v1.10.0
github.com/gin-contrib/gzip v1.2.3
github.com/gin-gonic/gin v1.10.1
github.com/google/uuid v1.6.0
github.com/threatwinds/logger v1.2.1
google.golang.org/grpc v1.71.0
google.golang.org/protobuf v1.36.5
gorm.io/driver/postgres v1.5.11
gorm.io/gorm v1.25.12
github.com/threatwinds/logger v1.2.2
google.golang.org/grpc v1.73.0
google.golang.org/protobuf v1.36.6
gorm.io/driver/postgres v1.6.0
gorm.io/gorm v1.30.0
)

require (
github.com/bytedance/sonic v1.12.7 // indirect
github.com/bytedance/sonic/loader v0.2.2 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/gin-contrib/sse v1.0.0 // indirect
github.com/bytedance/sonic v1.13.3 // indirect
github.com/bytedance/sonic/loader v0.2.4 // indirect
github.com/cloudwego/base64x v0.1.5 // indirect
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
github.com/gin-contrib/sse v1.1.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.24.0 // indirect
github.com/goccy/go-json v0.10.4 // indirect
github.com/go-playground/validator/v10 v10.26.0 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.5.5 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgx/v5 v5.7.5 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/rogpeppe/go-internal v1.14.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
golang.org/x/arch v0.13.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
github.com/ugorji/go/codec v1.2.14 // indirect
golang.org/x/arch v0.18.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.26.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
138 changes: 68 additions & 70 deletions agent-manager/go.sum

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions agent/collectors/macos.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
"os/exec"
"path/filepath"

"github.com/threatwinds/validations"
twsdk "github.com/threatwinds/go-sdk/entities"

"github.com/utmstack/UTMStack/agent/config"
"github.com/utmstack/UTMStack/agent/logservice"
"github.com/utmstack/UTMStack/agent/utils"
Expand Down Expand Up @@ -62,7 +63,7 @@ func (d Darwin) SendLogs() {

utils.Logger.LogF(100, "output: %s", logLine)

validatedLog, _, err := validations.ValidateString(logLine, false)
validatedLog, _, err := twsdk.ValidateString(logLine, false)
if err != nil {
utils.Logger.ErrorF("error validating log: %s: %v", logLine, err)
continue
Expand Down
4 changes: 2 additions & 2 deletions agent/collectors/windows_amd64.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"path/filepath"

"github.com/threatwinds/validations"
twsdk "github.com/threatwinds/go-sdk/entities"
"github.com/utmstack/UTMStack/agent/config"
"github.com/utmstack/UTMStack/agent/logservice"
"github.com/utmstack/UTMStack/agent/utils"
Expand Down Expand Up @@ -80,7 +80,7 @@ func (w Windows) SendLogs() {
logLine := <-logLinesChan
validatedLogs := []string{}
for _, log := range logLine {
validatedLog, _, err := validations.ValidateString(log, false)
validatedLog, _, err := twsdk.ValidateString(log, false)
if err != nil {
utils.Logger.ErrorF("error validating log: %s: %v", log, err)
continue
Expand Down
4 changes: 2 additions & 2 deletions agent/collectors/windows_arm64.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"
"unsafe"

"github.com/threatwinds/validations"
twsdk "github.com/threatwinds/go-sdk/entities"
"github.com/utmstack/UTMStack/agent/config"
"github.com/utmstack/UTMStack/agent/logservice"
"github.com/utmstack/UTMStack/agent/utils"
Expand Down Expand Up @@ -206,7 +206,7 @@ func eventWorker() {
continue
}

validatedLog, _, err := validations.ValidateString(eventJSON, false)
validatedLog, _, err := twsdk.ValidateString(eventJSON, false)
if err != nil {
utils.Logger.LogF(100, "validation error: %s: %v", eventJSON, err)
continue
Expand Down
64 changes: 34 additions & 30 deletions agent/go.mod
Original file line number Diff line number Diff line change
@@ -1,53 +1,57 @@
module github.com/utmstack/UTMStack/agent

go 1.23.0

toolchain go1.23.4
go 1.24.2

require (
github.com/AtlasInsideCorp/AtlasInsideAES v1.0.0
github.com/elastic/go-sysinfo v1.15.1
github.com/elastic/go-sysinfo v1.15.3
github.com/google/uuid v1.6.0
github.com/kardianos/service v1.2.2
github.com/tehmaze/netflow v0.0.0-20240303214733-8c13bb004068
github.com/threatwinds/logger v1.2.1
github.com/threatwinds/validations v1.0.9
golang.org/x/sys v0.31.0
google.golang.org/grpc v1.71.0
google.golang.org/protobuf v1.36.5
github.com/threatwinds/go-sdk v1.0.40
github.com/threatwinds/logger v1.2.2
golang.org/x/sys v0.33.0
google.golang.org/grpc v1.73.0
google.golang.org/protobuf v1.36.6
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/bytedance/sonic v1.12.1 // indirect
github.com/bytedance/sonic/loader v0.2.0 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/elastic/go-windows v1.0.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.10.0 // indirect
github.com/bytedance/sonic v1.13.3 // indirect
github.com/bytedance/sonic/loader v0.2.4 // indirect
github.com/cloudwego/base64x v0.1.5 // indirect
github.com/elastic/go-windows v1.0.2 // indirect
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
github.com/gin-contrib/sse v1.1.0 // indirect
github.com/gin-gonic/gin v1.10.1 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.22.0 // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/go-playground/validator/v10 v10.26.0 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
golang.org/x/arch v0.9.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/net v0.37.0 // indirect
golang.org/x/text v0.23.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
github.com/ugorji/go/codec v1.2.14 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
golang.org/x/arch v0.18.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/text v0.26.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
howett.net/plist v1.0.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading
Loading