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

mjabascal10 · mjabascal10 · commit d0fa6224d150 · 2026-01-26T10:08:16.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,6 @@ installer/installer
 geolocation/
 installer/public_key.crt
 .github/scripts/golang-updater/go-updater
+
+
+qodana.yaml
diff --git a/agent-manager/updates/updates.go b/agent-manager/updates/updates.go
@@ -4,8 +4,8 @@ import (
 	"crypto/tls"
 	"net/http"
 	"os"
+	"time"
 
-	"github.com/gin-contrib/gzip"
 	"github.com/threatwinds/go-sdk/catcher"
 
 	"github.com/gin-gonic/gin"
@@ -23,7 +23,6 @@ func ServeDependencies() {
 	r := gin.New()
 	r.Use(
 		gin.Recovery(),
-		gzip.Gzip(gzip.DefaultCompression),
 	)
 
 	r.NoRoute(notFound)
@@ -33,20 +32,31 @@ func ServeDependencies() {
 
 	loadedCert, err := tls.LoadX509KeyPair(config.CertPath, config.CertKeyPath)
 	if err != nil {
-		catcher.Error("failed to load TLS credentials", err, map[string]any{"process": "agent-manager"})
+		_ = catcher.Error("failed to load TLS credentials", err, map[string]any{"process": "agent-manager"})
+		time.Sleep(5 * time.Second)
 		os.Exit(1)
 	}
 
 	tlsConfig := &tls.Config{
-		MinVersion:   tls.VersionTLS12,
 		Certificates: []tls.Certificate{loadedCert},
+		MinVersion:   tls.VersionTLS12,
+		MaxVersion:   tls.VersionTLS13,
 		CipherSuites: []uint16{
-			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			// TLS 1.2 secure cipher suites - RSA key exchange
 			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
 			tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			// TLS 1.2 secure cipher suites - ECDSA key exchange (for ECDSA certificates)
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+		},
+		CurvePreferences: []tls.CurveID{
+			tls.X25519,    // Modern and fast
+			tls.CurveP256, // NIST P-256
+			tls.CurveP384, // NIST P-384
+			tls.CurveP521, // NIST P-521
 		},
-
-		PreferServerCipherSuites: true,
 	}
 
 	server := &http.Server{
@@ -57,7 +67,7 @@ func ServeDependencies() {
 
 	catcher.Info("Starting HTTP server on port 8080", map[string]any{"process": "agent-manager"})
 	if err := server.ListenAndServeTLS("", ""); err != nil {
-		catcher.Error("error starting HTTP server", err, map[string]any{"process": "agent-manager"})
+		_ = catcher.Error("error starting HTTP server", err, map[string]any{"process": "agent-manager"})
 		return
 	}
 }
diff --git a/agent/updater/utils/download.go b/agent/updater/utils/download.go
@@ -20,7 +20,8 @@ func DownloadFile(url string, headers map[string]string, fileName string, path s
 
 	client := &http.Client{}
 	client.Transport = &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTlsVerification},
+		TLSClientConfig:    &tls.Config{InsecureSkipVerify: skipTlsVerification},
+		DisableCompression: true,
 	}
 
 	resp, err := client.Do(req)
diff --git a/agent/utils/download.go b/agent/utils/download.go
@@ -21,6 +21,7 @@ func DownloadFile(url string, headers map[string]string, fileName string, path s
 	client := &http.Client{}
 	client.Transport = &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTlsVerification},
+		DisableCompression: true,
 	}
 
 	resp, err := client.Do(req)
diff --git a/agent/utils/files.go b/agent/utils/files.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"reflect"
 
 	"gopkg.in/yaml.v2"
 )
@@ -22,6 +23,15 @@ func GetMyPath() string {
 }
 
 func ReadYAML(path string, result interface{}) error {
+	if result == nil {
+		return fmt.Errorf("result interface is nil")
+	}
+
+	rv := reflect.ValueOf(result)
+	if rv.Kind() != reflect.Ptr || rv.IsNil() {
+		return fmt.Errorf("result must be a non-nil pointer")
+	}
+
 	file, err := os.Open(path)
 	if err != nil {
 		return err
diff --git a/frontend/src/app/graphic-builder/chart-builder/chart-builder.component.html b/frontend/src/app/graphic-builder/chart-builder/chart-builder.component.html
@@ -20,7 +20,7 @@ <h5 class="mb-0 label-header px-3 py-2">
   </app-visualization-header>
 
   <div class="row">
-    <div *ngIf="visualization && visualization.filterType && !isSqlMode" class="col-lg-12 col-sm-12 col-md-12 p-0">
+    <div *ngIf="visualization" class="col-lg-12 col-sm-12 col-md-12 p-0">
       <app-utm-elastic-filter (filterChange)="onFilterChange($event)"
                               [filters]="visualization.filterType"
                               [pattern]="pattern"
@@ -97,6 +97,7 @@ <h5 class="mb-0 label-header px-3 py-2">
                   [(ngModel)]="sqlQuery"
                   (ngModelChange)="clearMessages()"
                   [customKeywords]="loadFieldNames().concat(indexPatternNames)"
+                  (indexPatternChange)="onIndexPatternChange($event)"
                   [consoleOptions]="codeEditorOptions">
               </app-code-editor>
             </div>
diff --git a/frontend/src/app/graphic-builder/chart-builder/chart-builder.component.ts b/frontend/src/app/graphic-builder/chart-builder/chart-builder.component.ts
@@ -40,6 +40,9 @@ import {VisualizationService} from '../visualization/shared/services/visualizati
 import {VisualizationSaveComponent} from '../visualization/visualization-save/visualization-save.component';
 
 import {DashboardStatusEnum} from '../dashboard-builder/shared/enums/dashboard-status.enum';
+import {HttpResponse} from "@angular/common/http";
+import {IndexPatternService} from "../../shared/services/elasticsearch/index-pattern.service";
+import {map} from "rxjs/operators";
 
 
 @Component({
@@ -75,6 +78,7 @@ export class ChartBuilderComponent implements OnInit, AfterViewChecked {
   indexPatternNames: string[] = [];
   codeEditorOptions: ConsoleOptions = {lineNumbers: 'off'};
   loading = true;
+  indexPattern: UtmIndexPattern[];
 
   constructor(private spinner: NgxSpinnerService,
               private route: ActivatedRoute,
@@ -86,7 +90,8 @@ export class ChartBuilderComponent implements OnInit, AfterViewChecked {
               private location: Location,
               private router: Router,
               private localFieldService: LocalFieldService,
-              private sqlValidationService: SqlValidationService) {
+              private sqlValidationService: SqlValidationService,
+              private indexPatternService: IndexPatternService) {
     route.queryParams.subscribe(params => {
       this.chart = params[VisualizationQueryParamsEnum.CHART];
       this.mode = params[VisualizationQueryParamsEnum.MODE];
@@ -138,6 +143,8 @@ export class ChartBuilderComponent implements OnInit, AfterViewChecked {
       };
       this.loading = false;
     }
+
+    this.getIndexPatterns();
   }
 
   getFields() {
@@ -343,13 +350,37 @@ export class ChartBuilderComponent implements OnInit, AfterViewChecked {
 
   nullifyUnusedFields() {
     this.visualization.aggregationType = null;
-    this.visualization.pattern = null;
-    this.visualization.idPattern = null;
-    this.visualization.filterType = null;
   }
 
   clearMessages(): void {
     this.errorMessage = '';
   }
 
+  getIndexPatterns() {
+    const req = {
+      page: 0,
+      size: 1000,
+      sort: 'id,asc',
+      'isActive.equals': true,
+    };
+    this.indexPatternService.query(req)
+      .pipe(
+        map((res: HttpResponse<any>) => res.body || [])
+      )
+      .subscribe({
+        next: data => {
+          this.indexPatternNames = data.map((pattern: UtmIndexPattern) => pattern.pattern);
+          this.indexPattern = data;
+        },
+        error: () => this.indexPatternNames = [],
+      });
+  }
+
+   onIndexPatternChange($event: string) {
+    const indexPattern = this.indexPattern.find(p => p.pattern === $event);
+
+    if (indexPattern) {
+      this.indexPatternSelected(indexPattern);
+    }
+  }
 }
diff --git a/frontend/src/app/graphic-builder/shared/components/viewer/chart-view/chart-view.component.ts b/frontend/src/app/graphic-builder/shared/components/viewer/chart-view/chart-view.component.ts
@@ -127,6 +127,9 @@ export class ChartViewComponent implements OnInit, OnDestroy {
     if (!this.defaultTime) {
       this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
         : new ElasticFilterDefaultTime('now-30d', 'now');
+    }
+
+    if (this.building) {
       this.refreshService.sendRefresh(this.refreshType);
     }
   }
diff --git a/frontend/src/app/graphic-builder/shared/components/viewer/goal-view/goal-view.component.ts b/frontend/src/app/graphic-builder/shared/components/viewer/goal-view/goal-view.component.ts
@@ -100,7 +100,10 @@ export class GoalViewComponent implements OnInit, OnDestroy {
 
     if (!this.defaultTime) {
       this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
-      : new ElasticFilterDefaultTime('now-30d', 'now');
+        : new ElasticFilterDefaultTime('now-30d', 'now');
+    }
+
+    if (this.building) {
       this.refreshService.sendRefresh(this.refreshType);
     }
   }
diff --git a/frontend/src/app/graphic-builder/shared/components/viewer/map-view/map-view.component.ts b/frontend/src/app/graphic-builder/shared/components/viewer/map-view/map-view.component.ts
@@ -326,9 +326,11 @@ export class MapViewComponent implements OnInit, AfterViewInit, OnDestroy {
       });
 
     if (!this.defaultTime) {
-      this.defaultTime = this.visualization.queryLanguage === ChartBuilderQueryLanguageEnum.DSL ?
-        resolveDefaultVisualizationTime(this.visualization)
+      this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
         : new ElasticFilterDefaultTime('now-30d', 'now');
+    }
+
+    if (this.building) {
       this.refreshService.sendRefresh(this.refreshType);
     }
   }
diff --git a/frontend/src/app/graphic-builder/shared/components/viewer/metric-view/metric-view.component.ts b/frontend/src/app/graphic-builder/shared/components/viewer/metric-view/metric-view.component.ts
@@ -99,12 +99,12 @@ export class MetricViewComponent implements OnInit, OnDestroy {
     });
 
     if (!this.defaultTime) {
-      this.defaultTime = resolveDefaultVisualizationTime(this.visualization);
-
-      if (!this.defaultTime) {
-        this.refreshService.sendRefresh(this.refreshType);
-      }
+      this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
+        : new ElasticFilterDefaultTime('now-30d', 'now');
+    }
 
+    if (this.building) {
+      this.refreshService.sendRefresh(this.refreshType);
     }
   }
 
diff --git a/frontend/src/app/graphic-builder/shared/components/viewer/table-view/table-view.component.ts b/frontend/src/app/graphic-builder/shared/components/viewer/table-view/table-view.component.ts
@@ -129,9 +129,11 @@ export class TableViewComponent implements OnInit, OnChanges, OnDestroy {
       });
 
     if (!this.defaultTime) {
-      this.defaultTime = this.visualization.queryLanguage === ChartBuilderQueryLanguageEnum.DSL ?
-        resolveDefaultVisualizationTime(this.visualization)
+      this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
         : new ElasticFilterDefaultTime('now-30d', 'now');
+    }
+
+    if (this.building) {
       this.refreshService.sendRefresh(this.refreshType);
     }
   }
diff --git a/frontend/src/app/graphic-builder/shared/util/visualization/visualization-render.util.ts b/frontend/src/app/graphic-builder/shared/util/visualization/visualization-render.util.ts
@@ -12,6 +12,6 @@ export function resolveDefaultVisualizationTime(visualization: VisualizationType
     const to = visualization.filterType[indexTime].value[1];
     return new ElasticFilterDefaultTime(from, to);
   } else {
-    return null;
+    return new ElasticFilterDefaultTime('now-30d', 'now');
   }
 }
diff --git a/frontend/src/app/shared/chart/types/visualization.type.ts b/frontend/src/app/shared/chart/types/visualization.type.ts
@@ -1,9 +1,9 @@
+import {ChartBuilderQueryLanguageEnum} from "../../enums/chart-builder-query-language.enum";
 import {ChartTypeEnum} from '../../enums/chart-type.enum';
 import {DataNatureTypeEnum} from '../../enums/nature-data.enum';
 import {ElasticFilterType} from '../../types/filter/elastic-filter.type';
 import {UtmIndexPattern} from '../../types/index-pattern/utm-index-pattern';
 import {MetricDataType} from './metric/metric-data.type';
-import {ChartBuilderQueryLanguageEnum} from "../../enums/chart-builder-query-language.enum";
 
 export class VisualizationType {
   chartConfig?: any;
diff --git a/frontend/src/app/shared/components/code-editor/code-editor.component.ts b/frontend/src/app/shared/components/code-editor/code-editor.component.ts
@@ -54,6 +54,7 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
   @Input() consoleOptions?: ConsoleOptions;
   @Output() execute = new EventEmitter<string>();
   @Output() clearData = new EventEmitter<void>();
+  @Output() indexPatternChange = new EventEmitter<string>();
   @Input() queryError: string | null = null;
   @Input() customKeywords: string[] = [];
 
@@ -88,13 +89,6 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
     this.consoleOptions = { ...this.defaultOptions, ...this.consoleOptions };
   }
 
-  ngOnDestroy(): void {
-    if (this.completionProvider) {
-      this.completionProvider.dispose();
-      this.completionProvider = undefined;
-    }
-  }
-
   onEditorInit(editorInstance: monaco.editor.IStandaloneCodeEditor) {
     this.completionProvider = monaco.languages.registerCompletionItemProvider('sql', {
       provideCompletionItems: () => {
@@ -165,6 +159,7 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
   }
 
   clearMessages(): void {
+    console.log('Query:', this.extractIndexPattern(this.sqlQuery));
     this.errorMessage = '';
     this.successMessage = '';
   }
@@ -184,4 +179,44 @@ export class CodeEditorComponent implements OnInit, OnDestroy, ControlValueAcces
   setDisabledState?(isDisabled: boolean): void {
     // Optional: handle disabled state
   }
+
+   extractIndexPattern(sql: string): string | null {
+    const normalized = sql
+      .replace(/\s+/g, ' ')
+      .toLowerCase();
+
+    const fromIndex = normalized.indexOf(' from ');
+    if (fromIndex === -1) { return null; }
+
+    const start = fromIndex + 6;
+
+    const keywords = [' where ', ' group by ', ' order by ', ' limit ', ' having '];
+
+    let end = normalized.length;
+    for (const kw of keywords) {
+      const idx = normalized.indexOf(kw, start);
+      if (idx !== -1 && idx < end) {
+        end = idx;
+      }
+    }
+
+    const originalFragment = sql.substring(start, end).trim();
+
+    if (originalFragment.length > 0) {
+     const indexPatternSelected = this.customKeywords.find(keyword => keyword === originalFragment);
+
+     if (indexPatternSelected) {
+       console.log(indexPatternSelected);
+       this.indexPatternChange.emit(indexPatternSelected);
+     }
+   }
+  }
+
+  ngOnDestroy(): void {
+    if (this.completionProvider) {
+      this.completionProvider.dispose();
+      this.completionProvider = undefined;
+    }
+  }
+
 }
diff --git a/installer/utils/os.go b/installer/utils/os.go
diff --git a/plugins/alerts/main.go b/plugins/alerts/main.go
diff --git a/plugins/config/main.go b/plugins/config/main.go
diff --git a/plugins/feeds/internal/client/dependencies.go b/plugins/feeds/internal/client/dependencies.go
diff --git a/plugins/feeds/utils/files.go b/plugins/feeds/utils/files.go
diff --git a/utmstack-collector/utils/download.go b/utmstack-collector/utils/download.go
diff --git a/utmstack-collector/utils/files.go b/utmstack-collector/utils/files.go

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ func DownloadFile(url string, headers map[string]string, fileName string, path s`
`20`	`20`
`21`	`21`	`client := &http.Client{}`
`22`	`22`	`client.Transport = &http.Transport{`
`23`		`- TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTlsVerification},`
	`23`	`+ TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTlsVerification},`
	`24`	`+ DisableCompression: true,`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`resp, err := client.Do(req)`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ func DownloadFile(url string, headers map[string]string, fileName string, path s`
`21`	`21`	`client := &http.Client{}`
`22`	`22`	`client.Transport = &http.Transport{`
`23`	`23`	`TLSClientConfig: &tls.Config{InsecureSkipVerify: skipTlsVerification},`
	`24`	`+ DisableCompression: true,`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`resp, err := client.Do(req)`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,9 @@ export class ChartViewComponent implements OnInit, OnDestroy {`
`127`	`127`	`if (!this.defaultTime) {`
`128`	`128`	`this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)`
`129`	`129`	`: new ElasticFilterDefaultTime('now-30d', 'now');`
	`130`	`+ }`
	`131`	`+`
	`132`	`+ if (this.building) {`
`130`	`133`	`this.refreshService.sendRefresh(this.refreshType);`
`131`	`134`	`}`
`132`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,10 @@ export class GoalViewComponent implements OnInit, OnDestroy {`
`100`	`100`
`101`	`101`	`if (!this.defaultTime) {`
`102`	`102`	`this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)`
`103`		`- : new ElasticFilterDefaultTime('now-30d', 'now');`
	`103`	`+ : new ElasticFilterDefaultTime('now-30d', 'now');`
	`104`	`+ }`
	`105`	`+`
	`106`	`+ if (this.building) {`
`104`	`107`	`this.refreshService.sendRefresh(this.refreshType);`
`105`	`108`	`}`
`106`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -326,9 +326,11 @@ export class MapViewComponent implements OnInit, AfterViewInit, OnDestroy {`
`326`	`326`	`});`
`327`	`327`
`328`	`328`	`if (!this.defaultTime) {`
`329`		`- this.defaultTime = this.visualization.queryLanguage === ChartBuilderQueryLanguageEnum.DSL ?`
`330`		`- resolveDefaultVisualizationTime(this.visualization)`
	`329`	`+ this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)`
`331`	`330`	`: new ElasticFilterDefaultTime('now-30d', 'now');`
	`331`	`+ }`
	`332`	`+`
	`333`	`+ if (this.building) {`
`332`	`334`	`this.refreshService.sendRefresh(this.refreshType);`
`333`	`335`	`}`
`334`	`336`	`}`