Skip to content

Commit 86d6d7f

Browse files
mjabascal10mjabascal10
committed
Merge remote-tracking branch 'origin/release/v11.2.1' into release/v11.2.1
2 parents e10681f + e4acc56 commit 86d6d7f

File tree

68 files changed

+250
-250
lines changed

Some content is hidden

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

68 files changed

+250
-250
lines changed

‎.github/workflows/v11-deployment-pipeline.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
name: Check Go Dependencies
120120
runs-on: ubuntu-24.04
121121
needs: [validations, setup_deployment]
122-
if: ${{ needs.setup_deployment.outputs.tag != '' }}
122+
if: ${{ needs.setup_deployment.outputs.tag != '' && needs.setup_deployment.outputs.environment == 'rc' }}
123123
steps:
124124
- name: Check out code
125125
uses: actions/checkout@v4
@@ -140,7 +140,7 @@ jobs:
140140
build_agent:
141141
name: Build and Sign Agent
142142
needs: [check_go_dependencies, setup_deployment]
143-
if: ${{ needs.setup_deployment.outputs.tag != '' }}
143+
if: ${{ always() && (needs.check_go_dependencies.result == 'success' || needs.check_go_dependencies.result == 'skipped') && needs.setup_deployment.outputs.tag != '' }}
144144
runs-on: utmstack-signer
145145
steps:
146146
- name: Check out code into the right branch
@@ -205,7 +205,7 @@ jobs:
205205
build_utmstack_collector:
206206
name: Build UTMStack Collector
207207
needs: [check_go_dependencies, setup_deployment]
208-
if: ${{ needs.setup_deployment.outputs.tag != '' }}
208+
if: ${{ always() && (needs.check_go_dependencies.result == 'success' || needs.check_go_dependencies.result == 'skipped') && needs.setup_deployment.outputs.tag != '' }}
209209
runs-on: ubuntu-24.04
210210
steps:
211211
- name: Check out code into the right branch
@@ -289,7 +289,7 @@ jobs:
289289
build_event_processor:
290290
name: Build Event Processor Microservice
291291
needs: [check_go_dependencies, setup_deployment]
292-
if: ${{ needs.setup_deployment.outputs.tag != '' }}
292+
if: ${{ always() && (needs.check_go_dependencies.result == 'success' || needs.check_go_dependencies.result == 'skipped') && needs.setup_deployment.outputs.tag != '' }}
293293
runs-on: ubuntu-24.04
294294
steps:
295295
- name: Check out code into the right branch

‎agent-manager/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ require (
4444
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4545
github.com/modern-go/reflect2 v1.0.2 // indirect
4646
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
47-
github.com/threatwinds/go-sdk v1.1.1
47+
github.com/threatwinds/go-sdk v1.1.4
4848
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
4949
github.com/ugorji/go/codec v1.3.1 // indirect
5050
golang.org/x/arch v0.23.0 // indirect

‎agent-manager/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
8989
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
9090
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
9191
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
92-
github.com/threatwinds/go-sdk v1.1.1 h1:K1rtmjhYokGvj5z/o/wwn8gD6LvkgKfxv2MyMUezRUQ=
93-
github.com/threatwinds/go-sdk v1.1.1/go.mod h1:N19iqJPaNAoWwZTCuFvV0hIvT0D1jOR1KkKYgAoPLmw=
92+
github.com/threatwinds/go-sdk v1.1.4 h1:RASWY7333hFHqUl5oVDeLrBdS+cOMehZyTUgl/dZfPg=
93+
github.com/threatwinds/go-sdk v1.1.4/go.mod h1:N19iqJPaNAoWwZTCuFvV0hIvT0D1jOR1KkKYgAoPLmw=
9494
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
9595
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
9696
github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY=

‎agent/go.mod‎

Lines changed: 3 additions & 3 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.4
1111
github.com/tehmaze/netflow v0.0.0-20240303214733-8c13bb004068
12-
github.com/threatwinds/go-sdk v1.1.1
12+
github.com/threatwinds/go-sdk v1.1.4
1313
github.com/threatwinds/logger v1.2.3
1414
golang.org/x/sys v0.40.0
1515
google.golang.org/grpc v1.78.0
@@ -70,9 +70,9 @@ require (
7070
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
7171
gopkg.in/yaml.v3 v3.0.1 // indirect
7272
howett.net/plist v1.0.1 // indirect
73-
modernc.org/libc v1.67.4 // indirect
73+
modernc.org/libc v1.67.6 // indirect
7474
modernc.org/mathutil v1.7.1 // indirect
7575
modernc.org/memory v1.11.0 // indirect
76-
modernc.org/sqlite v1.44.0 // indirect
76+
modernc.org/sqlite v1.44.2 // indirect
7777
sigs.k8s.io/yaml v1.6.0 // indirect
7878
)

‎agent/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
119119
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
120120
github.com/tehmaze/netflow v0.0.0-20240303214733-8c13bb004068 h1:1B+EAUqxEyPByCfk55tB21DtR7WF7Q2w71g7+uVkvIg=
121121
github.com/tehmaze/netflow v0.0.0-20240303214733-8c13bb004068/go.mod h1:QRP5wJOf7gGMGL2fCAfmh/5CMZQspRxT5DqghaPRrjM=
122-
github.com/threatwinds/go-sdk v1.1.1 h1:K1rtmjhYokGvj5z/o/wwn8gD6LvkgKfxv2MyMUezRUQ=
123-
github.com/threatwinds/go-sdk v1.1.1/go.mod h1:N19iqJPaNAoWwZTCuFvV0hIvT0D1jOR1KkKYgAoPLmw=
122+
github.com/threatwinds/go-sdk v1.1.4 h1:RASWY7333hFHqUl5oVDeLrBdS+cOMehZyTUgl/dZfPg=
123+
github.com/threatwinds/go-sdk v1.1.4/go.mod h1:N19iqJPaNAoWwZTCuFvV0hIvT0D1jOR1KkKYgAoPLmw=
124124
github.com/threatwinds/logger v1.2.3 h1:V2SVAXzbq+/huCvIWOfqzMTH+WBHJxankyBgVG2hy1Y=
125125
github.com/threatwinds/logger v1.2.3/go.mod h1:N+bJKvF4FQNJZLfQpVYWpr6D8iEAFnAQfHYqH5iR1TI=
126126
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
@@ -209,8 +209,8 @@ modernc.org/gc/v3 v3.1.1 h1:k8T3gkXWY9sEiytKhcgyiZ2L0DTyCQ/nvX+LoCljoRE=
209209
modernc.org/gc/v3 v3.1.1/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
210210
modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
211211
modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
212-
modernc.org/libc v1.67.4 h1:zZGmCMUVPORtKv95c2ReQN5VDjvkoRm9GWPTEPuvlWg=
213-
modernc.org/libc v1.67.4/go.mod h1:QvvnnJ5P7aitu0ReNpVIEyesuhmDLQ8kaEoyMjIFZJA=
212+
modernc.org/libc v1.67.6 h1:eVOQvpModVLKOdT+LvBPjdQqfrZq+pC39BygcT+E7OI=
213+
modernc.org/libc v1.67.6/go.mod h1:JAhxUVlolfYDErnwiqaLvUqc8nfb2r6S6slAgZOnaiE=
214214
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
215215
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
216216
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
@@ -219,8 +219,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
219219
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
220220
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
221221
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
222-
modernc.org/sqlite v1.44.0 h1:YjCKJnzZde2mLVy0cMKTSL4PxCmbIguOq9lGp8ZvGOc=
223-
modernc.org/sqlite v1.44.0/go.mod h1:2Dq41ir5/qri7QJJJKNZcP4UF7TsX/KNeykYgPDtGhE=
222+
modernc.org/sqlite v1.44.2 h1:EdYqXeBpKFJjg8QYnw6E71MpANkoxyuYi+g68ugOL8g=
223+
modernc.org/sqlite v1.44.2/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=
224224
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
225225
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
226226
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=

‎agent/updater/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.5
44

55
require (
66
github.com/kardianos/service v1.2.4
7-
github.com/threatwinds/go-sdk v1.1.1
7+
github.com/threatwinds/go-sdk v1.1.4
88
github.com/threatwinds/logger v1.2.3
99
gopkg.in/yaml.v3 v3.0.1
1010
)

‎agent/updater/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
7474
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
7575
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
7676
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
77-
github.com/threatwinds/go-sdk v1.1.1 h1:K1rtmjhYokGvj5z/o/wwn8gD6LvkgKfxv2MyMUezRUQ=
78-
github.com/threatwinds/go-sdk v1.1.1/go.mod h1:N19iqJPaNAoWwZTCuFvV0hIvT0D1jOR1KkKYgAoPLmw=
77+
github.com/threatwinds/go-sdk v1.1.4 h1:RASWY7333hFHqUl5oVDeLrBdS+cOMehZyTUgl/dZfPg=
78+
github.com/threatwinds/go-sdk v1.1.4/go.mod h1:N19iqJPaNAoWwZTCuFvV0hIvT0D1jOR1KkKYgAoPLmw=
7979
github.com/threatwinds/logger v1.2.3 h1:V2SVAXzbq+/huCvIWOfqzMTH+WBHJxankyBgVG2hy1Y=
8080
github.com/threatwinds/logger v1.2.3/go.mod h1:N+bJKvF4FQNJZLfQpVYWpr6D8iEAFnAQfHYqH5iR1TI=
8181
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=

‎frontend/src/app/app.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ export class AppComponent implements OnInit {
111111
)
112112
.subscribe();
113113

114-
this.appLoading.style.display = 'none';
114+
if (this.appLoading && this.appLoading.parentNode) {
115+
this.appLoading.parentNode.removeChild(this.appLoading);
116+
}
115117
}
116118

117119
@HostListener('window', ['$event'])
@@ -141,10 +143,8 @@ export class AppComponent implements OnInit {
141143
break;
142144
}
143145
}
144-
this.apiServiceCheckerService.setOnlineStatus(true);
145146
}, error => {
146147
this.offline = true;
147-
this.apiServiceCheckerService.checkApiAvailability();
148148
});
149149
}
150150

‎frontend/src/app/app.module.ts‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,16 @@ import {AlertIncidentStatusChangeBehavior} from './shared/behaviors/alert-incide
3636
import {GettingStartedBehavior} from './shared/behaviors/getting-started.behavior';
3737
import {NavBehavior} from './shared/behaviors/nav.behavior';
3838
import {NewAlertBehavior} from './shared/behaviors/new-alert.behavior';
39-
import {AppVersionService} from './shared/services/version/app-version.service';
4039
import {TimezoneFormatService} from './shared/services/utm-timezone.service';
40+
import {AppVersionService} from './shared/services/version/app-version.service';
4141
import {UtmSharedModule} from './shared/utm-shared.module';
4242

43-
export function initTimezoneFormat(
44-
timezoneService: TimezoneFormatService,
45-
apiChecker: ApiServiceCheckerService,
46-
appVersionService: AppVersionService
47-
) {
48-
return () =>
49-
new Promise<void>((resolve, reject) => {
43+
export function initTimezoneFormat(apiChecker: ApiServiceCheckerService,
44+
timezoneService: TimezoneFormatService,
45+
appVersionService: AppVersionService) {
46+
return () => {
47+
apiChecker.init();
48+
return new Promise<void>((resolve, reject) => {
5049
apiChecker.isOnlineApi$
5150
.pipe(first(val => val === true))
5251
.subscribe({
@@ -59,6 +58,8 @@ export function initTimezoneFormat(
5958
error: reject
6059
});
6160
});
61+
};
62+
6263
}
6364

6465
@NgModule({
@@ -135,8 +136,8 @@ export function initTimezoneFormat(
135136
provide: APP_INITIALIZER,
136137
useFactory: initTimezoneFormat,
137138
deps: [
138-
TimezoneFormatService,
139139
ApiServiceCheckerService,
140+
TimezoneFormatService,
140141
AppVersionService
141142
],
142143
multi: true

‎frontend/src/app/compliance/compliance-reports-view/components/compliance-print-view/compliance-print-view.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div *ngIf="!preparingPrint" class="report-loading"></div>
1+
<div *ngIf="!preparingPrint" class="report-loaded"></div>
22

33
<h3 class="standard-prev text-center mb-4">
44
<strong>Compliance Assessment</strong>

0 commit comments

Comments
 (0)