Merge 4.9.1 into 4.10.0 (#426)

* Fix Performance Analyzer service file (#391)

* Update SECURITY.md (#411)

* Remove prompt about configuration file overwrites on package upgrade (#410)

* Make new config files install with .new prefix

* Fix errors and add .new prefix to /etc/init.d/wazuh-indexer

* Fix errors in build.sh and assemble.sh

* Revert "Fix errors in build.sh and assemble.sh"

This reverts commit 5dc3500.

* Using noreplace on config files for rpm

* Fix issues in debmake.sh

* Revert changes to Debian packages

---------

Co-authored-by: Álex Ruiz <[email protected]>

* Update SECURITY.md (#415)

Signed-off-by: Raul Del Pozo Moreno <[email protected]>

* Add Release Notes 4.9.1-rc1 (#421)

---------

Signed-off-by: Raul Del Pozo Moreno <[email protected]>
Co-authored-by: Fede Galland <[email protected]>
Co-authored-by: Raul Del Pozo Moreno <[email protected]>

SECURITY.md

@@ -6,24 +6,20 @@ Version: 2023-06-12
 This document outlines the Security Policy for Wazuh's open source projects. It emphasizes our commitment to maintain a secure environment for our users and contributors, and reflects our belief in the power of collaboration to identify and resolve security vulnerabilities.
 
 ## Scope
-This policy applies to all open source projects developed, maintained, or hosted by Wazuh. In this case, as this project is a fork, we may forward the reported vulnerability to the upstream.
+This policy applies to all open source projects developed, maintained, or hosted by Wazuh.
 
 ## Reporting Security Vulnerabilities
 If you believe you've discovered a potential security vulnerability in one of our open source projects, we strongly encourage you to report it to us responsibly.
 
-Please submit your findings as security advisories under the "Security" tab in the relevant GitHub repository. Alternatively, you may send the details of your findings to [email protected].
+Please submit your findings as security advisories under the "Security" tab in the relevant GitHub repository. Alternatively, you may send the details of your findings to [[email protected]](mailto:[email protected]).
 
 ## Vulnerability Disclosure Policy
 Upon receiving a report of a potential vulnerability, our team will initiate an investigation. If the reported issue is confirmed as a vulnerability, we will take the following steps:
 
 1. Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation.
-
 2. Validation: We will validate the issue and work on reproducing it in our environment.
-
 3. Remediation: We will work on a fix and thoroughly test it
-
 4. Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party.
-
 5. Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments.
 
 This 90-day period allows for end-users to update their systems and minimizes the risk of widespread exploitation of the vulnerability.
@@ -37,7 +33,7 @@ We believe in giving credit where credit is due. If you report a security vulner
 We do appreciate and encourage feedback from our community, but currently we do not have a bounty program. We might start bounty programs in the future.
 
 ## Compliance with this Policy
-We consider the discovery and reporting of security vulnerabilities an important public service. We encourage responsible reporting of any vulnerabilities that may be found in our site or applications. 
+We consider the discovery and reporting of security vulnerabilities an important public service. We encourage responsible reporting of any vulnerabilities that may be found in our site or applications.
 
 Furthermore, we will not take legal action against or suspend or terminate access to the site or services of those who discover and report security vulnerabilities in accordance with this policy because of the fact.
 
@@ -46,4 +42,4 @@ We ask that all users and contributors respect this policy and the security of o
 ## Changes to this Security Policy
 This policy may be revised from time to time. Each version of the policy will be identified at the top of the page by its effective date.
 
-If you have any questions about this Security Policy, please contact us at [email protected]
+If you have any questions about this Security Policy, please contact us at [[email protected]](mailto:[email protected])

distribution/packages/src/common/wazuh-indexer-performance-analyzer.service

@@ -6,15 +6,16 @@
 # compatible open source license.
 
 [Unit]
-Description=wazuh-indexer Performance Analyzer
+Description=OpenSearch Performance Analyzer
 
 [Service]
 Type=simple
-ExecStart=/usr/share/wazuh-indexer/bin/wazuh-indexer-performance-analyzer/performance-analyzer-agent-cli
+ExecStart=/usr/share/wazuh-indexer/bin/opensearch-performance-analyzer/performance-analyzer-agent-cli
 Restart=on-failure
 User=wazuh-indexer
 Group=wazuh-indexer
-EnvironmentFile=-/etc/sysconfig/wazuh-indexer
+Environment=OPENSEARCH_HOME=/usr/share/wazuh-indexer
+Environment=OPENSEARCH_PATH_CONF=/etc/wazuh-indexer/
 WorkingDirectory=/usr/share/wazuh-indexer
 
 [Install]

distribution/packages/src/deb/debmake_install.sh

@@ -90,5 +90,4 @@ for i in "${binary_files[@]}"; do
 	chmod -c 750 "$i"
 done
 
-
 exit 0

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

@@ -244,6 +244,7 @@ exit 0
 %config(noreplace) %attr(660, %{name}, %{name}) %{config_dir}/log4j2.properties
 %config(noreplace) %attr(660, %{name}, %{name}) %{config_dir}/jvm.options
 %config(noreplace) %attr(660, %{name}, %{name}) %{config_dir}/opensearch.yml
+%config(noreplace) %attr(640, %{name}, %{name}) %{config_dir}/opensearch-security/*
 
 
 %if %observability_plugin
@@ -265,11 +266,9 @@ exit 0
 %attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*
 
 %changelog
-* Tue Aug 20 2024 support <[email protected]> - 4.10.0
+* Mon Sep 23 2024 support <[email protected]> - 4.10.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
-* Fri Sep 06 2024 support <[email protected]> - 4.9.2
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
-* Thu Aug 15 2024 support <[email protected]> - 4.9.1
+* Fri Sep 20 2024 support <[email protected]> - 4.9.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
 * Thu Aug 15 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html

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

@@ -0,0 +1,19 @@
+## 2024-09-20 Version 4.9.1-rc1 Release Notes
+
+## [4.9.1-rc1]
+### Added
+-
+
+### Dependencies
+- 
+
+### Changed
+* Update SECURITY.md in https://github.com/wazuh/wazuh-indexer/pull/415
+* Change the date in the RPM spec file to avoid packaging errors in https://github.com/wazuh/wazuh-indexer/pull/338
+* Upgrade third-party integrations to the latest product versions in https://github.com/wazuh/wazuh-indexer/pull/368
+* Remove unused fields from the vulnerabilities index template in https://github.com/wazuh/wazuh-indexer/pull/369
+* Update RPM spec file to avoid overwriting modified config files in https://github.com/wazuh/wazuh-indexer/pull/410
+
+### Fixed
+* Fix Splunk integration dashboards in https://github.com/wazuh/wazuh-indexer/pull/362
+* Fix Performance Analyzer service file in https://github.com/wazuh/wazuh-indexer/pull/391