Compare commits

...
Author SHA1 Message Date
Victor Carlos Erenu 1b639a948e Update changelog 2026-07-30 17:47:02 +07:00
Victor Carlos Erenu b5e6cee516 Add ISM plugin configuration after opensearch start 2026-07-30 17:44:58 +07:00
Gonzalo Acuña 01c0d4c7c2 Merge pull request #2554 from wazuh/merge-4.14.8-into-5.0.0
Merge 4.14.8 into 5.0.0
2026-07-24 12:31:12 -03:00
Victor Carlos Erenu 544fd8e111 Resoliving conflicts 2026-07-24 22:04:33 +07:00
Victor Carlos Erenu 3c53858c5a Resoliving conflicts 2026-07-24 22:02:39 +07:00
Gonzalo Acuña 355a1a4a90 Merge pull request #2553 from wazuh/merge-4.14.7-into-4.14.8
Merge 4.14.7 into 4.14.8
2026-07-24 11:44:57 -03:00
Victor Carlos Erenu f7f2248185 Resolving conflicts 2026-07-24 21:25:08 +07:00
Wazuh CI 4f51bef735 Merge pull request #2551 from wazuh/enhancement/wqa8238-bump-5.0.0
Bump 5.0.0 branch
2026-07-22 15:58:25 +02:00
wazuhci 68f81a6f6f feat: bump 5.0.0 2026-07-22 13:58:15 +00:00
Wazuh CI fc0e170315 Merge pull request #2550 from wazuh/enhancement/wqa8232-revert-bump-5.0.0
Revert bump 5.0.0 branch
2026-07-21 14:32:17 +02:00
wazuhci 04a4cdbd1e feat: revert 5.0.0 references 2026-07-21 12:32:12 +00:00
Julia Magán adcc5b57d2 Merge pull request #2540 from wazuh/enhancement/2536-revert-image-tag
Revert image tag for 4.14.7
2026-07-09 12:10:27 +02:00
Carlos Anguita López ecea95427b revert image tag 2026-07-09 12:03:51 +02:00
Wazuh CI 82ada64e37 Merge pull request #2538 from wazuh/enhancement/wqa8102-bump-4.14.7
Bump 4.14.7 branch
2026-07-08 19:11:23 +02:00
wazuhci a6558e8f4a feat: bump 4.14.7 2026-07-08 17:11:16 +00:00
Gonzalo Acuña af31c08f70 Merge pull request #2534 from wazuh/bug/2185-fix-bumper-to4.14.7
Fix bumper workflow failure when bump produces no changes
2026-07-08 08:45:42 -03:00
fcaffieri 80807a1cf9 Update CHANGELOG 2026-07-07 09:46:37 -03:00
fcaffieri 1c8583f366 Fix bumper workflow failure when bump produces no changes 2026-07-06 22:02:19 -03:00
Wazuh CI 4d9cfab272 Merge pull request #2527 from wazuh/enhancement/wqa8041-bump-4.14.8
Bump 4.14.8 branch
2026-07-03 17:05:31 +02:00
wazuhci fb0110a1c3 feat: bump 4.14.8 2026-07-03 15:05:24 +00:00
11 changed files with 77 additions and 32 deletions
@@ -6,7 +6,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.14.7'
default: '4.14.8'
required: true
docker_reference:
description: 'wazuh-docker reference'
@@ -38,7 +38,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: '4.14.7'
default: '4.14.8'
required: true
type: string
docker_reference:
+18 -5
View File
@@ -110,13 +110,21 @@ jobs:
bash ${{ env.BUMP_SCRIPT_PATH }} ${{ steps.vars.outputs.script_params }}
- name: Commit and push changes
id: bump_commit
run: |
git add .
git commit -m "feat: bump ${{ github.ref_name }}"
git push origin ${{ steps.vars.outputs.branch_name }}
if git diff --staged --quiet; then
echo "Nothing to bump: the repository is already at the requested version/stage. Skipping commit."
echo "has_changes=false" >> $GITHUB_OUTPUT
else
git commit -m "feat: bump ${{ github.ref_name }}"
git push origin ${{ steps.vars.outputs.branch_name }}
echo "has_changes=true" >> $GITHUB_OUTPUT
fi
- name: Create pull request
id: create_pr
if: steps.bump_commit.outputs.has_changes == 'true'
run: |
gh auth setup-git
PR_URL=$(gh pr create \
@@ -129,14 +137,19 @@ jobs:
echo "pull_request_url=${PR_URL}" >> $GITHUB_OUTPUT
- name: Merge pull request
if: steps.bump_commit.outputs.has_changes == 'true'
run: |
# Any checks for the PR are bypassed since the branch is expected to be functional (i.e. the bump process does not introduce any bugs)
gh pr merge "${{ steps.create_pr.outputs.pull_request_url }}" --merge --admin
- name: Show logs
run: |
echo "Bump complete."
echo "Branch: ${{ steps.vars.outputs.branch_name }}"
echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
if [[ "${{ steps.bump_commit.outputs.has_changes }}" == "true" ]]; then
echo "Bump complete."
echo "Branch: ${{ steps.vars.outputs.branch_name }}"
echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
else
echo "Bump skipped: the repository is already at the requested version/stage."
fi
echo "Bumper scripts logs:"
cat ${BUMP_LOG_PATH}/repository_bumper*log
@@ -6,7 +6,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: 'v5.0.0-beta4'
default: '5.0.0'
required: true
docker_reference:
description: 'wazuh-docker reference'
@@ -14,7 +14,7 @@ on:
wazuh_automation_reference:
description: 'Branch or tag of the wazuh-automation repository'
required: false
default: 'v5.0.0-beta4'
default: '5.0.0'
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
@@ -42,7 +42,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: 'v5.0.0-beta4'
default: '5.0.0'
required: true
type: string
docker_reference:
@@ -52,7 +52,7 @@ on:
wazuh_automation_reference:
description: 'Branch or tag of the wazuh-automation repository'
required: false
default: 'v5.0.0-beta4'
default: '5.0.0'
type: string
products:
description: 'Comma-separated list of the image names to build and push'
@@ -16,7 +16,7 @@ on:
automation_reference:
description: 'Branch of wazuh-automation to use'
required: false
default: 'v5.0.0-beta4'
default: '5.0.0'
type: string
deployment_type:
description: 'Deployment type to test'
+1
View File
@@ -12,6 +12,7 @@
### Changed
- Add ISM plugin configuration after opensearch start ([#2559](https://github.com/wazuh/wazuh-docker/issues/2559))
- Update deployment for Wazuh Indexer 5.0.0 RBAC ([#2537](https://github.com/wazuh/wazuh-docker/issues/2537))
- Add new WF for changelog check ([#2539](https://github.com/wazuh/wazuh-docker/pull/2539))
- Change artifact upload and download ([#2502](https://github.com/wazuh/wazuh-docker/issues/2502))
+1 -1
View File
@@ -1,4 +1,4 @@
{
"version": "5.0.0",
"stage": "beta4"
"stage": "rc1"
}
@@ -64,11 +64,42 @@ function runOpensearch {
echo $! > /run/wazuh-indexer/wazuh-engine.pid
fi
# Index State Management (ISM) creates its audit history index
# (.opendistro-ism-managed-index-history-*) with 1 replica by default,
# regardless of cluster.default_number_of_replicas. On a single-node
# cluster that replica shard can never be assigned, leaving the cluster
# permanently yellow. Set the ISM-specific default to 0 in the
# background once the API is reachable, before ISM's first sweep runs.
applyIsmHistoryReplicaDefault > /dev/null 2>&1 &
# Start opensearch
exec "$@" "${opensearch_opts[@]}"
}
function applyIsmHistoryReplicaDefault {
local admin_cert="$OPENSEARCH_PATH_CONF/certs/admin.pem"
local admin_key="$OPENSEARCH_PATH_CONF/certs/admin-key.pem"
if [ ! -f "$admin_cert" ] || [ ! -f "$admin_key" ]; then
return 0
fi
# -k: the server cert's SAN matches the node DNS name, not "localhost"
# (same reason the wazuh.indexer healthcheck in docker-compose uses -k).
local attempt=0
until curl -sk -o /dev/null --cert "$admin_cert" --key "$admin_key" "https://localhost:9200" \
|| [ "$attempt" -ge 60 ]; do
attempt=$((attempt + 1))
sleep 5
done
curl -sk -o /dev/null --cert "$admin_cert" --key "$admin_key" \
-X PUT "https://localhost:9200/_cluster/settings" \
-H 'Content-Type: application/json' \
-d '{"persistent":{"plugins.index_state_management.history.number_of_replicas":0}}'
}
function configureOpensearch {
# Update opensearch.yml with NODES_DN if set
if [ -n "$NODES_DN" ]; then
+9 -9
View File
@@ -24,15 +24,15 @@ Below is a step-by-step example of how to perform this update:
```yaml
services:
wazuh.manager:
image: wazuh/wazuh-manager:5.0.0-beta4
image: wazuh/wazuh-manager:5.0.0
...
wazuh.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
...
wazuh.dashboard:
image: wazuh/wazuh-dashboard:5.0.0-beta4
image: wazuh/wazuh-dashboard:5.0.0
...
```
@@ -48,27 +48,27 @@ Below is a step-by-step example of how to perform this update:
```yaml
services:
wazuh.master:
image: wazuh/wazuh-manager:5.0.0-beta4
image: wazuh/wazuh-manager:5.0.0
...
wazuh.worker:
image: wazuh/wazuh-manager:5.0.0-beta4
image: wazuh/wazuh-manager:5.0.0
...
wazuh1.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
...
wazuh2.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
...
wazuh3.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
...
wazuh.dashboard:
image: wazuh/wazuh-dashboard:5.0.0-beta4
image: wazuh/wazuh-dashboard:5.0.0
...
```
+6 -6
View File
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.master:
image: wazuh/wazuh-manager:5.0.0-beta4
image: wazuh/wazuh-manager:5.0.0
hostname: wazuh.master
container_name: multi-node-wazuh.master
restart: always
@@ -44,7 +44,7 @@ services:
- ./config/wazuh_master/certs/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh.worker:
image: wazuh/wazuh-manager:5.0.0-beta4
image: wazuh/wazuh-manager:5.0.0
hostname: wazuh.worker
container_name: multi-node-wazuh.worker
restart: always
@@ -83,7 +83,7 @@ services:
- ./config/wazuh_worker/certs/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh1.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
hostname: wazuh1.indexer
container_name: multi-node-wazuh1.indexer
restart: always
@@ -121,7 +121,7 @@ services:
- ./config/wazuh1_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
wazuh2.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
hostname: wazuh2.indexer
container_name: multi-node-wazuh2.indexer
restart: always
@@ -159,7 +159,7 @@ services:
- ./config/wazuh2_indexer/certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
wazuh3.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
hostname: wazuh3.indexer
container_name: multi-node-wazuh3.indexer
restart: always
@@ -197,7 +197,7 @@ services:
- ./config/wazuh3_indexer/certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
wazuh.dashboard:
image: wazuh/wazuh-dashboard:5.0.0-beta4
image: wazuh/wazuh-dashboard:5.0.0
hostname: wazuh.dashboard
container_name: multi-node-wazuh.dashboard
restart: always
+3 -3
View File
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.manager:
image: wazuh/wazuh-manager:5.0.0-beta4
image: wazuh/wazuh-manager:5.0.0
hostname: wazuh.manager
container_name: single-node-wazuh.manager
restart: always
@@ -44,7 +44,7 @@ services:
- ./config/wazuh_manager/certs/wazuh.manager-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
wazuh.indexer:
image: wazuh/wazuh-indexer:5.0.0-beta4
image: wazuh/wazuh-indexer:5.0.0
hostname: wazuh.indexer
container_name: single-node-wazuh.indexer
restart: always
@@ -81,7 +81,7 @@ services:
- ./config/wazuh_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
wazuh.dashboard:
image: wazuh/wazuh-dashboard:5.0.0-beta4
image: wazuh/wazuh-dashboard:5.0.0
hostname: wazuh.dashboard
container_name: single-node-wazuh.dashboard
restart: always
+1 -1
View File
@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
services:
wazuh.agent:
image: wazuh/wazuh-agent:5.0.0-beta4
image: wazuh/wazuh-agent:5.0.0
restart: always
environment:
- WAZUH_MANAGER_SERVER=<WAZUH_MANAGER_IP>