Skip to content

Commit f4266b9

Browse files
mjabascal10mjabascal10
committed
Merge remote-tracking branch 'origin/release/v11.1.5' into release/v11.1.5
2 parents 3e198c1 + 2d0e1a2 commit f4266b9

4 files changed

Lines changed: 101 additions & 8 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
# UTMStack 11.1.4 – Release Notes
1+
# UTMStack 11.1.5 – Release Notes
22

3-
The **UTMStack v11.1.4** update delivers important fixes and usability improvements to enhance stability and user experience.
3+
The **UTMStack v11.1.5** update delivers important fixes and usability improvements to enhance stability and user experience.
44

55
## Improvements & Fixes
6-
- Refined the styling of download links to improve clarity and accessibility.
7-
- Resolved a syntax error in the UTMStack installation command, ensuring smoother setup.
8-
- Corrected the display of pipeline card statuses and improved accuracy of event processing counts.
6+
- Standardized `utm_visualization` field names by replacing legacy O365 keys with new conventions.
7+

‎backend/src/main/resources/config/liquibase/changelog/20251218001_rename_o365_fields.xml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<databaseChangeLog
3+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
6+
7+
<changeSet id="20250910040" author="Manuel Abascal">
8+
9+
<sql dbms="postgresql" splitStatements="true" stripComments="true">
10+
<![CDATA[
11+
12+
UPDATE utm_visualization
13+
SET
14+
filters = REPLACE(
15+
REPLACE(
16+
REPLACE(
17+
REPLACE(
18+
REPLACE(filters, 'log.o365.Operation.keyword', 'action.keyword'),
19+
'log.o365.ClientIP.keyword', 'log.clientIP.keyword'
20+
),
21+
'log.o365.UserId.keyword', 'origin.user.keyword'
22+
),
23+
'log.o365.ResultStatus.keyword', 'actionResult.keyword'
24+
),
25+
'log.o365.LogonError.keyword', 'log.logonError.keyword'
26+
)
27+
WHERE filters IS NOT NULL;
28+
29+
UPDATE utm_visualization
30+
SET
31+
aggregation = REPLACE(
32+
REPLACE(
33+
REPLACE(
34+
REPLACE(
35+
REPLACE(aggregation, 'log.o365.Operation.keyword', 'action.keyword'),
36+
'log.o365.ClientIP.keyword', 'log.clientIP.keyword'
37+
),
38+
'log.o365.UserId.keyword', 'origin.user.keyword'
39+
),
40+
'log.o365.ResultStatus.keyword', 'actionResult.keyword'
41+
),
42+
'log.o365.LogonError.keyword', 'log.logonError.keyword'
43+
)
44+
WHERE aggregation IS NOT NULL;
45+
46+
47+
48+
UPDATE utm_visualization
49+
SET
50+
filters = REPLACE(
51+
REPLACE(
52+
REPLACE(
53+
REPLACE(
54+
REPLACE(
55+
REPLACE(filters, 'log.o365.Workload.keyword', 'log.Workload.keyword'),
56+
'log.o365.Workload', 'log.Workload'
57+
),
58+
'log.o365.Verdict.keyword', 'emailVerdict.keyword'
59+
),
60+
'log.o365.SenderIp.keyword', 'origin.ip.keyword'
61+
),
62+
'log.o365.Recipients.keyword', 'log.Recipients.keyword'
63+
),
64+
'log.o365.Subject.keyword', 'log.Subject.keyword'
65+
)
66+
WHERE filters IS NOT NULL;
67+
68+
UPDATE utm_visualization
69+
SET
70+
aggregation = REPLACE(
71+
REPLACE(
72+
REPLACE(
73+
REPLACE(
74+
REPLACE(
75+
REPLACE(aggregation, 'log.o365.Workload.keyword', 'log.Workload.keyword'),
76+
'log.o365.Workload', 'log.Workload'
77+
),
78+
'log.o365.Verdict.keyword', 'emailVerdict.keyword'
79+
),
80+
'log.o365.SenderIp.keyword', 'origin.ip.keyword'
81+
),
82+
'log.o365.Recipients.keyword', 'log.Recipients.keyword'
83+
),
84+
'log.o365.Subject.keyword', 'log.Subject.keyword'
85+
)
86+
WHERE aggregation IS NOT NULL;
87+
88+
]]>
89+
</sql>
90+
</changeSet>
91+
</databaseChangeLog>

‎backend/src/main/resources/config/liquibase/master.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,5 +279,7 @@
279279

280280
<include file="/config/liquibase/changelog/20251203001-add-identity-provider-config.xml" relativeToChangelogFile="false"/>
281281

282+
<include file="/config/liquibase/changelog/20251218001_rename_o365_fields.xml" relativeToChangelogFile="false"/>
283+
282284

283285
</databaseChangeLog>

‎plugins/aws/main.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,6 @@ func (p *AWSProcessor) getLogs(startTime, endTime time.Time) ([]string, error) {
260260
return nil, catcher.Error("all retries failed when getting log groups", err, nil)
261261
}
262262

263-
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
264-
defer cancel()
265-
266263
transformedLogs := make([]string, 0, 10)
267264
for _, logGroup := range logGroups {
268265
// Retry logic for describing log streams
@@ -313,8 +310,11 @@ func (p *AWSProcessor) getLogs(startTime, endTime time.Time) ([]string, error) {
313310
var page *cloudwatchlogs.GetLogEventsOutput
314311

315312
for retry := 0; retry < maxRetries; retry++ {
313+
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
314+
316315
page, err = paginator.NextPage(ctx)
317316
if err == nil {
317+
cancel()
318318
break
319319
}
320320

@@ -330,6 +330,7 @@ func (p *AWSProcessor) getLogs(startTime, endTime time.Time) ([]string, error) {
330330
// Increase delay for next retry
331331
retryDelay *= 2
332332
}
333+
cancel()
333334
}
334335

335336
if err != nil {

0 commit comments

Comments
 (0)