Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.5.2 into master #1466

Merged
merged 12 commits into from
Aug 24, 2023
Merged

Merge 4.5.2 into master #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4287723
Bump 4.5.2 (#1428)
asteriscos Jul 19, 2023
4a34f1f
Bump 4.5.1 (#1429)
asteriscos Jul 19, 2023
6cf9bf5
feat: update release utilities to current process (#1426) (#1432)
Machi3mfl Jul 21, 2023
2716863
Merge 4.5.1 into 4.5.2 (#1433)
Machi3mfl Jul 21, 2023
cc7c60c
Merge 4.5 into 4.5.1 (#1452)
yenienserrano Aug 11, 2023
c31b7d0
Merge 4.5.1 into 4.5.2 (#1453)
yenienserrano Aug 11, 2023
1f54c1b
update: API data (#1448)
Desvelao Aug 11, 2023
e11b73b
Run prettier
AlexRuiz7 Aug 11, 2023
f5007ca
Bump revision 03
asteriscos Aug 17, 2023
388f26b
merge: merge 4.5.1 into 4.5.2
Tostti Aug 24, 2023
272703f
Merge 4.5.1 into 4.5.2 (#1462)
Tostti Aug 24, 2023
0921b02
merge: merge 4.5.2 into master
Tostti Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

All notable changes to the Wazuh App for Splunk project will be documented in this file.

## Wazuh v4.5.2 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4503
## Wazuh v4.5.2 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4504

### Added
- Added support for Wazuh 4.5.2.

## Wazuh v4.5.1 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4502
## Wazuh v4.5.1 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4503

### Added
- Added support for Wazuh 4.5.1.
Expand Down
4 changes: 2 additions & 2 deletions SplunkAppForWazuh/appserver/static/js/services/app-version/appVersionService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const UI_METADATA = {
"version": "4.8.0",
"revision": "4800"
"version": "4.5.2",
"revision": "4504"
}

define(['../module'], function (module) {
Expand Down
2 changes: 1 addition & 1 deletion SplunkAppForWazuh/bin/api_info/endpoints.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9701,7 +9701,7 @@
"required": true,
"schema": {
"type": "string",
"format": "wazuh_path"
"format": "wpk_path"
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions SplunkAppForWazuh/default/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ is_visible = 1
label = Wazuh

[launcher]
version = 4.5.0
version = 4.5.1
author = info@wazuh.com
description = Wazuh helps you to gain deeper security visibility into your infrastructure by monitoring hosts at an operating system and application level.

Expand All @@ -12,7 +12,7 @@ id = SplunkAppForWazuh
check_for_updates = 1

[install]
build = 4500
build = 4504

[triggers]
reload.package = simple
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"release:bump": "node scripts/release/bump --manifest-package package.json",
"release:tag": "node scripts/release/tag --manifest-package package.json"
},
"version": "4.8.0",
"revision": "4800",
"version": "4.5.2",
"revision": "4504",
"splunk": "8.2"
}
Loading