Skip to content

Commit 20096cf

Browse files
authored
Merge branch 'main' into dependabot/go_modules/correlation/github.com/fsnotify/fsnotify-1.8.0
2 parents df23c16 + 88b8555 commit 20096cf

173 files changed

Lines changed: 8229 additions & 917 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/principal-agent.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
go-version: 1.21
5454

5555
- name: Set up Python
56-
uses: actions/setup-python@v2
56+
uses: actions/setup-python@v5
5757
with:
5858
python-version: '3.12'
5959

.github/workflows/principal-installer-dev.yml

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,42 +29,7 @@ jobs:
2929
if: needs.check_feature.outputs.is_feature == 'true'
3030
runs-on: dev
3131
steps:
32-
- name: Check out code into the right branch
33-
uses: actions/checkout@v4
34-
with:
35-
ref: ${{ github.event.workflow_run.head_branch }}
36-
37-
- name: Set up Go 1.x
38-
uses: actions/setup-go@v5
39-
with:
40-
go-version: ^1.20
41-
id: go
42-
43-
- name: Get dependencies
44-
working-directory: ./installer
45-
run: |
46-
go get -v -t -d ./...
47-
if [ -f Gopkg.toml ]; then
48-
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
49-
dep ensure
50-
fi
51-
52-
- name: Test
53-
working-directory: ./installer
54-
run: go test -v .
55-
56-
- name: Build
57-
working-directory: ./installer
58-
env:
59-
GOOS: linux
60-
GOARCH: amd64
61-
run: |
62-
go build -o installer -v .
63-
mv installer /home/utmstack/installer
64-
chmod +x /home/utmstack/installer
65-
6632
- name: Run
67-
id: run_installer
6833
working-directory: /home/utmstack
6934
run: |
7035
sudo ./installer

.github/workflows/principal-installer-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Create Release
4242
id: create_release
43-
uses: softprops/action-gh-release@v1
43+
uses: softprops/action-gh-release@v2
4444
env:
4545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4646
with:

.github/workflows/used-docker-frontend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
npm run-script build
3737
3838
- name: Setup BuildX
39-
uses: docker/setup-buildx-action@v1
39+
uses: docker/setup-buildx-action@v3
4040

4141
- name: Login to GitHub Container Registry
4242
uses: docker/login-action@v3

.github/workflows/used-docker-java-11.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: Set up JDK 11
21-
uses: actions/setup-java@v2
21+
uses: actions/setup-java@v4
2222
with:
2323
java-version: "11"
2424
distribution: "temurin"
2525

2626
- name: Read version from config
2727
id: read_version
28-
uses: CumulusDS/get-yaml-paths-action@v1.0.1
28+
uses: CumulusDS/get-yaml-paths-action@v1.0.2
2929
with:
3030
file: version.yml
3131
version: version

.github/workflows/used-docker-java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v4
1717

1818
- name: Set up JDK 11
19-
uses: actions/setup-java@v2
19+
uses: actions/setup-java@v4
2020
with:
2121
java-version: "11"
2222
distribution: "temurin"

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
# UTMStack 10.5.14 Release Notes
1+
# UTMStack 10.5.18 Release Notes
22
## Bugfix
3-
- Remove memory usage indicator
3+
- Fixed unable to change status to complete if observations contains french characters
4+
- Fixed Elastic filter time adds unnecessary /d to intervals in Log Explorer
5+
- Fixed handle special characters in password query parameter
6+
- Fixed filter duplication issue in Log Explorer when removing filters
7+
- Fixed Cisco ASA and Cisco Firepower filters when the data coming without syslog date or host information
8+
- Fixed container memory resource distribution

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Definitions:
8181
- Data source: any individual source of logs, for example, devices, agents, SaaS integrations.
8282

8383
Resources needed for one month of hot log storage.
84-
- For 50 data sources (120 GB) of hot log storage you will need 4 Cores, 12 GB RAM, 150 GB Disk Space
84+
- For 50 data sources (120 GB) of hot log storage you will need 4 Cores, 16 GB RAM, 150 GB Disk Space
8585
- For 120 data sources (250 GB) of hot log storage you will need 8 Cores, 16 GB RAM, 250 GB Disk Space
8686
- For 240 data sources (500 GB) of hot log storage you will need 16 Cores, 32 GB RAM, 500 GB Disk Space
8787
- For 500 data sources (1000 GB) of hot log storage you will need 32 Cores, 64 GB RAM, 1000 GB Disk Space

SECURITY.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
| 7.x | :x: | Jan 15, 2022 |
1414
| 8.x | :x: | Jan 15, 2023 |
1515
| 9.x | :x: | Jan 15, 2024 |
16-
| 10.x | :white_check_mark: | Jan 15, 2025 |
16+
| 10.x | :white_check_mark: | Jan 15, 2026 |
1717
| 11.x LTS | :date: | Jan 15, 2030 |
1818
| 12.x LTS | :clock1: | Jan 15, 2036 |
1919

2020
:white_check_mark: Supported | :x: Unsupported | :date: Will be released soon | :clock1: Planned
21+
22+
Please report security vulnerabilities to support@utmstack.com

agent/agent/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ require (
4141
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
4242
github.com/ugorji/go/codec v1.2.12 // indirect
4343
golang.org/x/arch v0.7.0 // indirect
44-
golang.org/x/crypto v0.22.0 // indirect
44+
golang.org/x/crypto v0.31.0 // indirect
4545
golang.org/x/net v0.24.0 // indirect
46-
golang.org/x/sys v0.19.0 // indirect
47-
golang.org/x/text v0.14.0 // indirect
46+
golang.org/x/sys v0.28.0 // indirect
47+
golang.org/x/text v0.21.0 // indirect
4848
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
4949
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5050
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)