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

Merge 4.10.0 into 4.10.1 #478

Merged
merged 4 commits into from
Jan 10, 2025
Merged

Merge 4.10.0 into 4.10.1 #478

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d517210
Added NodeJS options in the node exec command (#471)
JuanGarriuz Dec 30, 2024
d8d2ff8
Bump 4.10.0 rev 08 (#475)
Desvelao Jan 8, 2025
43217d3
merge: merge 4.10.0 into 4.10.1
Desvelao Jan 10, 2025
ad49a4e
Update snapshot
Tostti Jan 10, 2025
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@ All notable changes to the Wazuh app project will be documented in this file.

- Support for Wazuh 4.10.1

## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 07
## Wazuh dashboard v4.10.0 - OpenSearch Dashboards 2.16.0 - Revision 08

### Changed

- Reduced the size of the loading logo [#373](https://github.com/wazuh/wazuh-dashboard/pull/373)

### Fixed

- Apply the NodeJS options defined at node.options file to the node exec command [#471](https://github.com/wazuh/wazuh-dashboard/pull/471)

### Removed

- Removed the setting home:useNewHomePage from the advanced settings because the views are not finished [#282](https://github.com/wazuh/wazuh-dashboard/pull/282)
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,4 +506,4 @@
"node": ">=14.20.1 <19",
"yarn": "^1.22.10"
}
}
}
6 changes: 4 additions & 2 deletions scripts/use_node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ fi

# If a file path was provided for execution, prefix with OSD_HOME; use relative paths to avoid the need for this.
if [ ! -z "$OSD_USE_NODE_JS_FILE_PATH" ]; then
NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS" exec "${NODE}" "${OSD_HOME}${OSD_USE_NODE_JS_FILE_PATH}" "${@}"
NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"
exec "${NODE}" ${NODE_OPTIONS} "${OSD_HOME}${OSD_USE_NODE_JS_FILE_PATH}" "${@}"
elif [ $# -ne 0 ]; then
NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS" exec "${NODE}" "${@}"
NODE_OPTIONS="$OSD_NODE_OPTS_PREFIX $OSD_NODE_OPTS $NODE_OPTIONS"
exec "${NODE}" ${NODE_OPTIONS} "${@}"
fi
Loading