Skip to content

Commit ffaa31d

Browse files
osmonteroosmontero
committed
Merge remote-tracking branch 'origin/feature/10.6.0/new_correlation' into feature/10.6.0/new_correlation
2 parents 28321d0 + 7249b3a commit ffaa31d

File tree

10 files changed

+60
-52
lines changed

10 files changed

+60
-52
lines changed

‎agent/service/beats/winlogbeat.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"path/filepath"
77

8-
go_sdk "github.com/threatwinds/go-sdk"
8+
"github.com/threatwinds/go-sdk/plugins"
99
"github.com/threatwinds/validations"
1010
"github.com/utmstack/UTMStack/agent/service/config"
1111
"github.com/utmstack/UTMStack/agent/service/logservice"
@@ -78,7 +78,7 @@ func (w Winlogbeat) SendSystemLogs() {
7878
utils.Logger.ErrorF("error getting hostname: %v", err)
7979
host = "unknown"
8080
}
81-
logservice.LogQueue <- &go_sdk.Log{
81+
logservice.LogQueue <- &plugins.Log{
8282
DataType: string(config.DataTypeWindowsAgent),
8383
DataSource: host,
8484
Raw: validatedLog,

‎agent/service/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/google/uuid v1.6.0
1010
github.com/kardianos/service v1.2.2
1111
github.com/tehmaze/netflow v0.0.0-20240303214733-8c13bb004068
12-
github.com/threatwinds/go-sdk v0.13.0
12+
github.com/threatwinds/go-sdk v1.0.7
1313
github.com/threatwinds/logger v1.1.12
1414
github.com/threatwinds/validations v1.0.9
1515
google.golang.org/grpc v1.69.2
@@ -27,7 +27,7 @@ require (
2727
github.com/cloudwego/iasm v0.2.0 // indirect
2828
github.com/dustin/go-humanize v1.0.1 // indirect
2929
github.com/elastic/go-windows v1.0.0 // indirect
30-
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
30+
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
3131
github.com/gin-contrib/sse v1.0.0 // indirect
3232
github.com/gin-gonic/gin v1.10.0 // indirect
3333
github.com/glebarez/go-sqlite v1.21.2 // indirect
@@ -58,14 +58,14 @@ require (
5858
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
5959
github.com/ugorji/go/codec v1.2.12 // indirect
6060
go.opentelemetry.io/otel v1.33.0 // indirect
61-
golang.org/x/arch v0.12.0 // indirect
62-
golang.org/x/crypto v0.31.0 // indirect
63-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
64-
golang.org/x/net v0.33.0 // indirect
65-
golang.org/x/sys v0.28.0 // indirect
61+
golang.org/x/arch v0.13.0 // indirect
62+
golang.org/x/crypto v0.32.0 // indirect
63+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
64+
golang.org/x/net v0.34.0 // indirect
65+
golang.org/x/sys v0.29.0 // indirect
6666
golang.org/x/text v0.21.0 // indirect
67-
google.golang.org/genproto/googleapis/api v0.0.0-20241230172942-26aa7a208def // indirect
68-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241230172942-26aa7a208def // indirect
67+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
68+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
6969
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
7070
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect

‎agent/service/go.sum‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ github.com/elastic/go-sysinfo v1.15.0 h1:54pRFlAYUlVNQ2HbXzLVZlV+fxS7Eax49stzg95
2323
github.com/elastic/go-sysinfo v1.15.0/go.mod h1:jPSuTgXG+dhhh0GKIyI2Cso+w5lPJ5PvVqKlL8LV/Hk=
2424
github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7aSY=
2525
github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
26-
github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
27-
github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
26+
github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
27+
github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
2828
github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
2929
github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
3030
github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
@@ -34,7 +34,9 @@ github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdW
3434
github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
3535
github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
3636
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
37+
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
3738
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
39+
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
3840
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
3941
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
4042
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -119,8 +121,8 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf
119121
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
120122
github.com/tehmaze/netflow v0.0.0-20240303214733-8c13bb004068 h1:1B+EAUqxEyPByCfk55tB21DtR7WF7Q2w71g7+uVkvIg=
121123
github.com/tehmaze/netflow v0.0.0-20240303214733-8c13bb004068/go.mod h1:QRP5wJOf7gGMGL2fCAfmh/5CMZQspRxT5DqghaPRrjM=
122-
github.com/threatwinds/go-sdk v0.13.0 h1:asDAFCy8WcKmNFp3Ryhi12ow5O0iURNR252zK9aWfcM=
123-
github.com/threatwinds/go-sdk v0.13.0/go.mod h1:bRv1KYb3ULvnzff0tpeI7+Q2BZw0eS1kZJRa/pUox7o=
124+
github.com/threatwinds/go-sdk v1.0.7 h1:DQzuXozztp9h2RQebiY1WJcxELfkWwyOwVDA/EQh3rc=
125+
github.com/threatwinds/go-sdk v1.0.7/go.mod h1:X1OgSYlQqVpqJIfVGK8Dg/5kWzHsKSZaXGSdjQynCkM=
124126
github.com/threatwinds/logger v1.1.12 h1:3TzwO2+m5XwSHDc3QOYvg0nUnsj/U2yJppULndRzL/4=
125127
github.com/threatwinds/logger v1.1.12/go.mod h1:eevkhjP9wSpRekRIgi4ZAq7DMdlUMy+Shwx/QNDvOHg=
126128
github.com/threatwinds/validations v1.0.9 h1:p+DkqNpZ7g+uCmgv2FPDnkOM4ITrNxgauiTmNbVjo/E=
@@ -137,30 +139,35 @@ github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2
137139
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
138140
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
139141
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
142+
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
140143
go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw=
141144
go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I=
142145
go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ=
146+
go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M=
143147
go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk=
148+
go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0=
144149
go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
150+
go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
145151
go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s=
146-
golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg=
147-
golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
148-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
149-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
150-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
151-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
152-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
153-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
152+
go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
153+
golang.org/x/arch v0.13.0 h1:KCkqVVV1kGg0X87TFysjCJ8MxtZEIU4Ja/yXGeoECdA=
154+
golang.org/x/arch v0.13.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
155+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
156+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
157+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
158+
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
159+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
160+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
154161
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
155162
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
156-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
157-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
163+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
164+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
158165
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
159166
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
160-
google.golang.org/genproto/googleapis/api v0.0.0-20241230172942-26aa7a208def h1:0Km0hi+g2KXbXL0+riZzSCKz23f4MmwicuEb00JeonI=
161-
google.golang.org/genproto/googleapis/api v0.0.0-20241230172942-26aa7a208def/go.mod h1:u2DoMSpCXjrzqLdobRccQMc9wrnMAJ1DLng0a2yqM2Q=
162-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241230172942-26aa7a208def h1:4P81qv5JXI/sDNae2ClVx88cgDDA6DPilADkG9tYKz8=
163-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241230172942-26aa7a208def/go.mod h1:bdAgzvd4kFrpykc5/AC2eLUiegK9T/qxZHD4hXYf/ho=
167+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
168+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
169+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
170+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
164171
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
165172
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
166173
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=

‎agent/service/logservice/processor.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import (
1010
"time"
1111

1212
"github.com/google/uuid"
13-
go_sdk "github.com/threatwinds/go-sdk"
13+
"github.com/threatwinds/go-sdk/plugins"
14+
1415
"github.com/utmstack/UTMStack/agent/service/agent"
1516
"github.com/utmstack/UTMStack/agent/service/config"
1617
"github.com/utmstack/UTMStack/agent/service/conn"
@@ -31,7 +32,7 @@ type LogProcessor struct {
3132
var (
3233
processor LogProcessor
3334
processorOnce sync.Once
34-
LogQueue = make(chan *go_sdk.Log)
35+
LogQueue = make(chan *plugins.Log)
3536
timeToSleep = time.Duration(10 * time.Second)
3637
timeCLeanLogs = time.Duration(10 * time.Minute)
3738
)
@@ -63,7 +64,7 @@ func (l *LogProcessor) ProcessLogs(cnf *config.Config, ctx context.Context) {
6364
continue
6465
}
6566

66-
client := go_sdk.NewIntegrationClient(conn)
67+
client := plugins.NewIntegrationClient(conn)
6768
plClient := createClient(client, ctx)
6869
l.connErrWritten = false
6970

@@ -72,7 +73,7 @@ func (l *LogProcessor) ProcessLogs(cnf *config.Config, ctx context.Context) {
7273
}
7374
}
7475

75-
func (l *LogProcessor) handleAcknowledgements(plClient go_sdk.Integration_ProcessLogClient, ctx context.Context, cancel context.CancelFunc) {
76+
func (l *LogProcessor) handleAcknowledgements(plClient plugins.Integration_ProcessLogClient, ctx context.Context, cancel context.CancelFunc) {
7677
for {
7778
select {
7879
case <-ctx.Done():
@@ -116,7 +117,7 @@ func (l *LogProcessor) handleAcknowledgements(plClient go_sdk.Integration_Proces
116117
}
117118
}
118119

119-
func (l *LogProcessor) processLogs(plClient go_sdk.Integration_ProcessLogClient, ctx context.Context, cancel context.CancelFunc) {
120+
func (l *LogProcessor) processLogs(plClient plugins.Integration_ProcessLogClient, ctx context.Context, cancel context.CancelFunc) {
120121
for {
121122
select {
122123
case <-ctx.Done():
@@ -194,7 +195,7 @@ func (l *LogProcessor) CleanCountedLogs() {
194195

195196
if found {
196197
for _, log := range unprocessed {
197-
LogQueue <- &go_sdk.Log{
198+
LogQueue <- &plugins.Log{
198199
Id: log.ID,
199200
Raw: log.Log,
200201
DataType: log.Type,
@@ -206,7 +207,7 @@ func (l *LogProcessor) CleanCountedLogs() {
206207
}
207208
}
208209

209-
func createClient(client go_sdk.IntegrationClient, ctx context.Context) go_sdk.Integration_ProcessLogClient {
210+
func createClient(client plugins.IntegrationClient, ctx context.Context) plugins.Integration_ProcessLogClient {
210211
var connErrMsgWritten bool
211212
invalidKeyCounter := 0
212213
for {

‎agent/service/modules/syslog.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"strings"
1111
"time"
1212

13-
go_sdk "github.com/threatwinds/go-sdk"
13+
"github.com/threatwinds/go-sdk/plugins"
1414
"github.com/threatwinds/validations"
1515
"github.com/utmstack/UTMStack/agent/service/config"
1616
"github.com/utmstack/UTMStack/agent/service/logservice"
@@ -321,7 +321,7 @@ func (m *SyslogModule) handleMessageTCP(logsChannel chan config.MSGDS) {
321321
continue
322322
}
323323
} else {
324-
logservice.LogQueue <- &go_sdk.Log{
324+
logservice.LogQueue <- &plugins.Log{
325325
DataType: m.DataType,
326326
DataSource: msgDS.DataSource,
327327
Raw: message,
@@ -354,7 +354,7 @@ func (m *SyslogModule) handleConnectionUDP(logsChannel chan config.MSGDS) {
354354
continue
355355
}
356356
} else {
357-
logservice.LogQueue <- &go_sdk.Log{
357+
logservice.LogQueue <- &plugins.Log{
358358
DataType: m.DataType,
359359
DataSource: msgDS.DataSource,
360360
Raw: message,

‎agent/service/parser/beats.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"regexp"
66
"sync"
77

8-
go_sdk "github.com/threatwinds/go-sdk"
8+
"github.com/threatwinds/go-sdk/plugins"
99
"github.com/utmstack/UTMStack/agent/service/config"
1010
)
1111

@@ -55,7 +55,7 @@ func (p *BeatsParser) IdentifySource(log string) (config.DataType, error) {
5555
return config.DataTypeGeneric, nil
5656
}
5757

58-
func (p *BeatsParser) ProcessData(logMessage interface{}, datasource string, queue chan *go_sdk.Log) error {
58+
func (p *BeatsParser) ProcessData(logMessage interface{}, datasource string, queue chan *plugins.Log) error {
5959
log, ok := logMessage.(string)
6060
if !ok {
6161
return fmt.Errorf("log is not of type string")
@@ -64,7 +64,7 @@ func (p *BeatsParser) ProcessData(logMessage interface{}, datasource string, que
6464
if err != nil {
6565
return err
6666
}
67-
queue <- &go_sdk.Log{
67+
queue <- &plugins.Log{
6868
DataType: string(DataType),
6969
DataSource: datasource,
7070
Raw: log,

‎agent/service/parser/cisco.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"regexp"
66
"sync"
77

8-
go_sdk "github.com/threatwinds/go-sdk"
8+
"github.com/threatwinds/go-sdk/plugins"
99
"github.com/utmstack/UTMStack/agent/service/config"
1010
)
1111

@@ -41,7 +41,7 @@ func (p *CiscoParser) IdentifySource(log string) (config.DataType, error) {
4141
return config.DataTypeCiscoMeraki, nil
4242
}
4343

44-
func (p *CiscoParser) ProcessData(logMessage interface{}, datasource string, queue chan *go_sdk.Log) error {
44+
func (p *CiscoParser) ProcessData(logMessage interface{}, datasource string, queue chan *plugins.Log) error {
4545
log, ok := logMessage.(string)
4646
if !ok {
4747
return fmt.Errorf("log is not of type string")
@@ -50,7 +50,7 @@ func (p *CiscoParser) ProcessData(logMessage interface{}, datasource string, que
5050
if err != nil {
5151
return err
5252
}
53-
queue <- &go_sdk.Log{
53+
queue <- &plugins.Log{
5454
DataType: string(logType),
5555
DataSource: datasource,
5656
Raw: log,

‎agent/service/parser/netflow.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/tehmaze/netflow/netflow6"
1212
"github.com/tehmaze/netflow/netflow7"
1313
"github.com/tehmaze/netflow/netflow9"
14-
go_sdk "github.com/threatwinds/go-sdk"
14+
"github.com/threatwinds/go-sdk/plugins"
1515
"github.com/threatwinds/validations"
1616
"github.com/utmstack/UTMStack/agent/service/config"
1717
pnf "github.com/utmstack/UTMStack/agent/service/parser/netflow"
@@ -38,7 +38,7 @@ type NetflowObject struct {
3838
Message netflow.Message
3939
}
4040

41-
func (p *NetflowParser) ProcessData(logMessage interface{}, datasource string, queue chan *go_sdk.Log) error {
41+
func (p *NetflowParser) ProcessData(logMessage interface{}, datasource string, queue chan *plugins.Log) error {
4242
var metrics []pnf.Metric
4343
var remote string
4444

@@ -71,7 +71,7 @@ func (p *NetflowParser) ProcessData(logMessage interface{}, datasource string, q
7171
utils.Logger.ErrorF("error validating string: %v: message: %s", err, message)
7272
continue
7373
}
74-
queue <- &go_sdk.Log{
74+
queue <- &plugins.Log{
7575
DataType: string(config.DataTypeNetflow),
7676
DataSource: remote,
7777
Raw: msg,

‎agent/service/parser/parser.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package parser
22

3-
import go_sdk "github.com/threatwinds/go-sdk"
3+
import "github.com/threatwinds/go-sdk/plugins"
44

55
type Parser interface {
6-
ProcessData(logMessage interface{}, datasource string, queue chan *go_sdk.Log) error
6+
ProcessData(logMessage interface{}, datasource string, queue chan *plugins.Log) error
77
}
88

99
func GetParser(typ string) Parser {

‎versions.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"master-version": "11.0.28",
3-
"agent-service": "11.0.7",
2+
"master-version": "11.0.29",
3+
"agent-service": "11.0.8",
44
"agent-installer": "11.0.4",
55
"agent-manager": "11.0.3",
66
"backend": "11.0.6",

0 commit comments

Comments
 (0)