Merge remote-tracking branch 'origin/release/v11.2.3' into release/v11.2.3

Author: mjabascal10

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

@@ -522,7 +522,7 @@ jobs:
               -H "Content-Type: application/json" \
               -H "id: $auth_id" \
               -H "key: $auth_key" \
-              -d "{\"instance_id\": \"$instance_id\", \"version\": \"$TAG\"}")
+              -d "{\"instances_ids\": [\"$instance_id\"], \"version\": \"$TAG\"}")
 
             http_code=$(echo "$response" | tail -n1)
             body=$(echo "$response" | sed '$d')

backend/src/main/java/com/park/utmstack/service/correlation/rules/UtmCorrelationRulesService.java

@@ -125,6 +125,7 @@ public void setRuleActivation(Long ruleId, boolean setActive) throws Exception {
                 .orElseThrow(() -> new RuntimeException(ctx + ": The rule you're trying to activate or deactivate is not present in database."));
         try {
             rule.setRuleActive(setActive);
+            rule.setRuleLastUpdate(Instant.now());
             this.utmCorrelationRulesRepository.save(rule);
         } catch (Exception ex) {
             throw new RuntimeException(ctx + ": An error occurred while adding a rule.", ex);

backend/src/main/java/com/park/utmstack/service/logstash_filter/UtmLogstashFilterService.java

@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 
@@ -36,6 +37,7 @@ public UtmLogstashFilterService(UtmLogstashFilterRepository logstashFilterReposi
     public UtmLogstashFilter save(UtmLogstashFilter logstashFilter) {
         final String ctx = CLASSNAME + ".save";
         try {
+            logstashFilter.setUpdatedAt(Instant.now());
             logstashFilter.setSystemOwner(false);
             return logstashFilterRepository.save(logstashFilter);
         } catch (Exception e) {

backend/src/main/java/com/park/utmstack/web/rest/logstash_filter/UtmFilterResource.java

@@ -72,7 +72,7 @@ public ResponseEntity<UtmLogstashFilter> createLogstashFilter(@Valid @RequestBod
             // If you provide a pipelineId we create relation, otherwise only create the filter
             if (pipelineId!=null) {
                 Optional<UtmLogstashPipeline> pipeline = pipelineService.findOne(pipelineId);
-                if (!pipeline.isPresent()) {
+                if (pipeline.isEmpty()) {
                     throw new Exception("The pipeline with ID (" + pipelineId + ") not exists");
                 }
                 UtmLogstashFilter filter = logstashFilterService.save(logstashFilter);

plugins/alerts/main.go

@@ -335,7 +335,12 @@ func newAlert(alert *plugins.Alert, parentId *string) error {
 	}
 
 	a.Id = alert.Id
-	a.ParentId = alert.ParentId
+	a.ParentId = func() string {
+		if parentId != nil {
+			return *parentId
+		}
+		return ""
+	}()
 	a.Name = alert.Name
 	a.Category = alert.Category
 	a.Description = alert.Description