Skip to content

Commit

Permalink
Support new Opensearch dashboard version 2.12.0 (#6440)
Browse files Browse the repository at this point in the history
* Update dev.sh

* Update OSD version in plugins and changelog

* Update optimazer warnings

* Change breadcrumb in register agent for "Endpoint"

* Fix snapshot

* Fix snapshot

* Remove dependency wazuh-endpoint

* Fix test
  • Loading branch information
yenienserrano authored Feb 23, 2024
1 parent 67f7831 commit f6caa12
Show file tree
Hide file tree
Showing 36 changed files with 345 additions and 108 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

## Wazuh v4.9.0 - OpenSearch Dashboards 2.11.0 - Revision 00
## Wazuh v4.9.0 - OpenSearch Dashboards 2.12.0 - Revision 00

### Added

Expand Down
6 changes: 4 additions & 2 deletions docker/osd-dev/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ os_versions=(
'2.9.0'
'2.10.0'
'2.11.0'
'2.11.1'
'2.12.0'
)

osd_versions=(
Expand All @@ -28,8 +30,8 @@ osd_versions=(
'2.9.0'
'2.10.0'
'2.11.0'
'4.6.0'
'4.7.0'
'2.11.1'
'2.12.0'
)

wzs_version=(
Expand Down
3 changes: 1 addition & 2 deletions plugins/main/opensearch_dashboards.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"opensearchDashboardsUtils",
"opensearchDashboardsLegacy",
"wazuhCheckUpdates",
"wazuhCore",
"wazuhEndpoints"
"wazuhCore"
],
"optionalPlugins": [
"security",
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "4.9.0",
"revision": "00",
"pluginPlatform": {
"version": "2.11.0"
"version": "2.12.0"
},
"description": "Wazuh dashboard",
"keywords": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ exports[`AgentStatus component Renders status indicator with the its color and t
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
/>
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
Expand All @@ -53,7 +57,11 @@ exports[`AgentStatus component Renders status indicator with the its color and t
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
/>
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</span>
</div>
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ Array [
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
/>
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ Array [
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
/>
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ exports[`AgentStatTable component Renders correctly to match the snapshot 1`] =
<EuiIcon
type="calendar"
>
<EuiIconEmpty
<EuiIconBeaker
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon-isLoading"
focusable="false"
Expand All @@ -83,8 +83,12 @@ exports[`AgentStatTable component Renders correctly to match the snapshot 1`] =
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
/>
</EuiIconEmpty>
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</EuiIconBeaker>
</EuiIcon>
Start:
Expand Down Expand Up @@ -459,7 +463,7 @@ exports[`AgentStatTable component Renders correctly to match the snapshot 1`] =
size="m"
type="importAction"
>
<EuiIconEmpty
<EuiIconBeaker
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
focusable="false"
Expand All @@ -476,8 +480,12 @@ exports[`AgentStatTable component Renders correctly to match the snapshot 1`] =
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
/>
</EuiIconEmpty>
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</EuiIconBeaker>
</EuiIcon>
<span
className="euiButtonEmpty__text"
Expand Down
Loading

0 comments on commit f6caa12

Please sign in to comment.