Merge 4.9 into master #196

AlexRuiz7 · 2024-04-01T10:55:22Z

Description

DO NOT MERGE.

This branch cannot be merged into master due to unrelated Git histories (master and 4.9.0 are based on different versions of OpenSearch). Merging is not possible. The merge-4.9-into-master branch has to replace the master branch, and the current master branch has to be removed.

Issues Resolved

#195

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
Commits are signed per the DCO using --signoff
Commit changes are listed out in CHANGELOG.md file (See: Changelog)
Public documentation issue/PR created

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

…nsearch-project#11406) (cherry picked from commit 4f7b2a4) Signed-off-by: RS146BIJAY <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…s than cluster minimum (opensearch-project#11340) (opensearch-project#11391) --------- (cherry picked from commit 6bc0cd6) Signed-off-by: bansvaru <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…ttachment (opensearch-project#11001) (opensearch-project#11412) * Bump commons-io:commons-io in /plugins/ingest-attachment Bumps commons-io:commons-io from 2.14.0 to 2.15.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Updating SHAs Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> * Update CHANGELOG.md Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Andriy Redko <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <[email protected]> (cherry picked from commit 569a723) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…search-project#10543) (opensearch-project#11389) * adding delegation from CachingWeightWrapper#count to internal weight object and its unit test * fixing checkstyle violations * fixing existing tests * adding test for delegating count to internal weight object * Fixing failing unit tests * Adding the change log --------- (cherry picked from commit 72e63f2) Signed-off-by: Niyati Aggarwal <[email protected]> Signed-off-by: Ankit Jain <[email protected]> Co-authored-by: Niyati Aggarwal <[email protected]>

…earch-project#11351) (cherry picked from commit 26a1439) Signed-off-by: Ketan Verma <[email protected]> Signed-off-by: Ketan Verma <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…oject#11167) (opensearch-project#11416) * Fix RemoteShardsBalancer * remove unused variables * run spotless * add change log --------- (cherry picked from commit edf7861) Signed-off-by: panguixin <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…1420) * Update Gradle to 8.5 * Revert "remove unnecessary empty `build.gradle` files (opensearch-project#4723)" This reverts commit a6b984b. --------- (cherry picked from commit a123c43) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…n (without any … (opensearch-project#11390) * Improving the performance of date histogram aggregation (without any sub-aggregation) (opensearch-project#11083) * Adding filter based optimization logic to date histogram aggregation Signed-off-by: Ankit Jain <[email protected]> * Reading the field name for aggregation correctly Signed-off-by: Ankit Jain <[email protected]> * Adding the limit on number of buckets for filter aggregation Signed-off-by: Ankit Jain <[email protected]> * Applying the optimizations for match all query as well Signed-off-by: Ankit Jain <[email protected]> * Handling the unwrapped match all query Signed-off-by: Ankit Jain <[email protected]> * Adding logic for recursively unwrapping the query Signed-off-by: Ankit Jain <[email protected]> * Restructuring the code for making it more reusable and unit testable Signed-off-by: Ankit Jain <[email protected]> * Adding javadocs for fixing build failure Signed-off-by: Ankit Jain <[email protected]> * Fixing minor bugs in refactoring Signed-off-by: Ankit Jain <[email protected]> * Adding logic for optimizing auto date histogram Signed-off-by: Ankit Jain <[email protected]> * Fixing bugs and passing unit tests for date histogram Signed-off-by: Ankit Jain <[email protected]> * Temporarily reverting auto date histogram changes Signed-off-by: Ankit Jain <[email protected]> * Fixing spotless check bugs Signed-off-by: Ankit Jain <[email protected]> * Adding back auto date histogram and passing all unit tests Signed-off-by: Ankit Jain <[email protected]> * Fixing the integration tests for reduced collector work Signed-off-by: Ankit Jain <[email protected]> * Fixing the integration test regression Signed-off-by: Ankit Jain <[email protected]> * Addressing code review comments Signed-off-by: Ankit Jain <[email protected]> * Fixing hardbound, missing and script test cases Signed-off-by: Ankit Jain <[email protected]> * Removing collect_count validation to prevent backward compatibility tests from failing Signed-off-by: Ankit Jain <[email protected]> * Finally fixing hardbounds test case Signed-off-by: Ankit Jain <[email protected]> * Refactoring code for reusability Signed-off-by: Ankit Jain <[email protected]> --------- Signed-off-by: Ankit Jain <[email protected]> (cherry picked from commit 0ddbd96) * Revert Rounding API visibility changes Signed-off-by: Ankit Jain <[email protected]> * Reverting missed rounding API visibility change Co-authored-by: Andriy Redko <[email protected]> Signed-off-by: Ankit Jain <[email protected]> --------- Signed-off-by: Ankit Jain <[email protected]> Co-authored-by: Andriy Redko <[email protected]>

…roject#11397) (opensearch-project#11418) (cherry picked from commit 39449b2) Signed-off-by: Ticheng Lin <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…ch-project#11238) (opensearch-project#11427) * Fix bug where replication lag grows post primary relocation * Fix broken UT * add unit test for cluster state update * PR feedback * add changelog entry --------- (cherry picked from commit 6fa3a0d) Signed-off-by: Marc Handalian <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…0912) (opensearch-project#11436) (cherry picked from commit 74b2d7d) Signed-off-by: vikasvb90 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…nsearch-project#11440) (cherry picked from commit 77a4daf) Signed-off-by: vikasvb90 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…earch-project#11453) * Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](actions/setup-java@v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 0f835e0) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…est-attachment (opensearch-project#11448) (opensearch-project#11459) * Bump org.apache.xmlbeans:xmlbeans in /plugins/ingest-attachment Bumps org.apache.xmlbeans:xmlbeans from 5.1.1 to 5.2.0. --- updated-dependencies: - dependency-name: org.apache.xmlbeans:xmlbeans dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Updating SHAs Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 50babcf) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add bwc version 2.11.2 Signed-off-by: GitHub <[email protected]> * Fix version identifier Signed-off-by: Kunal Kotwani <[email protected]> --------- Signed-off-by: GitHub <[email protected]> Signed-off-by: Kunal Kotwani <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> Co-authored-by: Kunal Kotwani <[email protected]>

…h-project#11035) (opensearch-project#11045) (cherry picked from commit a512dae) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…t#11362) (opensearch-project#11470) * Interpret byte array as primitive using VarHandles * Fixed offset bug --------- Signed-off-by: Ketan Verma <[email protected]>

…ject#11445) (opensearch-project#11469) * Bump org.apache.maven:maven-model from 3.9.4 to 3.9.6 Bumps [org.apache.maven:maven-model](https://github.com/apache/maven) from 3.9.4 to 3.9.6. - [Release notes](https://github.com/apache/maven/releases) - [Commits](apache/maven@maven-3.9.4...maven-3.9.6) --- updated-dependencies: - dependency-name: org.apache.maven:maven-model dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 35c3532) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…opensearch-project#9405) (opensearch-project#11473) To handle cases where multiple search pipeline processors need to share information, we will allocate a context holder for the lifetime of the request and pass it to each processor to get/set values. To explain this behavior and benefit from it, this change also introduces three new processors: 1. The "oversample" request processor that increases "size", storing the original size in the context. 2. The "truncate" response processor that discards results after some number, by default using the original size before oversampling. 3. The "collapse" response processor offers similar behavior to a collapse query, discarding results that have a field value in common with a higher-scoring result. (cherry picked from commit c204585) Signed-off-by: Michael Froh <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…11446) (opensearch-project#11475) * Bump commons-io:commons-io from 2.13.0 to 2.15.1 Bumps commons-io:commons-io from 2.13.0 to 2.15.1. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 3f5432e) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…dfs-fixture (opensearch-project#11450) (opensearch-project#11478) * Bump commons-net:commons-net in /test/fixtures/hdfs-fixture Bumps commons-net:commons-net from 3.9.0 to 3.10.0. --- updated-dependencies: - dependency-name: commons-net:commons-net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit aeac27b) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ures/hdfs-fixture (opensearch-project#10506) (opensearch-project#11477) * Bump org.apache.zookeeper:zookeeper in /test/fixtures/hdfs-fixture Bumps org.apache.zookeeper:zookeeper from 3.9.0 to 3.9.1. --- updated-dependencies: - dependency-name: org.apache.zookeeper:zookeeper dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update changelog Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com> (cherry picked from commit 332fae1) Signed-off-by: Marc Handalian <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…roject#11449) (opensearch-project#11498) (cherry picked from commit effc9bc) Signed-off-by: panguixin <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

opensearch-project#11334) (opensearch-project#11509) (cherry picked from commit 2a4aafd) Signed-off-by: vikasvb90 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…pensearch-project#11492) (opensearch-project#11496) (cherry picked from commit a3c7952) Signed-off-by: Ankit Kala <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…opensearch-project#11153) (opensearch-project#11466) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>

…earch-project#11432) (opensearch-project#11511) (cherry picked from commit 4ad2d4c) Signed-off-by: Gaurav Bafna <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…oject#11516) (opensearch-project#11518) (cherry picked from commit 215fb22) Signed-off-by: Andriy Redko <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…t#11417) (opensearch-project#11503) (cherry picked from commit 3b31359) Signed-off-by: Kunal Kotwani <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

opensearch-project#11532) (opensearch-project#11533) * Avoid repeated delete calls for the stale segment files * Address PR comments --------- (cherry picked from commit 10d34be) Signed-off-by: Sachin Kale <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Sachin Kale <[email protected]>

* Switch /var/run references to /run * Remove unneeded files from assembled packages (#115) * add remove files function to assemble.sh * Remove unneeded files on assembled tar packages * Remove duplicated function Fix wrong variable assignment --------- Co-authored-by: Álex Ruiz <[email protected]> * Add missing tools and files back into Wazuh Indexer packages (#117) * add remove files function to assemble.sh * Remove unneeded files on assembled tar packages * Remove duplicated function Fix wrong variable assignment * Adding function to package Wazuh`s tools to assemble.sh * Make the files' versions follow the repo's VERSION file * Fix download of Wazuh tools for packages assembly --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> * Remove unneeded symbolic links from assembled packages (#121) * Remove reference to install_demo_configuration.sh --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]>

Runs the workflow on pull request changes

* Add function to look for VERSION in the correct path * Update assemble.sh Adds wget as dependency * Download files using curl instead of wget * Update assemble.sh Revert assembly with minimal plugins for testing Signed-off-by: Álex Ruiz <[email protected]> * Add Dockerfile and docker-compose for the package assembly stage * Assemble packages with minimal plugin set when "test" variable is set to "true" * Update README with assemble.sh docker image * Fixing env variable naming convention and removing wget dependency * Improve Docker environments Adds environments to build packages * Fix small typos * More fixes * Add documentation * Adding -p flag to mkdir so it doesnt fail when the folder is already present * Format files --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]>

…#130) Co-authored-by: Álex Ruiz <[email protected]>

* Download wazuh-template.json from wazuh/wazuh repo * Add wazuh-template.json to RPM package spec * Setting wazuh-template.json attributes to 660 * Change wazuh-template.json attributes in debmake_install.sh * Put template download command within a function * Small fixes and format * Apply correct file permissions to the wazuh-template.json --------- Co-authored-by: Álex Ruiz <[email protected]>

* Adding debian packaging config files from Opensearch * Copy debian/ folder to the build dir for debmake to parse * Remove redundant steps from debian/postinst --------- Co-authored-by: Álex Ruiz <[email protected]>

* Run workflow on push * Set build workflow inputs to required * Normalize the use of quotes for the build workflow inputs * Add ternary operator * Add missing ternary operator

* Fine tuning permissions on RPM spec file * Get plugins using maven * Rolling back changes to spec file * Format files --------- Co-authored-by: Álex Ruiz <[email protected]>

* Add new custom field to the vulnerability detector index * Update event generator tool * Remove base.labels ECS field from wazuh-states-vulnerabilities index mappings

* Fine tuning permissions on RPM spec file * Build a list of files to be packaged excluding items that need special permissions * Fix bad permissions on directories * Remove system directories from packaging definition * Changing permissions on deb packages * Skip unneeded dh_fixperms stage in debian/rules * Clean & format --------- Co-authored-by: Álex Ruiz <[email protected]>

* Init. Amazon Security Lake integration Signed-off-by: Álex Ruiz <[email protected]>

* Add events generator tool for wazuh-alerts * Fix typo in README.md Signed-off-by: Álex Ruiz <[email protected]> * Make timestamps timezone aware --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Fede Tux <[email protected]>

Signed-off-by: Álex Ruiz <[email protected]>

* Adding Python script that receives a continuous json stream over stdin and outputs parquet to Security Lake * Adding logstash pipeline for python script * encode_parquet() function fixed to handle lists of dictionaries * Correct error in encode_parquet() * Avoid storing the block ending in the output buffer * Add comments on handling files and streams with pyarrow for future reference * Add s3 handling reference links * Write parquet directly to bucket * Added basics of map_to_ocsf() function * Minor fixes * Map alerts to OCSF as they are read * Add script to convert Wazuh events to OCSF Also adds a simple test script * Add OCSF converter + Parquet encoder + test scripts * Update .gitignore * Include the contents of the alert under unmapped * Add support for different OCSF schema versions * Use custom ocsf module to map alerts * Modify script to use converter class * Code polish and fix errors * Remove unnecessary type declaration from debug flag * Improved parquet encoding * Initial commit for test env's docker-compose.yml * Remove sudo references from docker-compose.yml * Add operational Python module to transform events to OCSF * Create minimal Docker environment to test and develop the integration. * Fix events-generator's Inventory starvation * Remove files present in #147 * Cleanup * Add FQDN hostnames to services for certificates creation * Add S3 Ninja (Mock) (#165) * Setup certificates in Wazuh Indexer and Logstash containers (#166) * Add certificate generator service * Add certificate config to docker compose file * Use secrets for certificates * Disable permission handling inside cert's generator entrypoint.sh * Back to using a bind mount for certs * Have entrypoint.sh generate certs with 1000:1000 ownership * Correct certificate permissions and bind mounting * Add security initialization variable to compose file * Fix permissions on certs generator entrypoint * Add cert generator config file * Remove old cert generator dir * Set indexer hostname right in pipeline file * Roll back commented code --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Álex Ruiz <[email protected]> * Fix Logstash pipelines * Remove unused file * Implement OCSF severity normalize function --------- Signed-off-by: Álex Ruiz <[email protected]> Co-authored-by: Fede Tux <[email protected]> Co-authored-by: Federico Gustavo Galland <[email protected]>

* Attemtp to automate package's testing * Fix typo * Update setup gradle action * Remove file from another PR * Update build.yml Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Álex Ruiz <[email protected]>

* Update vulnerability-states fields Adds wazuh.schema.version * Update events generator

* Attemtp to automate package's testing * Fix typo * Add sudo * Split test steps and manage errors * Add --no-pager to journalctl * Add certs generator * Improve error handling * Update r_test.yml Fix indentation Signed-off-by: Álex Ruiz <[email protected]> * Fix error handling * Add testing of RPM packages * Improve multi-os testing * Add TEST env var * Add braces to if conditionals * Remove all curly braches from if conditionals * braces again * Install RPM package in Docker * Remove sudo for RPM installation * Bind artifacts/dist to RPM docker test container * Bind artifacts/dist to RPM docker test container * Avoid prompt during yum install * Fix bind volume --------- Signed-off-by: Álex Ruiz <[email protected]>

* Attemtp to automate package's testing * Add workflow file to upload packages to S3 * Skip testing to test whether the upload works * Fix package names * Fix upload workflow name * Pass secrets to the reusable workflow * Fix indentation * Fix indentation * Remove test workflow from this PR * Add boolean input to control when the package is uploaded to the S3 bucket * [UI/UX] Improve inputs description --------- Signed-off-by: Álex Ruiz <[email protected]>

* Update wazuh-states-vulnerabilities index mapping * Extend ECS Vulnerability fields

* Add script to get the version of OpenSearch * Set revision to 0 by default. - Reduce inputs for scripts. - Add script to generate packages' naming convention. - Make scripts self-aware of the OpenSearch version. * Fix assemble * Smoke test new pipeline to build packages * Fix syntax errors * Update build.yml Signed-off-by: Álex Ruiz <[email protected]> * Add workflow to build packages on push * Run actionlint * Fix jq argjson * Fix set matrix output ? * Try new approach using a single workflow * Fix GITHUB_OUTPUT * Fix baptizer invocation * Add testing and upload to new approach * Fix hard coded revision number on RPM assembly * New attempt * Skip upload unless specified * Install plugins on RPM * Promote new approach Removes previous workflows to generate packages * Fix workflow name * Attempt to fix release package naming * Fix build.sh invocation from workflow * Use min package name in workflow * Use min package name for release naming convention in workflow * Attemtp to fix regex * Upgrade to aws-actions/configure-aws-credentials@v4 Clean up * Apply latest requirements Add workflow with single matrix for QA use. Rename inputs. Add checksum input. * Add checksum generation and upload * Use choice as input types for system and architecture * Invoke build single packages with upload option * Add documentation and clean up * Rename scripts folder to packaging_scripts --------- Signed-off-by: Álex Ruiz <[email protected]>

* Create branch 5.0.0 * Fix CHANGELOG.md

opensearch-trigger-bot bot and others added 30 commits November 30, 2023 14:54

Interpret byte array as primitive using VarHandles (opensearch-projec…

82bf0be

…t#11362) (opensearch-project#11470) * Interpret byte array as primitive using VarHandles * Fixed offset bug --------- Signed-off-by: Ketan Verma <[email protected]>

Fix for stuck update action in a bulk with retry_on_conflict property (…

978dcd5

…opensearch-project#11153) (opensearch-project#11466) * Bugfix for update staying stuck when sent as part of bulk with retry_on_conflict specified Signed-off-by: Raghuvansh Raj <[email protected]>

AlexRuiz7 and others added 26 commits March 8, 2024 16:31

Update issue templates (#127)

cb5c549

Removing post-install message from wazuh-indexer.rpm.spec (#131)

87d2774

Add tests to the packages building process (#132)

f9a191d

Runs the workflow on pull request changes

Removing /usr/share/lintian/overrides/wazuh-indexer from deb packages (…

877b4d2

…#130) Co-authored-by: Álex Ruiz <[email protected]>

Adding Debian packaging config files from Opensearch (#118)

05cc693

* Adding debian packaging config files from Opensearch * Copy debian/ folder to the build dir for debmake to parse * Remove redundant steps from debian/postinst --------- Co-authored-by: Álex Ruiz <[email protected]>

Fix Build workflow to run on push events (#134)

cfa62e3

* Run workflow on push * Set build workflow inputs to required * Normalize the use of quotes for the build workflow inputs * Add ternary operator * Add missing ternary operator

Use maven for plugin download (#139)

7fd80ab

* Fine tuning permissions on RPM spec file * Get plugins using maven * Rolling back changes to spec file * Format files --------- Co-authored-by: Álex Ruiz <[email protected]>

Add new custom field to the vulnerability detector index (#141)

6d7add8

* Add new custom field to the vulnerability detector index * Update event generator tool * Remove base.labels ECS field from wazuh-states-vulnerabilities index mappings

Init. Amazon Security Lake integration (#143)

8157a3d

* Init. Amazon Security Lake integration Signed-off-by: Álex Ruiz <[email protected]>

Add wazuh.manager.name to VD mappings (#158)

11220fa

Create compatibility_request.md (#163)

7546f3d

Signed-off-by: Álex Ruiz <[email protected]>

Update Gradle setup action (#182)

84578ed

* Attemtp to automate package's testing * Fix typo * Update setup gradle action * Remove file from another PR * Update build.yml Signed-off-by: Álex Ruiz <[email protected]> --------- Signed-off-by: Álex Ruiz <[email protected]>

Update vulnerability-states fields (#177)

60990a6

* Update vulnerability-states fields Adds wazuh.schema.version * Update events generator

Remove ecs.version from query.default_fields (#184)

dc49598

Add bash to Docker dev image (#185)

0958ec3

Update wazuh-states-vulnerabilities index mapping (#191)

1229b53

* Update wazuh-states-vulnerabilities index mapping * Extend ECS Vulnerability fields

Create branch 5.0.0 (#154)

d530519

* Create branch 5.0.0 * Fix CHANGELOG.md

AlexRuiz7 linked an issue Apr 1, 2024 that may be closed by this pull request

Scheduled upward merges for numbered branches in wazuh-indexer repository - Fortnight #7 #195

Closed

2 tasks

gdiazlo deleted the branch master April 3, 2024 14:19

gdiazlo closed this Apr 3, 2024

gdiazlo deleted the merge-4.9-into-master branch April 3, 2024 14:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 4.9 into master #196

Merge 4.9 into master #196

AlexRuiz7 commented Apr 1, 2024

Merge 4.9 into master #196

Merge 4.9 into master #196

Conversation

AlexRuiz7 commented Apr 1, 2024

Description

Issues Resolved

Check List