Skip to content

Commit b6a8626

Browse files
AlexRuiz7mcasas993JuanGarriuzf-gallandQU3B1M
committed
Merge 4.10.1 into 4.10.2 (#513)
* Merge 4.10.0 into 4.10.1 (#470) * Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve comtability matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <[email protected]> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Álex Ruiz <[email protected]> * Fix Github Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove non-existant packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Malena Casas <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> Co-authored-by: Fede Galland <[email protected]> Co-authored-by: Kevin Ledesma <[email protected]> * Fix release date for 4.10.0 in RPM spec file Signed-off-by: Álex Ruiz <[email protected]> * Merge 4.10.0 into 4.10.1 (#511) * Upgrade integrations to the last version (#447) * Upgrade third-party integrations to latest product versions (#368) * Upgrade third-party integrations to latest product versions * Improve comtability matrix * Change versions in /integrations/.env Signed-off-by: Malena Casas <[email protected]> * Fix Splunk integrations (#362) * Add table with the version of the integrations * Update CHANGELOG.md Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> * Merge 4.9.1 into 4.10.0 (#454) * Prepare 4.9.1-rc2 (#436) * Update docker/README.md (#438) * Support new stage 4.9.1-rc3 (#443) * Update operational--integrations_maintenance_request.md (#449) Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Álex Ruiz <[email protected]> * Fix Github Actions build process dependency errors (#457) * Switch from latest to 22.04 runner * Remove non-existant packages from workflow provisioner * Remove freeglut3 from provision.sh * Update calendarTime and scan_date fields type (#458) * Merge 4.9.1 into 4.10.0 (#469) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Fix release date for 4.10.0 in RPM spec file (#471) * Preserve status of wazuh-indexer on upgrade (#498) * Update pre and post inst scripts for deb and rpm to store and restore service status * Update prerm script to avoid stopping the service on upgrade * Remove extra spaces and update rpm restart command * Merge 4.9.2 into 4.10.0 (#510) * Support for v4.9.1-alpha4 (#461) * Prepare final release notes for 4.9.1 * Support new version 4.9.2 (#494) * Support new version 4.9.2 * Add estimated release date for 4.9.2 * Fix estimates release date for 4.9.2 * Fix 4.9.1 release notes title --------- Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Malena Casas <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> Co-authored-by: Fede Galland <[email protected]> Co-authored-by: Kevin Ledesma <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Malena Casas <[email protected]> Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Malena Casas <[email protected]> Co-authored-by: JuanGarriuz <[email protected]> Co-authored-by: Fede Galland <[email protected]> Co-authored-by: Kevin Ledesma <[email protected]>
1 parent 656ca8f commit b6a8626

File tree

5 files changed

+50
-16
lines changed

5 files changed

+50
-16
lines changed

‎distribution/packages/src/deb/debian/postinst

+10-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data_dir=/var/lib/wazuh-indexer
1919
log_dir=/var/log/wazuh-indexer
2020
pid_dir=/run/wazuh-indexer
2121
tmp_dir=/var/log/wazuh-indexer/tmp
22-
22+
restart_service=/tmp/wazuh-indexer.restart
2323

2424
# Create needed directories
2525
mkdir -p ${tmp_dir}
@@ -46,6 +46,15 @@ if command -v systemd-tmpfiles > /dev/null; then
4646
systemd-tmpfiles --create wazuh-indexer.conf
4747
fi
4848

49+
if [ -f $restart_service ]; then
50+
rm -f $restart_service
51+
echo "Restarting wazuh-indexer service..."
52+
if command -v systemctl > /dev/null; then
53+
systemctl restart wazuh-indexer.service > /dev/null 2>&1
54+
fi
55+
exit 0
56+
fi
57+
4958
# Messages
5059
echo "### NOT starting on installation, please execute the following statements to configure wazuh-indexer service to start automatically using systemd"
5160
echo " sudo systemctl daemon-reload"
@@ -54,5 +63,3 @@ echo "### You can start wazuh-indexer service by executing"
5463
echo " sudo systemctl start wazuh-indexer.service"
5564

5665
exit 0
57-
58-

‎distribution/packages/src/deb/debian/preinst

+4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@ set -e
1313

1414
echo "Running Wazuh Indexer Pre-Installation Script"
1515

16+
# Reference to restore actual service status
17+
restart_service=/tmp/wazuh-indexer.restart
18+
1619
# Stop existing service
1720
if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer.service >/dev/null; then
1821
echo "Stop existing wazuh-indexer.service"
1922
systemctl --no-reload stop wazuh-indexer.service
23+
touch $restart_service
2024
fi
2125
if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer-performance-analyzer.service >/dev/null; then
2226
echo "Stop existing wazuh-indexer-performance-analyzer.service"

‎distribution/packages/src/deb/debian/prerm

+22-11
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,27 @@
1111

1212
set -e
1313

14-
echo "Running Wazuh Indexer Pre-Removal Script"
15-
16-
# Stop existing service
17-
if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer.service >/dev/null; then
18-
echo "Stop existing wazuh-indexer.service"
19-
systemctl --no-reload stop wazuh-indexer.service
20-
fi
21-
if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer-performance-analyzer.service >/dev/null; then
22-
echo "Stop existing wazuh-indexer-performance-analyzer.service"
23-
systemctl --no-reload stop wazuh-indexer-performance-analyzer.service
24-
fi
14+
case "$1" in
15+
upgrade|deconfigure)
16+
;;
17+
remove)
18+
echo "Running Wazuh Indexer Pre-Removal Script"
19+
# Stop existing service
20+
if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer.service >/dev/null; then
21+
echo "Stop existing wazuh-indexer.service"
22+
systemctl --no-reload stop wazuh-indexer.service
23+
fi
24+
if command -v systemctl >/dev/null && systemctl is-active wazuh-indexer-performance-analyzer.service >/dev/null; then
25+
echo "Stop existing wazuh-indexer-performance-analyzer.service"
26+
systemctl --no-reload stop wazuh-indexer-performance-analyzer.service
27+
fi
28+
;;
29+
failed-upgrade)
30+
;;
31+
*)
32+
echo "prerm called with unknown argument \`$1'" >&2
33+
exit 0
34+
;;
35+
esac
2536

2637
exit 0

‎distribution/packages/src/rpm/wazuh-indexer.rpm.spec

+13-1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ set -e
162162
if command -v systemctl >/dev/null && systemctl is-active %{name}.service >/dev/null; then
163163
echo "Stop existing %{name}.service"
164164
systemctl --no-reload stop %{name}.service
165+
touch %{tmp_dir}/wazuh-indexer.restart
165166
fi
166167
if command -v systemctl >/dev/null && systemctl is-active %{name}-performance-analyzer.service >/dev/null; then
167168
echo "Stop existing %{name}-performance-analyzer.service"
@@ -204,6 +205,15 @@ if command -v systemd-tmpfiles > /dev/null; then
204205
systemd-tmpfiles --create %{name}.conf
205206
fi
206207

208+
if [ -f %{tmp_dir}/wazuh-indexer.restart ]; then
209+
rm -f %{tmp_dir}/wazuh-indexer.restart
210+
if command -v systemctl > /dev/null; then
211+
echo "Restarting wazuh-indexer service..."
212+
systemctl restart wazuh-indexer.service > /dev/null 2>&1
213+
exit 0
214+
fi
215+
fi
216+
207217
# Messages
208218
echo "### NOT starting on installation, please execute the following statements to configure wazuh-indexer service to start automatically using systemd"
209219
echo " sudo systemctl daemon-reload"
@@ -270,8 +280,10 @@ exit 0
270280
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-2.html
271281
* Tue Jan 28 2025 support <[email protected]> - 4.10.1
272282
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-1.html
273-
* Tue Nov 26 2024 support <[email protected]> - 4.10.0
283+
* Thu Nov 28 2024 support <[email protected]> - 4.10.0
274284
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
285+
* Mon Nov 04 2024 support <[email protected]> - 4.9.2
286+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-2.html
275287
* Tue Oct 15 2024 support <[email protected]> - 4.9.1
276288
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
277289
* Thu Aug 15 2024 support <[email protected]> - 4.9.0

‎release-notes/wazuh.release-notes-4.9.1.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 2024-09-27 Version 4.9.1-rc2 Release Notes
1+
## 2024-10-15 Version 4.9.1 Release Notes
22

33
## [4.9.1]
44
### Added

0 commit comments

Comments
 (0)