Skip to content

Commit 6bf64fe

Browse files
authored
Hotfix/10.8.2/correct status typos in compliance report config (#1230)
* fix: correct typos in compliance report status values * fix: correct typos in compliance report status values * fix: correct typos in compliance report status values
1 parent 5c89019 commit 6bf64fe

File tree

6 files changed

+31
-21
lines changed

6 files changed

+31
-21
lines changed

CHANGELOG.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
# UTMStack 10.8.1 Release Notes
1+
# UTMStack 10.8.2 Release Notes
22

3-
- Improved log parsing and processing for AWS, O365, and Sophos Central integrations.
4-
- Updated Sophos XG integration from legacy mode to support newer versions
5-
- Enhanced log processing and parsing for Windows Agent on ARM architectures.
6-
- Added support for new log channels using the Windows API to retrieve additional logs.
7-
- Compliance Report Scheduling: Improved the stability of the selection process when creating new report schedules.
8-
- Improved field rendering in Log Explorer by consolidating list-based fields into a single entry for better readability and consistency.
9-
- Improved field rendering for tags and note fields in Alerts.
10-
- Improved export functionality to better handle large data sets and avoid performance issues during report generation.
3+
-- Fixed typo in compliance report status values.
4+
-- Standardized internal compliance status labels to ensure consistency across reports and filters.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.park.utmstack.domain.compliance.enums;
22
public enum ComplianceStatus {
3-
COMPLAINT,
4-
NON_COMPLAINT
3+
COMPLIANT,
4+
NON_COMPLIANT
55
}

backend/src/main/java/com/park/utmstack/service/compliance/config/UtmComplianceReportConfigService.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,26 @@
99
import com.park.utmstack.domain.compliance.UtmComplianceStandard;
1010
import com.park.utmstack.domain.compliance.UtmComplianceStandardSection;
1111
import com.park.utmstack.domain.compliance.enums.ComplianceStatus;
12-
import com.park.utmstack.domain.index_pattern.UtmIndexPattern;
1312
import com.park.utmstack.repository.compliance.UtmComplianceReportConfigRepository;
1413
import com.park.utmstack.service.chart_builder.UtmDashboardService;
1514
import com.park.utmstack.service.chart_builder.UtmDashboardVisualizationService;
1615
import com.park.utmstack.service.elasticsearch.ElasticsearchService;
17-
import com.park.utmstack.service.elasticsearch.SearchUtil;
1816
import com.park.utmstack.service.index_pattern.UtmIndexPatternService;
19-
import com.park.utmstack.util.UtilPagination;
2017
import com.park.utmstack.util.chart_builder.elasticsearch_dsl.requests.RequestDsl;
2118
import com.park.utmstack.util.exceptions.UtmElasticsearchException;
2219
import org.opensearch.client.opensearch.core.SearchResponse;
2320
import org.springframework.dao.DataIntegrityViolationException;
2421
import org.springframework.data.domain.Page;
25-
import org.springframework.data.domain.PageImpl;
26-
import org.springframework.data.domain.PageRequest;
2722
import org.springframework.data.domain.Pageable;
2823
import org.springframework.stereotype.Service;
2924
import org.springframework.transaction.annotation.Transactional;
3025
import org.springframework.util.CollectionUtils;
31-
import org.springframework.util.StringUtils;
3226

3327
import javax.persistence.EntityManager;
3428
import java.util.Collections;
3529
import java.util.List;
3630
import java.util.Objects;
3731
import java.util.Optional;
38-
import java.util.stream.Collectors;
3932

4033
@Service
4134
public class UtmComplianceReportConfigService {
@@ -196,9 +189,9 @@ private ComplianceStatus getStatus(UtmDashboard dashboard) throws UtmElasticsear
196189
if(Objects.nonNull(visualization)){
197190
RequestDsl requestQuery = new RequestDsl(visualization);
198191
SearchResponse<ObjectNode> result = elasticsearchService.search(requestQuery.getSearchSourceBuilderForCount().build(), ObjectNode.class);
199-
return result.hits().total().value() > 0 ? ComplianceStatus.COMPLAINT : ComplianceStatus.NON_COMPLAINT;
192+
return result.hits().total().value() > 0 ? ComplianceStatus.COMPLIANT : ComplianceStatus.NON_COMPLIANT;
200193
} else {
201-
return ComplianceStatus.NON_COMPLAINT;
194+
return ComplianceStatus.NON_COMPLIANT;
202195
}
203196
}
204197
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="20250605001" author="Manuel">
8+
<sql>
9+
UPDATE utm_compliance_report_config
10+
SET config_report_status = 'COMPLIANT'
11+
WHERE config_report_status = 'COMPLAINT';
12+
</sql>
13+
<sql>
14+
UPDATE utm_compliance_report_config
15+
SET config_report_status = 'NON_COMPLIANT'
16+
WHERE config_report_status = 'NON_COMPLAINT';
17+
</sql>
18+
</changeSet>
19+
20+
</databaseChangeLog>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,7 @@
105105

106106
<include file="/config/liquibase/changelog/20250530001_update_filter_wineventlog.xml" relativeToChangelogFile="false"/>
107107

108+
<include file="/config/liquibase/changelog/20250605001_update_typos_config_report_status _values.xml" relativeToChangelogFile="false"/>
109+
110+
108111
</databaseChangeLog>

version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 10.8.1
1+
version: 10.8.2

0 commit comments

Comments
 (0)