From 0c189543894f7b109ec31661d6e44aa7777ac834 Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Mon, 10 Mar 2025 15:30:06 -0500 Subject: [PATCH 1/6] chore: update version and changelog --- CHANGELOG.md | 12 ++---------- version.yml | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc8ce8ec6..e286a832f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,4 @@ -# UTMStack 10.6.1 Release Notes +# UTMStack 10.6.2 Release Notes ## Bug Fixes -- Fixed ISM policy to ensure snapshots include only indices older than 24 hours. - -## Features -- Additional Compliance Reports. -- Updated Sophos Central Integration Guide: The guide was updated due to significant changes in Sophos’s API authentication process. - -- Important Notice: Sophos Integration Update - Sophos recently implemented a major change in how their APIs handle authentication for log retrieval. As a result, upgrading to UTMStack 10.6.1 will require reconfiguring the Sophos credentials to ensure continued functionality. - +- Enhanced the Log Explorer UI to improve usability by refining the display of Refresh, Save Query, Load Query, and Add Filter actions for a more intuitive user experience.. diff --git a/version.yml b/version.yml index c4fb4fc29..23251a8ee 100644 --- a/version.yml +++ b/version.yml @@ -1 +1 @@ -version: 10.6.1 \ No newline at end of file +version: 10.6.2 \ No newline at end of file From a240f5accd5703f58163feb4063596cb3f946a48 Mon Sep 17 00:00:00 2001 From: Manuel Abascal Date: Mon, 10 Mar 2025 15:45:09 -0500 Subject: [PATCH 2/6] fix: improve visibility of actions in Log Explorer --- .../log-analyzer-view.component.html | 33 ++++--- .../log-analyzer-view.component.scss | 19 +++- .../log-analyzer-view.component.ts | 4 + .../elastic-filter-time.component.html | 8 +- .../elastic-filter.component.html | 93 ++++++------------- .../elastic-filter.component.scss | 18 +++- 6 files changed, 85 insertions(+), 90 deletions(-) diff --git a/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.html b/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.html index 5cde6a65c..feb3727fe 100644 --- a/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.html +++ b/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.html @@ -1,36 +1,41 @@ -
-
-
+
+
+
-
+
+
-
-
- - + +
+ +
-
diff --git a/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.scss b/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.scss index 9b13ea16c..b4dd51c37 100644 --- a/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.scss +++ b/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.scss @@ -12,8 +12,21 @@ app-log-analyzer-field { } .search-container { - max-width: 60%; - min-width: 40%; - width: 100%; + flex-basis: 65%; +} + +.btn-refresh { + background-color: #d3dae696; + color: #0277bd; + height: 36px !important; + border: 1px solid #d3dae696; +} + +.gap-1 { + gap: .25rem; +} + +.gap-2 { + gap: .5rem; } diff --git a/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.ts b/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.ts index 9ee387462..7dfba0f46 100644 --- a/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.ts +++ b/frontend/src/app/log-analyzer/explorer/log-analyzer-view/log-analyzer-view.component.ts @@ -381,6 +381,10 @@ export class LogAnalyzerViewComponent implements OnInit, OnDestroy { this.setInitialWidth(); } + loadQuery() { + this.router.navigate(['/discover/log-analyzer-queries']); + } + ngOnDestroy(): void { this.filters = []; this.utmFilterBehavior.$filterChange.next(null); diff --git a/frontend/src/app/shared/components/utm/filters/elastic-filter-time/elastic-filter-time.component.html b/frontend/src/app/shared/components/utm/filters/elastic-filter-time/elastic-filter-time.component.html index 27d880754..89e5134a8 100644 --- a/frontend/src/app/shared/components/utm/filters/elastic-filter-time/elastic-filter-time.component.html +++ b/frontend/src/app/shared/components/utm/filters/elastic-filter-time/elastic-filter-time.component.html @@ -26,16 +26,16 @@ [container]="container?container:''" [ngbPopover]="popContent" autoClose="outside" - class="d-flex justify-content-start align-items-center cursor-pointer pr-2 border-grey-100 border-1 border-radius-1" + class="d-flex justify-content-start align-items-center cursor-pointer pr-2 border-grey-100 border-1 border-radius-1 flex-grow-1" placement="bottom-right" popoverClass="utm-popover-filter-time" style="white-space: nowrap"> - - + +
+ class="d-flex justify-content-center flex-grow-1 span-small-icon"> {{dateFrom}} {{dateTo}} diff --git a/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.html b/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.html index 191bc42b2..7a14fe293 100644 --- a/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.html +++ b/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.html @@ -63,46 +63,29 @@ -
+
-
-
+
+
-
+
-
-
+
- + + + Add filter + +
-
-
+
+ -
+
@@ -191,39 +187,6 @@
- -
- -
- - Add filter -
- - -
- - Clear all -
- - -
- - -
- - Load query - -
- - -
- - Save query - -
-
- -
diff --git a/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.scss b/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.scss index a9c5caad2..812964020 100644 --- a/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.scss +++ b/frontend/src/app/shared/components/utm/filters/utm-elastic-filter/elastic-filter.component.scss @@ -11,7 +11,7 @@ } .filter-time-container { - min-width: 300px; + border-left: 1px solid #ddd; } app-elastic-filter-add { @@ -48,7 +48,7 @@ app-elastic-filter-add { color: #0277bd; } -.order-button:hover { +.order-button:hover:not(.btn-right) { background-color: #d3dae6; } @@ -63,8 +63,10 @@ app-elastic-filter-add { } .btn-right { - border-top-left-radius: 0; - border-bottom-left-radius: 0; + border: 1px dashed #d3dae6; + background-color: transparent; + width: auto; + padding: .25rem .5rem; } .context-menu { @@ -100,5 +102,13 @@ app-elastic-filter-add { margin-left: auto; } +.filters-container { + flex-basis: 85%; +} + +.gap-1 { + gap: .25rem; +} + From ab575a214005abd97471fafd121d74530e16f08f Mon Sep 17 00:00:00 2001 From: Jose Angel Sanchez Velazquez Date: Tue, 11 Mar 2025 14:45:42 +0100 Subject: [PATCH 3/6] bugfix: recreate geoip index on missing --- CHANGELOG.md | 1 + correlation/aaa/rules/system | 1 + correlation/system | 1 + installer/cloud.go | 8 +++++++- installer/master.go | 8 +++++++- installer/utils/elastic.go | 28 ++++++++++++++++++++++++++++ 6 files changed, 45 insertions(+), 2 deletions(-) create mode 160000 correlation/aaa/rules/system create mode 160000 correlation/system create mode 100644 installer/utils/elastic.go diff --git a/CHANGELOG.md b/CHANGELOG.md index e286a832f..5657de19c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,3 +2,4 @@ ## Bug Fixes - Enhanced the Log Explorer UI to improve usability by refining the display of Refresh, Save Query, Load Query, and Add Filter actions for a more intuitive user experience.. +- Recreating geoip opensearch index if missing diff --git a/correlation/aaa/rules/system b/correlation/aaa/rules/system new file mode 160000 index 000000000..58317e8e2 --- /dev/null +++ b/correlation/aaa/rules/system @@ -0,0 +1 @@ +Subproject commit 58317e8e2665c7fc7609b7756870ae6f5d60f9aa diff --git a/correlation/system b/correlation/system new file mode 160000 index 000000000..58317e8e2 --- /dev/null +++ b/correlation/system @@ -0,0 +1 @@ +Subproject commit 58317e8e2665c7fc7609b7756870ae6f5d60f9aa diff --git a/installer/cloud.go b/installer/cloud.go index d357b6763..413ed49b8 100644 --- a/installer/cloud.go +++ b/installer/cloud.go @@ -212,7 +212,13 @@ func Cloud(c *types.Config, update bool) error { fmt.Println("Initializing User Auditor database [OK]") } - if utils.GetLock(7, stack.LocksDir) { + indexURL := "http://localhost:9200/.utm-geoip?pretty" + indexExists, err := utils.CheckIndexExists(indexURL) + if err != nil { + return err + } + + if !indexExists || utils.GetLock(7, stack.LocksDir) { fmt.Println("Initializing OpenSearch. This may take a while.") if err := InitOpenSearch(); err != nil { return err diff --git a/installer/master.go b/installer/master.go index 5b08f5ee8..4fdd57c3a 100644 --- a/installer/master.go +++ b/installer/master.go @@ -200,7 +200,13 @@ func Master(c *types.Config) error { fmt.Println("Initializing User Auditor database [OK]") } - if utils.GetLock(7, stack.LocksDir) { + indexURL := "http://localhost:9200/.utm-geoip?pretty" + indexExists, err := utils.CheckIndexExists(indexURL) + if err != nil { + return err + } + + if !indexExists || utils.GetLock(7, stack.LocksDir) { fmt.Println("Initializing OpenSearch. This may take a while.") if err := InitOpenSearch(); err != nil { return err diff --git a/installer/utils/elastic.go b/installer/utils/elastic.go new file mode 100644 index 000000000..9bb8f1cb5 --- /dev/null +++ b/installer/utils/elastic.go @@ -0,0 +1,28 @@ +package utils + +import ( + "fmt" + "net/http" +) + +// CheckIndexExists checks if the given Elasticsearch index exists by sending an HTTP GET +// request to the provided URL. It returns true if the index exists, false otherwise. +func CheckIndexExists(url string) (bool, error) { + resp, err := http.Get(url) + if err != nil { + return false, err + } + defer resp.Body.Close() + + switch resp.StatusCode { + case http.StatusOK: + // The index exists. + return true, nil + case http.StatusNotFound: + // The index does not exist. + return false, nil + default: + // For any other status code, return an error. + return false, fmt.Errorf("unexpected status code: %d", resp.StatusCode) + } +} From cd8b89a5988efd6d4d57e0d1d7066b68c643f02e Mon Sep 17 00:00:00 2001 From: "Freddy R. Laffita Almaguer" Date: Tue, 11 Mar 2025 16:28:48 +0200 Subject: [PATCH 4/6] Updating changelog.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5657de19c..494170466 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,4 @@ ## Bug Fixes - Enhanced the Log Explorer UI to improve usability by refining the display of Refresh, Save Query, Load Query, and Add Filter actions for a more intuitive user experience.. -- Recreating geoip opensearch index if missing +- Updating installer to address missing GeoIP index From b221df6bc0d490b309d8768f9fc3c6348e3edc38 Mon Sep 17 00:00:00 2001 From: Jose Angel Sanchez Velazquez Date: Tue, 11 Mar 2025 15:49:09 +0100 Subject: [PATCH 5/6] remove dangling test route --- correlation/aaa/rules/system | 1 - 1 file changed, 1 deletion(-) delete mode 160000 correlation/aaa/rules/system diff --git a/correlation/aaa/rules/system b/correlation/aaa/rules/system deleted file mode 160000 index 58317e8e2..000000000 --- a/correlation/aaa/rules/system +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 58317e8e2665c7fc7609b7756870ae6f5d60f9aa From aef2b01b925af0a0b75ec575fa9b115b0c0c92f8 Mon Sep 17 00:00:00 2001 From: Jose Angel Sanchez Velazquez Date: Tue, 11 Mar 2025 15:50:01 +0100 Subject: [PATCH 6/6] bugfix: retag docker images to github registry --- CHANGELOG.md | 2 ++ installer/types/compose.go | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5657de19c..c21217e10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,3 +3,5 @@ - Enhanced the Log Explorer UI to improve usability by refining the display of Refresh, Save Query, Load Query, and Add Filter actions for a more intuitive user experience.. - Recreating geoip opensearch index if missing + +- Retag docker images to github registry diff --git a/installer/types/compose.go b/installer/types/compose.go index a425f2cfd..ce7b44769 100644 --- a/installer/types/compose.go +++ b/installer/types/compose.go @@ -83,7 +83,7 @@ func (c *Compose) Populate(conf *Config, stack *StackConfig) *Compose { LSMem := stack.ServiceResources["logstash"].AssignedMemory LSMin := stack.ServiceResources["logstash"].MinMemory c.Services["logstash"] = Service{ - Image: utils.Str("utmstack.azurecr.io/logstash:" + conf.Branch), + Image: utils.Str("ghcr.io/utmstack/utmstack/logstash:" + conf.Branch), Environment: []string{ "CONFIG_RELOAD_AUTOMATIC=true", fmt.Sprintf("LS_JAVA_OPTS=-Xms%dm -Xmx%dm -Xss100m", LSMem/2, LSMem/2), @@ -183,7 +183,7 @@ func (c *Compose) Populate(conf *Config, stack *StackConfig) *Compose { postgresMem := stack.ServiceResources["postgres"].AssignedMemory postgresMin := stack.ServiceResources["postgres"].MinMemory c.Services["postgres"] = Service{ - Image: utils.Str("utmstack.azurecr.io/postgres:" + conf.Branch), + Image: utils.Str("ghcr.io/utmstack/utmstack/postgres:" + conf.Branch), Environment: []string{ "POSTGRES_PASSWORD=" + conf.Password, "PGDATA=/var/lib/postgresql/data/pgdata", @@ -463,7 +463,7 @@ func (c *Compose) Populate(conf *Config, stack *StackConfig) *Compose { // temporary create node1 always if true { c.Services["node1"] = Service{ - Image: utils.Str("utmstack.azurecr.io/opensearch:" + conf.Branch), + Image: utils.Str("ghcr.io/utmstack/utmstack/opensearch:" + conf.Branch), Ports: []string{ "9200:9200", },