Merge remote-tracking branch 'origin/release/v11' into backlog/add-tls-connection-option-and-setup-steps-for-syslog-integrations

Author: mjabascal10

backend/src/main/java/com/park/utmstack/domain/alert_response_rule/UtmAlertResponseRule.java

@@ -5,6 +5,7 @@
 import com.park.utmstack.service.dto.UtmAlertResponseRuleDTO;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.GenericGenerator;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
@@ -30,7 +31,8 @@ public class UtmAlertResponseRule implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GenericGenerator(name = "CustomIdentityGenerator", strategy = "com.park.utmstack.util.CustomIdentityGenerator")
+    @GeneratedValue(generator = "CustomIdentityGenerator")
     private Long id;
     @Column(name = "rule_name", length = 150, nullable = false)
     private String ruleName;
@@ -62,6 +64,9 @@ public class UtmAlertResponseRule implements Serializable {
     @Column(name = "last_modified_date")
     private Instant lastModifiedDate;
 
+    @Column(name = "system_owner", nullable = false)
+    private Boolean systemOwner;
+
     @OneToMany(mappedBy = "rule", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     List<UtmAlertResponseRuleExecution> utmAlertResponseRuleExecutions;
 
@@ -87,6 +92,7 @@ public UtmAlertResponseRule(UtmAlertResponseRuleDTO dto) {
         this.ruleActive = dto.getActive();
         this.agentPlatform = dto.getAgentPlatform();
         this.defaultAgent = dto.getDefaultAgent();
+        this.systemOwner = dto.getSystemOwner();
         if (!CollectionUtils.isEmpty(dto.getExcludedAgents()))
             this.excludedAgents = String.join(",", dto.getExcludedAgents());
         else
@@ -102,6 +108,7 @@ public UtmAlertResponseRule(UtmAlertResponseRuleDTO dto) {
                         template.setTitle(templateDto.getTitle());
                         template.setDescription(templateDto.getDescription());
                         template.setCommand(templateDto.getCommand());
+                        template.setSystemOwner(false);
                         return template;
                     })
                     .collect(Collectors.toList());

backend/src/main/java/com/park/utmstack/domain/index_template/IndexTemplate.java

@@ -2,11 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+@Setter
+@Getter
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class IndexTemplate {
 
@@ -24,30 +28,6 @@ private IndexTemplate(List<String> indexPatterns, Integer priority, Template tem
         this.template = template;
     }
 
-    public List<String> getIndexPatterns() {
-        return indexPatterns;
-    }
-
-    public void setIndexPatterns(List<String> indexPatterns) {
-        this.indexPatterns = indexPatterns;
-    }
-
-    public Integer getPriority() {
-        return priority;
-    }
-
-    public void setPriority(Integer priority) {
-        this.priority = priority;
-    }
-
-    public Template getTemplate() {
-        return template;
-    }
-
-    public void setTemplate(Template template) {
-        this.template = template;
-    }
-
     public static Builder builder() {
         return new Builder();
     }

backend/src/main/java/com/park/utmstack/domain/index_template/IndexTemplateSettings.java

@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
 
+@Getter
 @JsonInclude(value = JsonInclude.Include.NON_NULL)
 public class IndexTemplateSettings {
 
@@ -18,34 +20,18 @@ public class IndexTemplateSettings {
     @JsonProperty("number_of_replicas")
     private Integer numberOfReplicas;
 
-    public String getIndexPolicyId() {
-        return indexPolicyId;
-    }
-
     public void setIndexPolicyId(String indexPolicyId) {
         this.indexPolicyId = indexPolicyId;
     }
 
-    public Integer getTotalFieldsLimit() {
-        return totalFieldsLimit;
-    }
-
     public void setTotalFieldsLimit(Integer totalFieldsLimit) {
         this.totalFieldsLimit = totalFieldsLimit;
     }
 
-    public Integer getNumberOfShards() {
-        return numberOfShards;
-    }
-
     public void setNumberOfShards(Integer numberOfShards) {
         this.numberOfShards = numberOfShards;
     }
 
-    public Integer getNumberOfReplicas() {
-        return numberOfReplicas;
-    }
-
     public void setNumberOfReplicas(Integer numberOfReplicas) {
         this.numberOfReplicas = numberOfReplicas;
     }

backend/src/main/java/com/park/utmstack/domain/index_template/Template.java

@@ -1,9 +1,9 @@
 package com.park.utmstack.domain.index_template;
 
+import lombok.Getter;
+
+@Getter
 public class Template {
     private final IndexTemplateSettings settings = new IndexTemplateSettings();
 
-    public IndexTemplateSettings getSettings() {
-        return settings;
-    }
 }

backend/src/main/java/com/park/utmstack/repository/alert_response_rule/UtmAlertResponseRuleRepository.java

@@ -1,12 +1,14 @@
 package com.park.utmstack.repository.alert_response_rule;
 
 import com.park.utmstack.domain.alert_response_rule.UtmAlertResponseRule;
+import com.park.utmstack.domain.correlation.rules.UtmCorrelationRules;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 
 /**
@@ -24,4 +26,6 @@ public interface UtmAlertResponseRuleRepository extends JpaRepository<UtmAlertRe
 
     List<UtmAlertResponseRule> findAllByRuleActiveIsTrue();
 
+    Optional<UtmAlertResponseRule> findFirstBySystemOwnerIsTrueOrderByIdDesc();
+
 }

backend/src/main/java/com/park/utmstack/service/alert_response_rule/UtmAlertResponseActionTemplateService.java

@@ -29,7 +29,7 @@ public UtmAlertResponseActionTemplateService(UtmAlertResponseActionTemplateRepos
     public UtmAlertResponseActionTemplate save(UtmAlertResponseActionTemplate alertResponseActionTemplate) {
         final String ctx = CLASSNAME + ".save";
         try {
-            if (!utmStackService.isInDevelop()) {
+            if (utmStackService.isInDevelop()) {
                 alertResponseActionTemplate.setId(this.getSystemSequenceNextValue());
                 alertResponseActionTemplate.setSystemOwner(true);
             } else {

backend/src/main/java/com/park/utmstack/service/alert_response_rule/UtmAlertResponseRuleQueryService.java

@@ -83,6 +83,9 @@ private Specification<UtmAlertResponseRule> createSpecification(UtmAlertResponse
             if (criteria.getLastModifiedDate() != null) {
                 specification = specification.and(buildRangeSpecification(criteria.getLastModifiedDate(), UtmAlertResponseRule_.lastModifiedDate));
             }
+            if (criteria.getSystemOwner() != null) {
+                specification = specification.and(buildSpecification(criteria.getSystemOwner(), UtmAlertResponseRule_.systemOwner));
+            }
         }
         return specification;
     }

backend/src/main/java/com/park/utmstack/service/alert_response_rule/UtmAlertResponseRuleService.java

@@ -70,10 +70,10 @@ public class UtmAlertResponseRuleService {
 
 
 
-    public UtmAlertResponseRule save(UtmAlertResponseRule alertResponseRule) {
+    public UtmAlertResponseRule save(UtmAlertResponseRule alertResponseRule, boolean isCreate) {
         final String ctx = CLASSNAME + ".save";
         try {
-            if (alertResponseRule.getId() != null) {
+            if (!isCreate) {
                 String alertRuleId = String.valueOf(alertResponseRule.getId());
                 UtmAlertResponseRule current = alertResponseRuleRepository.findById(alertResponseRule.getId())
                         .orElseThrow(() -> new RuntimeException(String.format("Incident response rule with ID: %1$s not found", alertRuleId)));
@@ -357,4 +357,10 @@ public void mergeInto(UtmAlertResponseRule target, UtmAlertResponseRule source)
             target.getUtmAlertResponseActionTemplates().addAll(managedTemplates);
         }
     }
+
+    public Long getSystemSequenceNextValue() {
+        return alertResponseRuleRepository.findFirstBySystemOwnerIsTrueOrderByIdDesc()
+                .map(rule -> rule.getId() + 1)
+                .orElse(1L);
+    }
 }

backend/src/main/java/com/park/utmstack/service/dto/UtmAlertResponseRuleCriteria.java

@@ -1,12 +1,16 @@
 package com.park.utmstack.service.dto;
 
+import lombok.Getter;
+import lombok.Setter;
 import tech.jhipster.service.filter.BooleanFilter;
 import tech.jhipster.service.filter.InstantFilter;
 import tech.jhipster.service.filter.LongFilter;
 import tech.jhipster.service.filter.StringFilter;
 
 import java.io.Serializable;
 
+@Getter
+@Setter
 public class UtmAlertResponseRuleCriteria implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -19,69 +23,5 @@ public class UtmAlertResponseRuleCriteria implements Serializable {
     private StringFilter lastModifiedBy;
     private InstantFilter createdDate;
     private InstantFilter lastModifiedDate;
-
-
-    public LongFilter getId() {
-        return id;
-    }
-
-    public void setId(LongFilter id) {
-        this.id = id;
-    }
-
-    public StringFilter getName() {
-        return name;
-    }
-
-    public void setName(StringFilter name) {
-        this.name = name;
-    }
-
-    public BooleanFilter getActive() {
-        return active;
-    }
-
-    public void setActive(BooleanFilter active) {
-        this.active = active;
-    }
-
-    public StringFilter getAgentPlatform() {
-        return agentPlatform;
-    }
-
-    public void setAgentPlatform(StringFilter agentPlatform) {
-        this.agentPlatform = agentPlatform;
-    }
-
-    public StringFilter getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(StringFilter createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public StringFilter getLastModifiedBy() {
-        return lastModifiedBy;
-    }
-
-    public void setLastModifiedBy(StringFilter lastModifiedBy) {
-        this.lastModifiedBy = lastModifiedBy;
-    }
-
-    public InstantFilter getCreatedDate() {
-        return createdDate;
-    }
-
-    public void setCreatedDate(InstantFilter createdDate) {
-        this.createdDate = createdDate;
-    }
-
-    public InstantFilter getLastModifiedDate() {
-        return lastModifiedDate;
-    }
-
-    public void setLastModifiedDate(InstantFilter lastModifiedDate) {
-        this.lastModifiedDate = lastModifiedDate;
-    }
+    private BooleanFilter systemOwner;
 }

backend/src/main/java/com/park/utmstack/service/dto/UtmAlertResponseRuleDTO.java

@@ -62,6 +62,8 @@ public class UtmAlertResponseRuleDTO {
 
     private List<UtmAlertResponseActionTemplateDTO> actions;
 
+    private Boolean systemOwner;
+
     public UtmAlertResponseRuleDTO(UtmAlertResponseRule rule) {
         this.id = rule.getId();
         this.name = rule.getRuleName();
@@ -81,6 +83,7 @@ public UtmAlertResponseRuleDTO(UtmAlertResponseRule rule) {
         this.createdDate = rule.getCreatedDate();
         this.lastModifiedBy = rule.getLastModifiedBy();
         this.lastModifiedDate = rule.getLastModifiedDate();
+        this.systemOwner = rule.getSystemOwner();
 
         if (rule.getUtmAlertResponseActionTemplates() != null) {
             this.actions = rule.getUtmAlertResponseActionTemplates()