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.8.0 into 4.8.1 #2895

Merged
merged 10 commits into from
Apr 1, 2024
Merged

Merge 4.8.0 into 4.8.1 #2895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8be27eb
Change dashboard-management menu order
asteriscos Mar 7, 2024
b943ef9
Merge pull request #2873 from wazuh/change/dashboard-management-categ…
asteriscos Mar 7, 2024
c93e469
CL:
sebasfalcone Mar 26, 2024
a2e3825
Skip certificate validation for CentOS 5
MarcelKemp Mar 27, 2024
efc5d8a
Merge pull request #2891 from wazuh/2889-fix-ssl-verification
MarcelKemp Mar 27, 2024
c80b685
Port variable name fixed
teddytpc1 Mar 27, 2024
0f3a455
Merge pull request #2892 from wazuh/2888-error-port-443-is-being-used…
teddytpc1 Mar 27, 2024
7c58227
Merge pull request #2893 from wazuh/merge-4.7.3-into-4.8.0
teddytpc1 Mar 27, 2024
39752e3
Merge pull request #2890 from wazuh/dev-6363-update-permissions-on-ma…
Dwordcito Mar 30, 2024
24d5933
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1
vikman90 Apr 1, 2024
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: 3 additions & 3 deletions rpms/SPECS/wazuh-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ rm -fr %{buildroot}
%attr(640, wazuh, wazuh) %ghost %{_localstatedir}/logs/integrations.log
%attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.log
%attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.json
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/templates
%dir %attr(440, root, wazuh) %{_localstatedir}/templates
%attr(0440, root, wazuh) %{_localstatedir}/templates/vd_states_template.json
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/api
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/archives
Expand Down Expand Up @@ -751,8 +751,8 @@ rm -fr %{buildroot}
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/rids
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/tasks
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/sockets
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/vd
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/indexer
%dir %attr(660, root, wazuh) %{_localstatedir}/queue/vd
%dir %attr(660, root, wazuh) %{_localstatedir}/queue/indexer
%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/router
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/logcollector
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/keystore
Expand Down
6 changes: 5 additions & 1 deletion rpms/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ src_file="${file_name}.src.rpm"
pkg_path="${rpm_build_dir}/RPMS/${architecture_target}"
src_path="${rpm_build_dir}/SRPMS"
extract_path="${pkg_path}"
ssl_flag=""
mkdir -p ${rpm_build_dir}/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}

# Prepare the sources directory to build the source tar.gz
Expand All @@ -68,7 +69,10 @@ cp -R wazuh-* ${build_dir}/${package_name}
if [ "${use_local_specs}" = "no" ]; then
specs_path="/downloaded_tmp_specs"
mkdir -p "${specs_path}"
curl -L "https://raw.githubusercontent.com/wazuh/wazuh-packages/${wazuh_packages_branch}/rpms/SPECS/wazuh-${build_target}.spec" -o "${specs_path}/wazuh-${build_target}.spec"
if [ "${legacy}" = "yes" ]; then
ssl_flag+="-k"
fi
curl -L "https://raw.githubusercontent.com/wazuh/wazuh-packages/${wazuh_packages_branch}/rpms/SPECS/wazuh-${build_target}.spec" -o "${specs_path}/wazuh-${build_target}.spec" ${ssl_flag}
else
specs_path="/specs"
fi
Expand Down
4 changes: 2 additions & 2 deletions stack/dashboard/base/builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ sed -i "s/navigateToApp(\"home\")/navigateToApp(\"${app_home}\")/g" ./src/core/t
# Define categories
category_explore='{id:"explore",label:"Explore",order:100,euiIconType:"search"}'
category_indexer_management='{id:"management",label:"Indexer management",order:5e3,euiIconType:"managementApp"}'
category_dashboard_management='{id:"wz-category-dashboard-management",label:"Dashboard management",order:700,euiIconType:"dashboardApp"}'
category_dashboard_management='{id:"wz-category-dashboard-management",label:"Dashboard management",order:6e3,euiIconType:"dashboardApp"}'

# Add custom categories (explore) to the built-in
sed -i -e "s|DEFAULT_APP_CATEGORIES=Object.freeze({|DEFAULT_APP_CATEGORIES=Object.freeze({explore:${category_explore},|" ./src/core/target/public/core.entry.js
Expand Down Expand Up @@ -239,7 +239,7 @@ app_order_dev_tools=9050
sed -i -e "s|order:9070|order:${app_order_dev_tools}|g" ./src/plugins/dev_tools/target/public/devTools.plugin.js

# Replace app order to Dashboard management app
app_order_dashboard_management=701
app_order_dashboard_management=10001
sed -i -e "s|order:9030|order:${app_order_dashboard_management}|g" ./src/plugins/management/target/public/management.plugin.js

# Replace app order to Security app
Expand Down
2 changes: 1 addition & 1 deletion unattended_installer/install_functions/dashboard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function dashboard_changePort() {

chosen_port="$1"
http_port="${chosen_port}"
wazuh_dashboard_ports=( "${http_port}" )
wazuh_dashboard_port=( "${http_port}" )
wazuh_aio_ports=(9200 9300 1514 1515 1516 55000 "${http_port}")

sed -i 's/server\.port: [0-9]\+$/server.port: '"${chosen_port}"'/' "$0"
Expand Down
Loading