Update references from "master" to "main" (#682)

* Update references from "master" to "main" * More replacements
wazuh · Feb 20, 2025 · 6511e03 · 6511e03
1 parent f6242ec
commit 6511e03
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 36 deletions.
diff --git a/.github/workflows/build-push-docker-image.yml b/.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:

diff --git a/.github/workflows/build.yml b/.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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -77,7 +77,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.jruby.jcodings:jcodings` from 1.0.58 to 1.0.61 ([#17061](https://github.com/opensearch-project/OpenSearch/pull/17061))
 
 ### Changed
-- Upgrade third-party integrations to the latest versions ([#447](https://github.com/wazuh/wazuh-indexer/pull/447))
+- Indexed IP field supports `terms_query` with more than 1025 IP masks [#16391](https://github.com/opensearch-project/OpenSearch/pull/16391)
+- Make entries for dependencies from server/build.gradle to gradle version catalog ([#16707](https://github.com/opensearch-project/OpenSearch/pull/16707))
+- Sliced search only fans out to shards matched by the selected slice, reducing open search contexts ([#16771](https://github.com/opensearch-project/OpenSearch/pull/16771))
+- Allow extended plugins to be optional ([#16909](https://github.com/opensearch-project/OpenSearch/pull/16909))
+- Use the correct type to widen the sort fields when merging top docs ([#16881](https://github.com/opensearch-project/OpenSearch/pull/16881))
+- Limit reader writer separation to remote store enabled clusters [#16760](https://github.com/opensearch-project/OpenSearch/pull/16760)
+- Optimize innerhits query performance [#16937](https://github.com/opensearch-project/OpenSearch/pull/16937)
 
 ### Deprecated
 - Performing update operation with default pipeline or final pipeline is deprecated ([#16712](https://github.com/opensearch-project/OpenSearch/pull/16712))
@@ -116,4 +122,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.12.0...master
+[Unreleased 5.0.x]: https://github.com/wazuh/wazuh-indexer/compare/4.12.0...main
diff --git a/build-scripts/README.md b/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'.

diff --git a/docker/builder/builder.sh b/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'."

diff --git a/docker/builder/compose.yml b/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}

diff --git a/docker/builder/entrypoint.sh b/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}

diff --git a/ecs/scripts/generate-pr-to-plugins.sh b/ecs/scripts/generate-pr-to-plugins.sh
@@ -7,7 +7,7 @@ TEMPLATES_PATH="plugins/setup/src/main/resources/"
 PLUGINS_REPO="wazuh/wazuh-indexer-plugins"
 CURRENT_PATH=$(pwd)
 OUTPUT_PATH=${OUTPUT_PATH:-"$CURRENT_PATH"/../output}
-BASE_BRANCH=${BASE_BRANCH:-master}
+BASE_BRANCH=${BASE_BRANCH:-main}
 PLUGINS_LOCAL_PATH=${PLUGINS_LOCAL_PATH:-"$CURRENT_PATH"/../wazuh-indexer-plugins}
 
 # Committer's identity
@@ -49,7 +49,7 @@ check_running_on_gha() {
 detect_modified_modules() {
     echo
     echo "---> Fetching and extracting modified ECS modules..."
-    git fetch origin +refs/heads/master:refs/remotes/origin/master
+    git fetch origin +refs/heads/main:refs/remotes/origin/main
     local modified_files
     local updated_modules=()
     modified_files=$(git diff --name-only origin/"$BASE_BRANCH")
@@ -218,7 +218,7 @@ EOF
     gh auth login --with-token < token.txt
 
     if [ -z "$existing_pr" ]; then
-        output=$(gh pr create --title "$title" --body "$body" --base master --head "$BRANCH_NAME")
+        output=$(gh pr create --title "$title" --body "$body" --base main --head "$BRANCH_NAME")
         pr_url=$(echo "$output" | grep -oP 'https://github.com/\S+')
         export PR_URL="$pr_url"
         echo "New pull request created: $PR_URL"

diff --git a/integrations/amazon-security-lake/README.md b/integrations/amazon-security-lake/README.md
@@ -2,17 +2,28 @@
 
 ## Table of Contents
 
-- [Introduction](#introduction)
-- [Prerequisites](#prerequisites)
-- [Integration guide](#integration-guide)
-  - [Configure Amazon Security Lake](#configure-amazon-security-lake)
-  - [Create an AWS S3 bucket](#create-an-s3-bucket-to-store-events)
-  - [Configure the AWS Lambda function](#create-an-aws-lambda-function)
-  - [Validation](#validation)
-  - [Install and configure Logstash](#install-and-configure-logstash)
-- [OCSF mapping](#ocsf-mapping)
-- [Troubleshooting](#troubleshooting)
-- [Support](#support)
+- [Wazuh to Amazon Security Lake Integration Guide](#wazuh-to-amazon-security-lake-integration-guide)
+  - [Table of Contents](#table-of-contents)
+  - [Introduction](#introduction)
+    - [Amazon Security Lake](#amazon-security-lake)
+    - [Open Cybersecurity Schema Framework](#open-cybersecurity-schema-framework)
+    - [Wazuh Security Events](#wazuh-security-events)
+    - [Wazuh Security Events to Amazon Security Lake](#wazuh-security-events-to-amazon-security-lake)
+  - [Prerequisites](#prerequisites)
+  - [Integration guide](#integration-guide)
+    - [Configure Amazon Security Lake](#configure-amazon-security-lake)
+      - [Create a custom source for Wazuh](#create-a-custom-source-for-wazuh)
+    - [Create an S3 bucket to store events](#create-an-s3-bucket-to-store-events)
+    - [Create an AWS Lambda function](#create-an-aws-lambda-function)
+    - [Validation](#validation)
+    - [Install and configure Logstash](#install-and-configure-logstash)
+      - [Configure the Logstash pipeline](#configure-the-logstash-pipeline)
+      - [Running Logstash](#running-logstash)
+  - [OCSF Mapping](#ocsf-mapping)
+    - [Metadata](#metadata)
+      - [Security events](#security-events)
+  - [Troubleshooting](#troubleshooting)
+  - [Support](#support)
 
 ## Introduction
 
@@ -31,8 +42,8 @@ Wazuh uses rules to monitor the events and logs in your network to detect securi
 **References**:
 
 - https://documentation.wazuh.com/current/user-manual/ruleset/getting-started.html#github-repository
-- https://github.com/wazuh/wazuh/tree/master/ruleset/rules
-- https://github.com/wazuh/wazuh/blob/master/extensions/elasticsearch/7.x/wazuh-template.json
+- https://github.com/wazuh/wazuh/tree/main/ruleset/rules
+- https://github.com/wazuh/wazuh/blob/main/extensions/elasticsearch/7.x/wazuh-template.json
 
 ### Wazuh Security Events to Amazon Security Lake