Merge branch 'release/v10.8.1' of github.com:utmstack/UTMStack into release/v10.8.1

Author: yllada

CHANGELOG.md

@@ -5,4 +5,10 @@
 - Added support for RedHat; UTMStack can now be installed on both Ubuntu and RedHat.
 - Improved log delivery from ARM-based agents on Windows, now sending native system logs.
 - Added support for macOS ARM64; agents can now be installed on that platform.
-- Improved agent information displayed in the Sources panel, providing more accurate OS details and agent versions.
+- Improved agent information displayed in the Sources panel, providing more accurate OS details and agent versions.
+
+
+### Bug Fixes
+-- Compliance Report Scheduling: Improved the stability of the selection process when creating new report schedules.
+-- Improved field rendering in Log Explorer by consolidating list-based fields into a single entry for better readability and consistency.
+-- Improved field rendering for tags and note fields in Alerts.

agent/collectors/macos.go

@@ -5,6 +5,7 @@ package collectors
 
 import (
 	"bufio"
+	"os"
 	"os/exec"
 	"path/filepath"
 
@@ -29,6 +30,11 @@ func getCollectorsInstances() []Collector {
 func (d Darwin) SendLogs() {
 	path := utils.GetMyPath()
 	collectorPath := filepath.Join(path, "utmstack-collector-mac")
+	host, err := os.Hostname()
+	if err != nil {
+		utils.Logger.ErrorF("error getting hostname: %v", err)
+		host = "unknown"
+	}
 
 	cmd := exec.Command(collectorPath)
 
@@ -62,9 +68,11 @@ func (d Darwin) SendLogs() {
 				continue
 			}
 
+			messageWithHost := config.GetMessageFormated(host, validatedLog)
+
 			logservice.LogQueue <- logservice.LogPipe{
 				Src:  string(config.DataTypeMacOs),
-				Logs: []string{validatedLog},
+				Logs: []string{messageWithHost},
 			}
 		}
 

aws/configuration/const.go

@@ -3,8 +3,9 @@ package configuration
 import "github.com/utmstack/UTMStack/aws/utils"
 
 const (
-	CORRELATIONURL       = "http://correlation:8080/v1/newlog"
 	URL_CHECK_CONNECTION = "https://sts.amazonaws.com"
+	LogstashEndpoint     = "http://%s:%s"
+	UTMLogSeparator      = "<utm-log-separator>"
 )
 
 func GetInternalKey() string {
@@ -14,3 +15,11 @@ func GetInternalKey() string {
 func GetPanelServiceName() string {
 	return utils.Getenv("PANEL_SERV_NAME")
 }
+
+func GetLogstashHost() string {
+	return utils.Getenv("UTM_LOGSTASH_HOST")
+}
+
+func GetLogstashPort() string {
+	return utils.Getenv("UTM_LOGSTASH_PORT")
+}

aws/processor/pull.go

@@ -18,7 +18,7 @@ func PullLogs(startTime time.Time, endTime time.Time, group types.ModuleGroup) *
 		return err
 	}
 
-	err = SendToCorrelation(logs)
+	err = SendToLogstash(logs)
 	if err != nil {
 		return err
 	}

aws/processor/sendData.go

@@ -1,32 +1,71 @@
 package processor
 
 import (
+	"bytes"
+	"crypto/tls"
 	"encoding/json"
+	"fmt"
 	"net/http"
+	"strings"
+	"time"
 
 	"github.com/threatwinds/logger"
 	"github.com/utmstack/UTMStack/aws/configuration"
 	"github.com/utmstack/UTMStack/aws/utils"
 )
 
-func SendToCorrelation(data []TransformedLog) *logger.Error {
+var transport = &http.Transport{
+	MaxIdleConns:          100,
+	IdleConnTimeout:       2 * time.Second,
+	ResponseHeaderTimeout: 2 * time.Second,
+	ForceAttemptHTTP2:     true,
+	TLSClientConfig: &tls.Config{
+		InsecureSkipVerify: true,
+	},
+}
+
+var client = &http.Client{Transport: transport, Timeout: 2 * time.Second}
+
+func SendToLogstash(data []TransformedLog) *logger.Error {
+	var logStrings []string
 	for _, log := range data {
 		body, err := json.Marshal(log)
 		if err != nil {
 			utils.Logger.ErrorF("error encoding log to JSON: %v", err)
 			continue
 		}
+		logStrings = append(logStrings, string(body))
+	}
 
-		_, status, e := utils.DoReq[map[string]interface{}](configuration.CORRELATIONURL, body, http.MethodPost, map[string]string{})
-		if e != nil {
-			utils.Logger.ErrorF("error sending log to correlation engine: %v", e)
-			continue
-		} else if status != http.StatusOK && status != http.StatusCreated {
-			utils.Logger.ErrorF("error sending log to correlation engine: status %v", status)
-			continue
+	if len(logStrings) == 0 {
+		return nil
+	}
+
+	var logs string
+	for _, str := range logStrings {
+		logs += str + configuration.UTMLogSeparator
+	}
+
+	url := fmt.Sprintf(configuration.LogstashEndpoint, configuration.GetLogstashHost(), configuration.GetLogstashPort())
+
+	req, err := http.NewRequest("POST", url, bytes.NewBufferString(logs))
+	if err != nil {
+		return utils.Logger.ErrorF("error creating request: %v", err.Error())
+	}
+
+	resp, err := client.Do(req)
+	if err != nil {
+		if !strings.Contains(err.Error(), "Client.Timeout exceeded while awaiting headers") {
+			utils.Logger.ErrorF("error sending logs with error: %v", err.Error())
 		}
+		return utils.Logger.ErrorF("error sending logs: %v", err.Error())
+	}
+	defer resp.Body.Close()
 
+	if resp.StatusCode != http.StatusOK {
+		return utils.Logger.ErrorF("error sending logs with http code %d", resp.StatusCode)
 	}
 
+	utils.Logger.Info("successfully sent %d logs to Logstash", len(logStrings))
 	return nil
 }

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

@@ -93,9 +93,9 @@
 
     <include file="/config/liquibase/changelog/20250507001_add_aws_pipeline.xml" relativeToChangelogFile="false"/>
 
-    <include file="/config/liquibase/changelog/20250507002_add_sophos_central_pipeline.xml" relativeToChangelogFile="false"/>
+    <!--<include file="/config/liquibase/changelog/20250507002_add_sophos_central_pipeline.xml" relativeToChangelogFile="false"/>
 
-    <include file="/config/liquibase/changelog/20250507003_add_o365_pipeline.xml" relativeToChangelogFile="false"/>
+    <include file="/config/liquibase/changelog/20250507003_add_o365_pipeline.xml" relativeToChangelogFile="false"/>-->
 
 
 </databaseChangeLog>

frontend/src/app/compliance/compliance-schedule/compliance-schedule.component.ts

@@ -18,10 +18,10 @@ import {
     UtmComplianceScheduleDeleteComponent
 } from '../shared/components/utm-compliance-schedule-delete/utm-compliance-schedule-delete.component';
 import {ComplianceScheduleService} from '../shared/services/compliance-schedule.service';
+import {CronDescriptionGeneratorService} from '../shared/services/cron-description-generator.service';
 import {ComplianceScheduleFilterType} from '../shared/type/compliance-schedule-filter.type';
 import {ComplianceScheduleType} from '../shared/type/compliance-schedule.type';
 import {ComplianceStandardType} from '../shared/type/compliance-standard.type';
-import {CronDescriptionGeneratorService} from "../shared/services/cron-description-generator.service";
 
 
 @Component({

frontend/src/app/compliance/shared/components/utm-compliance-select/utm-compliance-select.component.html

@@ -18,7 +18,7 @@
                  placeholder="Standard"
                  style="width: 50%"
       ></ng-select>
-      <ng-select (change)="filterBySelect($event,'type')"
+      <ng-select (change)="getDashboardList()"
                  [(ngModel)]="section"
                  [clearable]="true"
                  [items]="standardSections"
@@ -47,7 +47,7 @@
                class="cursor-pointer text-blue-800 d-flex justify-content-between align-items-center">
            <span class="span-small-icon">
               <i [ngClass]="idReport === report.id?'icon-radio-checked':'icon-radio-unchecked'"></i>
-             <span class="text-blue-800 ml-2">{{report.associatedDashboard.name}}</span>
+             <span class="text-blue-800 ml-2">{{report.configReportName ? report.configReportName :report.associatedDashboard.name}}</span>
            </span>
             <span class="span-small-icon">
             <i *ngIf="report.associatedDashboard.description" [ngbTooltip]="report.associatedDashboard.description"
@@ -80,7 +80,7 @@
       </tbody>
     </table>
   </div>
-  <div *ngIf="complianceReports && complianceReports.length>0" class="mb-4 mt-2">
+  <div [hidden]="complianceReports && complianceReports.length === 0" class="mb-4 mt-2">
     <div class="row justify-content-center">
       <ngb-pagination
         (pageChange)="loadPage($event)"

frontend/src/app/compliance/shared/components/utm-compliance-select/utm-compliance-select.component.ts

@@ -29,7 +29,7 @@ export class UtmComplianceSelectComponent implements OnInit {
   section: number;
   loading = true;
   totalItems: any;
-  page = 1;
+  page = 0;
   itemsPerPage = 10;
   complianceReports: ComplianceReportType[] = [];
   searching = false;
@@ -42,8 +42,8 @@ export class UtmComplianceSelectComponent implements OnInit {
 
   ngOnInit() {
     this.requestParams = {
-      page: this.page - 1,
-      size: this.itemsPerPage,
+      page: 0,
+      size: 1000,
       sort: this.sortBy,
       'name.contains': null
     };
@@ -61,14 +61,14 @@ export class UtmComplianceSelectComponent implements OnInit {
   }
 
   loadPage(page: any) {
-    this.requestParams.page = page - 1;
+    this.page = page > 0 ? page - 1 : page;
     this.getDashboardList();
   }
 
   getDashboardList() {
     const query = {
-      page: this.page - 1,
-      size: 1000,
+      page: this.page,
+      size: this.itemsPerPage,
       sort: 'id,asc',
       'standardSectionId.equals': this.section,
       'configSolution.contains': this.solution
@@ -81,15 +81,15 @@ export class UtmComplianceSelectComponent implements OnInit {
 
   getSections() {
     const query = {
-      page: this.page - 1,
+      page: 0,
       size: 1000,
       sort: 'id,asc',
       'standardId.equals': this.standard,
       'standardSectionName.contains': this.solution
     };
     this.cpStandardSectionService.query(query).subscribe(response => {
       this.standardSections = response.body;
-      this.section = !!this.section ? this.section : this.standardSections[0].id;
+      this.section = this.standardSections.length > 0 ? this.standardSections[0].id : null;
       this.getDashboardList();
       if (this.idReport) {
         this.getSelectedDashboard(this.idReport);
@@ -98,7 +98,8 @@ export class UtmComplianceSelectComponent implements OnInit {
   }
 
   getStandardList() {
-    this.cpStandardService.query({page: 0, size: 1000}).subscribe(
+    this.cpStandardService.query({page: 0, size: 1000})
+      .subscribe(
       (res: HttpResponse<any>) => {
         this.standards = res.body;
         this.standard = !!this.standard ? this.standard : this.standards[0].id;

frontend/src/app/data-management/alert-management/alert-view/alert-view.component.html

@@ -160,6 +160,7 @@ <h5 class="card-title mb-0 text-uppercase label-header">
                     *ngIf="(td.visible)">
                   <app-data-field-render (refreshData)="onRefreshData($event)" [data]="alert"
                                          [field]="td"
+                                         [tags]="tags"
                                          [dataType]="dataType"
                                          [showStatusChange]="true"></app-data-field-render>
                 </td>