Skip to content

Commit a04c5f3

Browse files
authored
Merge branch 'main' into merge-4.14.0-into-main
2 parents 407998d + a6094c7 commit a04c5f3

File tree

15 files changed

+33
-27
lines changed

15 files changed

+33
-27
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to the Wazuh app project will be documented in this file.
44

5+
## Wazuh v5.0.0 - OpenSearch Dashboards 2.19.1 - Revision 00
6+
7+
### Added
8+
9+
- Support for Wazuh 5.0.0
10+
511
## Wazuh v4.14.0 - OpenSearch Dashboards 2.19.2 - Revision 00
612

713
### Added

VERSION.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"version": "4.14.0",
2+
"version": "5.0.0",
33
"stage": "alpha0"
44
}

docker/imposter/api-info/api_info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"data": {
33
"title": "Wazuh API REST",
4-
"api_version": "4.14.0",
4+
"api_version": "5.0.0",
55
"revision": 1,
66
"license_name": "GPL 2.0",
77
"license_url": "https://github.com/wazuh/wazuh/blob/4.5/LICENSE",

docker/imposter/wazuh-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
plugin: openapi
3-
specFile: https://raw.githubusercontent.com/wazuh/wazuh/4.14.0/api/api/spec/spec.yaml
3+
specFile: https://raw.githubusercontent.com/wazuh/wazuh/5.0.0/api/api/spec/spec.yaml
44
system:
55
stores:
66
# this store is preloaded from file

plugins/main/opensearch_dashboards.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "wazuh",
3-
"version": "4.14.0-00",
3+
"version": "5.0.0-00",
44
"opensearchDashboardsVersion": "opensearchDashboards",
55
"configPath": ["wazuh"],
66
"requiredPlugins": [

plugins/main/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wazuh",
3-
"version": "4.14.0",
3+
"version": "5.0.0",
44
"revision": "00",
55
"pluginPlatform": {
66
"version": "2.19.2"

plugins/main/public/components/common/tables/__snapshots__/table-with-search-bar.test.tsx.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
110110
<EuiSpacer />
111111
<div>
112112
<EuiLink
113-
href="https://documentation.wazuh.com/4.14/user-manual/wazuh-dashboard/queries.html"
113+
href="https://documentation.wazuh.com/5.0/user-manual/wazuh-dashboard/queries.html"
114114
rel="noopener noreferrer"
115115
target="__blank"
116116
>
@@ -179,7 +179,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
179179
<EuiSpacer />
180180
<div>
181181
<EuiLink
182-
href="https://documentation.wazuh.com/4.14/user-manual/wazuh-dashboard/queries.html"
182+
href="https://documentation.wazuh.com/5.0/user-manual/wazuh-dashboard/queries.html"
183183
rel="noopener noreferrer"
184184
target="__blank"
185185
>
@@ -259,7 +259,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
259259
<EuiSpacer />
260260
<div>
261261
<EuiLink
262-
href="https://documentation.wazuh.com/4.14/user-manual/wazuh-dashboard/queries.html"
262+
href="https://documentation.wazuh.com/5.0/user-manual/wazuh-dashboard/queries.html"
263263
rel="noopener noreferrer"
264264
target="__blank"
265265
>
@@ -369,7 +369,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
369369
<EuiSpacer />
370370
<div>
371371
<EuiLink
372-
href="https://documentation.wazuh.com/4.14/user-manual/wazuh-dashboard/queries.html"
372+
href="https://documentation.wazuh.com/5.0/user-manual/wazuh-dashboard/queries.html"
373373
rel="noopener noreferrer"
374374
target="__blank"
375375
>
@@ -435,7 +435,7 @@ exports[`Table With Search Bar component renders correctly to match the snapshot
435435
<EuiSpacer />
436436
<div>
437437
<EuiLink
438-
href="https://documentation.wazuh.com/4.14/user-manual/wazuh-dashboard/queries.html"
438+
href="https://documentation.wazuh.com/5.0/user-manual/wazuh-dashboard/queries.html"
439439
rel="noopener noreferrer"
440440
target="__blank"
441441
>

plugins/main/public/controllers/management/components/management/configuration/office365/components/SubscriptionTab/__snapshots__/SubscriptionTab.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
3636
help={
3737
Array [
3838
Object {
39-
"href": "https://documentation.wazuh.com/4.14/cloud-security/office365/index.html",
39+
"href": "https://documentation.wazuh.com/5.0/cloud-security/office365/index.html",
4040
"text": "Monitoring Office 365",
4141
},
4242
Object {
43-
"href": "https://documentation.wazuh.com/4.14/user-manual/reference/ossec-conf/office365-module.html",
43+
"href": "https://documentation.wazuh.com/5.0/user-manual/reference/ossec-conf/office365-module.html",
4444
"text": "Configuration options for the module",
4545
},
4646
]
@@ -87,11 +87,11 @@ exports[`SubscriptionTab component renders correctly to match the snapshot 1`] =
8787
links={
8888
Array [
8989
Object {
90-
"href": "https://documentation.wazuh.com/4.14/cloud-security/office365/index.html",
90+
"href": "https://documentation.wazuh.com/5.0/cloud-security/office365/index.html",
9191
"text": "Monitoring Office 365",
9292
},
9393
Object {
94-
"href": "https://documentation.wazuh.com/4.14/user-manual/reference/ossec-conf/office365-module.html",
94+
"href": "https://documentation.wazuh.com/5.0/user-manual/reference/ossec-conf/office365-module.html",
9595
"text": "Configuration options for the module",
9696
},
9797
]

plugins/main/public/controllers/management/components/management/configuration/office365/components/api-auth-tab/__snapshots__/api-auth-tab.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
4141
help={
4242
Array [
4343
Object {
44-
"href": "https://documentation.wazuh.com/4.14/cloud-security/office365/index.html",
44+
"href": "https://documentation.wazuh.com/5.0/cloud-security/office365/index.html",
4545
"text": "Monitoring Office 365",
4646
},
4747
Object {
48-
"href": "https://documentation.wazuh.com/4.14/user-manual/reference/ossec-conf/office365-module.html",
48+
"href": "https://documentation.wazuh.com/5.0/user-manual/reference/ossec-conf/office365-module.html",
4949
"text": "Configuration options for the module",
5050
},
5151
]
@@ -92,11 +92,11 @@ exports[`ApiAuthTab component renders correctly to match the snapshot 1`] = `
9292
links={
9393
Array [
9494
Object {
95-
"href": "https://documentation.wazuh.com/4.14/cloud-security/office365/index.html",
95+
"href": "https://documentation.wazuh.com/5.0/cloud-security/office365/index.html",
9696
"text": "Monitoring Office 365",
9797
},
9898
Object {
99-
"href": "https://documentation.wazuh.com/4.14/user-manual/reference/ossec-conf/office365-module.html",
99+
"href": "https://documentation.wazuh.com/5.0/user-manual/reference/ossec-conf/office365-module.html",
100100
"text": "Configuration options for the module",
101101
},
102102
]

plugins/main/public/controllers/management/components/management/configuration/office365/components/general-tab/__snapshots__/general-tab.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
3737
help={
3838
Array [
3939
Object {
40-
"href": "https://documentation.wazuh.com/4.14/cloud-security/office365/index.html",
40+
"href": "https://documentation.wazuh.com/5.0/cloud-security/office365/index.html",
4141
"text": "Monitoring Office 365",
4242
},
4343
Object {
44-
"href": "https://documentation.wazuh.com/4.14/user-manual/reference/ossec-conf/office365-module.html",
44+
"href": "https://documentation.wazuh.com/5.0/user-manual/reference/ossec-conf/office365-module.html",
4545
"text": "Configuration options for the module",
4646
},
4747
]
@@ -106,11 +106,11 @@ exports[`GeneralTab component renders correctly to match the snapshot 1`] = `
106106
links={
107107
Array [
108108
Object {
109-
"href": "https://documentation.wazuh.com/4.14/cloud-security/office365/index.html",
109+
"href": "https://documentation.wazuh.com/5.0/cloud-security/office365/index.html",
110110
"text": "Monitoring Office 365",
111111
},
112112
Object {
113-
"href": "https://documentation.wazuh.com/4.14/user-manual/reference/ossec-conf/office365-module.html",
113+
"href": "https://documentation.wazuh.com/5.0/user-manual/reference/ossec-conf/office365-module.html",
114114
"text": "Configuration options for the module",
115115
},
116116
]

plugins/wazuh-check-updates/opensearch_dashboards.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "wazuhCheckUpdates",
3-
"version": "4.14.0-00",
3+
"version": "5.0.0-00",
44
"opensearchDashboardsVersion": "opensearchDashboards",
55
"server": true,
66
"ui": true,

plugins/wazuh-check-updates/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wazuh-check-updates",
3-
"version": "4.14.0",
3+
"version": "5.0.0",
44
"revision": "00",
55
"pluginPlatform": {
66
"version": "2.19.2"

plugins/wazuh-core/opensearch_dashboards.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"id": "wazuhCore",
3-
"version": "4.14.0-00",
3+
"version": "5.0.0-00",
44
"opensearchDashboardsVersion": "opensearchDashboards",
55
"server": true,
66
"ui": true,

plugins/wazuh-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wazuh-core",
3-
"version": "4.14.0",
3+
"version": "5.0.0",
44
"revision": "00",
55
"pluginPlatform": {
66
"version": "2.19.2"

tools/repository_bumper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ update_imposter_config() {
150150
log "Updating specFile URL in $imposter_config_file to version $new_version"
151151

152152
# Use sed to replace the version string within the specFile URL
153-
# This regex targets the version part (e.g., 4.14.0) in the specific URL structure
153+
# This regex targets the version part (e.g., 5.0.0) in the specific URL structure
154154
sed -i -E "s|(specFile: https://raw.githubusercontent.com/wazuh/wazuh/)[0-9]+\.[0-9]+\.[0-9]+(.*)|\1${new_version}\2|" "$imposter_config_file" && log "Successfully updated specFile URL in $imposter_config_file" || {
155155
log "ERROR: Failed to update specFile URL in $imposter_config_file using sed."
156156
exit 1

0 commit comments

Comments
 (0)