Merge branch 'main' into 264-migration-to-wazuh-indexer-plugins

.github/workflows/build-push-docker-image.yml

@@ -23,12 +23,12 @@ on:
       wazuh_plugins_ref:
         description: "Branch, commit or tag for the wazuh-indexer-plugins repository."
         type: string
-        default: "master"
+        default: "main"
         required: false
       reporting_plugin_ref:
         description: "Branch, commit or tag for the wazuh-indexer-reporting repository."
         type: string
-        default: "master"
+        default: "main"
         required: false
   workflow_call:
     inputs:
@@ -48,12 +48,12 @@ on:
       wazuh_plugins_ref:
         description: "Branch, commit or tag for the wazuh-indexer-plugins repository."
         type: string
-        default: "master"
+        default: "main"
         required: false
       reporting_plugin_ref:
         description: "Branch, commit or tag for the wazuh-indexer-reporting repository."
         type: string
-        default: "master"
+        default: "main"
         required: false
     secrets:
       QUAY_USERNAME:

.github/workflows/build.yml

@@ -55,11 +55,11 @@ on:
       wazuh_plugins_ref:
         description: "Branch, commit or tag for the wazuh-indexer-plugins repository."
         type: string
-        default: "master"
+        default: "main"
       reporting_plugin_ref:
         description: "Branch, commit or tag for the wazuh-indexer-reporting repository."
         type: string
-        default: "master"
+        default: "main"
   workflow_call:
     inputs:
       revision:
@@ -86,10 +86,10 @@ on:
         required: false
       wazuh_plugins_ref:
         type: string
-        default: "master"
+        default: "main"
       reporting_plugin_ref:
         type: string
-        default: "master"
+        default: "main"
     secrets:
       CI_INTERNAL_DEVELOPMENT_BUCKET_USER_ACCESS_KEY:
         required: true

CHANGELOG.md

@@ -19,4 +19,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Security
 
-[Unreleased 5.0.x]: https://github.com/wazuh/wazuh-indexer/compare/4.10.2...master
+[Unreleased 5.0.x]: https://github.com/wazuh/wazuh-indexer/compare/99a9a81da366173b0c2b963b26ea92e15ef34547...main

build-scripts/README.md

@@ -25,8 +25,8 @@ Use the script under `wazuh-indexer/docker/builder/builder.sh` to build a packag
 Usage: ./builder.sh [args]
 
 Arguments:
--p INDEXER_PLUGINS_BRANCH     [Optional] wazuh-indexer-plugins repo branch, default is 'master'.
--r INDEXER_REPORTING_BRANCH   [Optional] wazuh-indexer-reporting repo branch, default is 'master'.
+-p INDEXER_PLUGINS_BRANCH     [Optional] wazuh-indexer-plugins repo branch, default is 'main'.
+-r INDEXER_REPORTING_BRANCH   [Optional] wazuh-indexer-reporting repo branch, default is 'main'.
 -R REVISION                   [Optional] Package revision, default is '0'.
 -s STAGE                      [Optional] Staging build, default is 'false'.
 -d DISTRIBUTION               [Optional] Distribution, default is 'rpm'.

docker/builder/builder.sh

@@ -66,8 +66,8 @@ function parse_args() {
     done
 
     ## Set defaults:
-    [ -z "$INDEXER_PLUGINS_BRANCH" ] && INDEXER_PLUGINS_BRANCH="master"
-    [ -z "$INDEXER_REPORTING_BRANCH" ] && INDEXER_REPORTING_BRANCH="master"
+    [ -z "$INDEXER_PLUGINS_BRANCH" ] && INDEXER_PLUGINS_BRANCH="main"
+    [ -z "$INDEXER_REPORTING_BRANCH" ] && INDEXER_REPORTING_BRANCH="main"
     [ -z "$REVISION" ] && REVISION="0"
     [ -z "$IS_STAGE" ] && IS_STAGE="false"
     [ -z "$DISTRIBUTION" ] && DISTRIBUTION="rpm"
@@ -82,8 +82,8 @@ function usage() {
     echo "Usage: $0 [args]"
     echo ""
     echo "Arguments:"
-    echo -e "-p INDEXER_PLUGINS_BRANCH\t[Optional] wazuh-indexer-plugins repo branch, default is 'master'."
-    echo -e "-r INDEXER_REPORTING_BRANCH\t[Optional] wazuh-indexer-reporting repo branch, default is 'master'."
+    echo -e "-p INDEXER_PLUGINS_BRANCH\t[Optional] wazuh-indexer-plugins repo branch, default is 'main'."
+    echo -e "-r INDEXER_REPORTING_BRANCH\t[Optional] wazuh-indexer-reporting repo branch, default is 'main'."
     echo -e "-R REVISION\t[Optional] Package revision, default is '0'."
     echo -e "-s STAGE\t[Optional] Staging build, default is 'false'."
     echo -e "-d DISTRIBUTION\t[Optional] Distribution, default is 'rpm'."

docker/builder/compose.yml

@@ -6,8 +6,8 @@ services:
       context: ./../..
       dockerfile: ${REPO_PATH}/docker/builder/Dockerfile
     environment:
-      - INDEXER_PLUGINS_BRANCH=${INDEXER_PLUGINS_BRANCH:-master}
-      - INDEXER_REPORTING_BRANCH=${INDEXER_REPORTING_BRANCH:-master}
+      - INDEXER_PLUGINS_BRANCH=${INDEXER_PLUGINS_BRANCH:-main}
+      - INDEXER_REPORTING_BRANCH=${INDEXER_REPORTING_BRANCH:-main}
       - REVISION=${REVISION:-0}
       - IS_STAGE=${IS_STAGE:-false}
       - DISTRIBUTION=${DISTRIBUTION:-rpm}

docker/builder/entrypoint.sh

@@ -4,8 +4,8 @@
 set -e
 
 # Set default values for environment variables
-INDEXER_PLUGINS_BRANCH=${INDEXER_PLUGINS_BRANCH:-master}
-INDEXER_REPORTING_BRANCH=${INDEXER_REPORTING_BRANCH:-master}
+INDEXER_PLUGINS_BRANCH=${INDEXER_PLUGINS_BRANCH:-main}
+INDEXER_REPORTING_BRANCH=${INDEXER_REPORTING_BRANCH:-main}
 REVISION=${REVISION:-0}
 IS_STAGE=${IS_STAGE:-false}
 DISTRIBUTION=${DISTRIBUTION:-rpm}