mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-11-04 05:53:19 +00:00 
			
		
		
		
	Compare commits
	
		
			105 Commits
		
	
	
		
			v4.11.0
			...
			change/182
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					e822b0744e | ||
| 
						 | 
					c6284f5b2d | ||
| 
						 | 
					212bc7d346 | ||
| 
						 | 
					f0c945b3bd | ||
| 
						 | 
					c6bc6cad0b | ||
| 
						 | 
					4eea59da8b | ||
| 
						 | 
					2cf6253985 | ||
| 
						 | 
					81a41f93ed | ||
| 
						 | 
					0f15acb783 | ||
| 
						 | 
					118c7805e3 | ||
| 
						 | 
					7245dfb0ef | ||
| 
						 | 
					b82b0efdd8 | ||
| 
						 | 
					e9851e5aa7 | ||
| 
						 | 
					4b04578cf5 | ||
| 
						 | 
					8e78fdfeec | ||
| 
						 | 
					3fe18c0f53 | ||
| 
						 | 
					34de7307f6 | ||
| 
						 | 
					cea3caee44 | ||
| 
						 | 
					1e28240ceb | ||
| 
						 | 
					c17b22c13b | ||
| 
						 | 
					2e22add312 | ||
| 
						 | 
					e161490f4d | ||
| 
						 | 
					1445bdc420 | ||
| 
						 | 
					9b2f667a8e | ||
| 
						 | 
					b43c9ddc96 | ||
| 
						 | 
					49b45fb342 | ||
| 
						 | 
					5d272abb51 | ||
| 
						 | 
					a371c28a05 | ||
| 
						 | 
					1da9ce981c | ||
| 
						 | 
					938a3df846 | ||
| 
						 | 
					3672c99a31 | ||
| 
						 | 
					4a9f83ddee | ||
| 
						 | 
					dfb3289bd8 | ||
| 
						 | 
					65b0d659d0 | ||
| 
						 | 
					34b3c00596 | ||
| 
						 | 
					c1fd8e2380 | ||
| 
						 | 
					cf972d3858 | ||
| 
						 | 
					d306f942f7 | ||
| 
						 | 
					abde776e1b | ||
| 
						 | 
					b6f628f3c1 | ||
| 
						 | 
					06a5ba5297 | ||
| 
						 | 
					51d3d7a946 | ||
| 
						 | 
					85992aea95 | ||
| 
						 | 
					5057d0f083 | ||
| 
						 | 
					562eb60e0f | ||
| 
						 | 
					58d6ec2953 | ||
| 
						 | 
					300c1bbcdd | ||
| 
						 | 
					e1bf0a0dc5 | ||
| 
						 | 
					c1565a5553 | ||
| 
						 | 
					1fe7647b47 | ||
| 
						 | 
					bd5e95a2b8 | ||
| 
						 | 
					75fb9a4e4c | ||
| 
						 | 
					f002f7e7b0 | ||
| 
						 | 
					72c0b196d0 | ||
| 
						 | 
					4aaf0a1b8c | ||
| 
						 | 
					1186c6f9d6 | ||
| 
						 | 
					87a3ccd3ee | ||
| 
						 | 
					7f08f4cbff | ||
| 
						 | 
					607b01351e | ||
| 
						 | 
					b2de3600ce | ||
| 
						 | 
					ce53f0f05e | ||
| 
						 | 
					aa69278c44 | ||
| 
						 | 
					546f3cef9b | ||
| 
						 | 
					754c4b331e | ||
| 
						 | 
					4433476038 | ||
| 
						 | 
					e60c07a18f | ||
| 
						 | 
					fe0f76bd7b | ||
| 
						 | 
					e4fec103ca | ||
| 
						 | 
					28acd68e6e | ||
| 
						 | 
					fc8a8d6869 | ||
| 
						 | 
					288630a722 | ||
| 
						 | 
					5c1d43c702 | ||
| 
						 | 
					ff7c511f3b | ||
| 
						 | 
					5f689b8802 | ||
| 
						 | 
					f73a819ee4 | ||
| 
						 | 
					ebf8379373 | ||
| 
						 | 
					d024c37fc5 | ||
| 
						 | 
					87f3dccb0f | ||
| 
						 | 
					29e679363d | ||
| 
						 | 
					6195484a82 | ||
| 
						 | 
					dafe93039f | ||
| 
						 | 
					0adf702f70 | ||
| 
						 | 
					7be457e3ff | ||
| 
						 | 
					6e432a133d | ||
| 
						 | 
					c4bef8df3e | ||
| 
						 | 
					31440d4a54 | ||
| 
						 | 
					af11b8cbbb | ||
| 
						 | 
					77ef56ada7 | ||
| 
						 | 
					081436be42 | ||
| 
						 | 
					6a3b470f3c | ||
| 
						 | 
					91295a4b39 | ||
| 
						 | 
					8885425b7f | ||
| 
						 | 
					39768a397a | ||
| 
						 | 
					be82d2c41d | ||
| 
						 | 
					ff54368593 | ||
| 
						 | 
					79ad691772 | ||
| 
						 | 
					0980cf0257 | ||
| 
						 | 
					a13406a029 | ||
| 
						 | 
					b9a52df0ff | ||
| 
						 | 
					22f34ccb40 | ||
| 
						 | 
					369560f59f | ||
| 
						 | 
					f809a1ebbb | ||
| 
						 | 
					a5c313843e | ||
| 
						 | 
					447c0bdaf8 | ||
| 
						 | 
					e6c5e82a32 | 
							
								
								
									
										6
									
								
								.env
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								.env
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
WAZUH_VERSION=4.11.0
 | 
					WAZUH_VERSION=4.13.0
 | 
				
			||||||
WAZUH_IMAGE_VERSION=4.11.0
 | 
					WAZUH_IMAGE_VERSION=4.13.0
 | 
				
			||||||
WAZUH_TAG_REVISION=1
 | 
					WAZUH_TAG_REVISION=1
 | 
				
			||||||
FILEBEAT_TEMPLATE_BRANCH=4.11.0
 | 
					FILEBEAT_TEMPLATE_BRANCH=4.13.0
 | 
				
			||||||
WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
 | 
					WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
 | 
				
			||||||
WAZUH_UI_REVISION=1
 | 
					WAZUH_UI_REVISION=1
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/.goss.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/.goss.yaml
									
									
									
									
										vendored
									
									
								
							@@ -56,7 +56,7 @@ package:
 | 
				
			|||||||
  wazuh-manager:
 | 
					  wazuh-manager:
 | 
				
			||||||
    installed: true
 | 
					    installed: true
 | 
				
			||||||
    versions:
 | 
					    versions:
 | 
				
			||||||
    - 4.11.0
 | 
					    - 4.13.0
 | 
				
			||||||
port:
 | 
					port:
 | 
				
			||||||
  tcp:1514:
 | 
					  tcp:1514:
 | 
				
			||||||
    listening: true
 | 
					    listening: true
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,11 +6,10 @@ on:
 | 
				
			|||||||
    inputs:
 | 
					    inputs:
 | 
				
			||||||
      image_tag:
 | 
					      image_tag:
 | 
				
			||||||
        description: 'Docker image tag'
 | 
					        description: 'Docker image tag'
 | 
				
			||||||
        default: '4.11.0'
 | 
					        default: '4.13.0'
 | 
				
			||||||
        required: true
 | 
					        required: true
 | 
				
			||||||
      docker_reference:
 | 
					      docker_reference:
 | 
				
			||||||
        description: 'wazuh-docker reference'
 | 
					        description: 'wazuh-docker reference'
 | 
				
			||||||
        default: 'v4.11.0'
 | 
					 | 
				
			||||||
        required: true
 | 
					        required: true
 | 
				
			||||||
      products:
 | 
					      products:
 | 
				
			||||||
        description: 'Comma-separated list of the image names to build and push'
 | 
					        description: 'Comma-separated list of the image names to build and push'
 | 
				
			||||||
@@ -42,12 +41,11 @@ on:
 | 
				
			|||||||
    inputs:
 | 
					    inputs:
 | 
				
			||||||
      image_tag:
 | 
					      image_tag:
 | 
				
			||||||
        description: 'Docker image tag'
 | 
					        description: 'Docker image tag'
 | 
				
			||||||
        default: '4.11.0'
 | 
					        default: '4.13.0'
 | 
				
			||||||
        required: true
 | 
					        required: true
 | 
				
			||||||
        type: string
 | 
					        type: string
 | 
				
			||||||
      docker_reference:
 | 
					      docker_reference:
 | 
				
			||||||
        description: 'wazuh-docker reference'
 | 
					        description: 'wazuh-docker reference'
 | 
				
			||||||
        default: 'v4.11.0'
 | 
					 | 
				
			||||||
        required: false
 | 
					        required: false
 | 
				
			||||||
        type: string
 | 
					        type: string
 | 
				
			||||||
      products:
 | 
					      products:
 | 
				
			||||||
@@ -82,7 +80,7 @@ on:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  build-and-push:
 | 
					  build-and-push:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-22.04
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - name: Print inputs
 | 
					    - name: Print inputs
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										6
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							@@ -4,7 +4,7 @@ on: [pull_request]
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
jobs:
 | 
					jobs:
 | 
				
			||||||
  build-docker-images:
 | 
					  build-docker-images:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-22.04
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    - name: Check out code
 | 
					    - name: Check out code
 | 
				
			||||||
@@ -61,7 +61,7 @@ jobs:
 | 
				
			|||||||
        GOSS_FILE: .github/.goss.yaml
 | 
					        GOSS_FILE: .github/.goss.yaml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  check-single-node:
 | 
					  check-single-node:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-22.04
 | 
				
			||||||
    needs: build-docker-images
 | 
					    needs: build-docker-images
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -189,7 +189,7 @@ jobs:
 | 
				
			|||||||
      run: ./.github/single-node-log-check.sh
 | 
					      run: ./.github/single-node-log-check.sh
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  check-multi-node:
 | 
					  check-multi-node:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-22.04
 | 
				
			||||||
    needs: build-docker-images
 | 
					    needs: build-docker-images
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								.github/workflows/trivy-dashboard.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/trivy-dashboard.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,8 +11,7 @@ on:
 | 
				
			|||||||
    - published
 | 
					    - published
 | 
				
			||||||
  pull_request:
 | 
					  pull_request:
 | 
				
			||||||
    branches:
 | 
					    branches:
 | 
				
			||||||
      - master
 | 
					      - main
 | 
				
			||||||
      - stable
 | 
					 | 
				
			||||||
  schedule:
 | 
					  schedule:
 | 
				
			||||||
    - cron: '34 2 * * 1'
 | 
					    - cron: '34 2 * * 1'
 | 
				
			||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
@@ -27,7 +26,7 @@ jobs:
 | 
				
			|||||||
      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 | 
					      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    name: Build images and upload Trivy results
 | 
					    name: Build images and upload Trivy results
 | 
				
			||||||
    runs-on: "ubuntu-latest"
 | 
					    runs-on: "ubuntu-22.04"
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout code
 | 
					      - name: Checkout code
 | 
				
			||||||
        uses: actions/checkout@v3
 | 
					        uses: actions/checkout@v3
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								.github/workflows/trivy-indexer.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/trivy-indexer.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,8 +11,7 @@ on:
 | 
				
			|||||||
    - published
 | 
					    - published
 | 
				
			||||||
  pull_request:
 | 
					  pull_request:
 | 
				
			||||||
    branches:
 | 
					    branches:
 | 
				
			||||||
      - master
 | 
					      - main
 | 
				
			||||||
      - stable
 | 
					 | 
				
			||||||
  schedule:
 | 
					  schedule:
 | 
				
			||||||
    - cron: '34 2 * * 1'
 | 
					    - cron: '34 2 * * 1'
 | 
				
			||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
@@ -27,7 +26,7 @@ jobs:
 | 
				
			|||||||
      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 | 
					      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    name: Build images and upload Trivy results
 | 
					    name: Build images and upload Trivy results
 | 
				
			||||||
    runs-on: "ubuntu-latest"
 | 
					    runs-on: "ubuntu-22.04"
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout code
 | 
					      - name: Checkout code
 | 
				
			||||||
        uses: actions/checkout@v3
 | 
					        uses: actions/checkout@v3
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								.github/workflows/trivy-manager.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/trivy-manager.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,8 +11,7 @@ on:
 | 
				
			|||||||
    - published
 | 
					    - published
 | 
				
			||||||
  pull_request:
 | 
					  pull_request:
 | 
				
			||||||
    branches:
 | 
					    branches:
 | 
				
			||||||
      - master
 | 
					      - main
 | 
				
			||||||
      - stable
 | 
					 | 
				
			||||||
  schedule:
 | 
					  schedule:
 | 
				
			||||||
    - cron: '34 2 * * 1'
 | 
					    - cron: '34 2 * * 1'
 | 
				
			||||||
  workflow_dispatch:
 | 
					  workflow_dispatch:
 | 
				
			||||||
@@ -27,7 +26,7 @@ jobs:
 | 
				
			|||||||
      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 | 
					      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    name: Build images and upload Trivy results
 | 
					    name: Build images and upload Trivy results
 | 
				
			||||||
    runs-on: "ubuntu-latest"
 | 
					    runs-on: "ubuntu-22.04"
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout code
 | 
					      - name: Checkout code
 | 
				
			||||||
        uses: actions/checkout@v3
 | 
					        uses: actions/checkout@v3
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -2,3 +2,4 @@ single-node/config/wazuh_indexer_ssl_certs/*.pem
 | 
				
			|||||||
single-node/config/wazuh_indexer_ssl_certs/*.key
 | 
					single-node/config/wazuh_indexer_ssl_certs/*.key
 | 
				
			||||||
multi-node/config/wazuh_indexer_ssl_certs/*.pem
 | 
					multi-node/config/wazuh_indexer_ssl_certs/*.pem
 | 
				
			||||||
multi-node/config/wazuh_indexer_ssl_certs/*.key
 | 
					multi-node/config/wazuh_indexer_ssl_certs/*.key
 | 
				
			||||||
 | 
					*.log
 | 
				
			||||||
							
								
								
									
										111
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										111
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,6 +1,117 @@
 | 
				
			|||||||
# Change Log
 | 
					# Change Log
 | 
				
			||||||
All notable changes to this project will be documented in this file.
 | 
					All notable changes to this project will be documented in this file.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [4.13.0]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Added repository_bumper script. ([#1781](https://github.com/wazuh/wazuh-docker/pull/1781))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Deleted
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Remove default docker reference version from workflow ([#1761](https://github.com/wazuh/wazuh-docker/pull/1761))
 | 
				
			||||||
 | 
					- Remove 'stable' branch ocurrencies ([#1757](https://github.com/wazuh/wazuh-docker/pull/1757))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [4.12.2]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Deleted
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [4.12.1]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Deleted
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [4.12.0]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Change VERSION file format ([#1728](https://github.com/wazuh/wazuh-docker/pull/1728)) \- (VERSION file)
 | 
				
			||||||
 | 
					- Change Ubuntu version used in workflows ([#1662](https://github.com/wazuh/wazuh-docker/pull/1662)) \- (Docker workflows)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Fix permanent data scripts ([#1603](https://github.com/wazuh/wazuh-docker/pull/1603))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Deleted
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [4.11.2]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Deleted
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [4.11.1]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Added
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Changed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Fixed
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Deleted
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## [4.11.0]
 | 
					## [4.11.0]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### Added
 | 
					### Added
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										45
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										45
									
								
								README.md
									
									
									
									
									
								
							@@ -165,58 +165,19 @@ WAZUH_MONITORING_REPLICAS=0         ##
 | 
				
			|||||||
    │   ├── docker-compose.yml
 | 
					    │   ├── docker-compose.yml
 | 
				
			||||||
    │   ├── generate-indexer-certs.yml
 | 
					    │   ├── generate-indexer-certs.yml
 | 
				
			||||||
    │   └── README.md
 | 
					    │   └── README.md
 | 
				
			||||||
    └── VERSION
 | 
					    └── VERSION.json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Branches
 | 
					## Branches
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* `master` branch contains the latest code, be aware of possible bugs on this branch.
 | 
					* `main` branch contains the latest code, be aware of possible bugs on this branch.
 | 
				
			||||||
* `stable` branch corresponds to the last Wazuh stable version.
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Compatibility Matrix
 | 
					## Compatibility Matrix
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| Wazuh version | ODFE    | XPACK  |
 | 
					| Wazuh version | ODFE    | XPACK  |
 | 
				
			||||||
|---------------|---------|--------|
 | 
					|---------------|---------|--------|
 | 
				
			||||||
| v4.11.0       |         |        |
 | 
					| v4.3.0+       |   N/A   |   N/A  |
 | 
				
			||||||
| v4.10.1       |         |        |
 | 
					 | 
				
			||||||
| v4.10.0       |         |        |
 | 
					 | 
				
			||||||
| v4.9.2        |         |        |
 | 
					 | 
				
			||||||
| v4.9.1        |         |        |
 | 
					 | 
				
			||||||
| v4.9.0        |         |        |
 | 
					 | 
				
			||||||
| v4.8.2        |         |        |
 | 
					 | 
				
			||||||
| v4.8.1        |         |        |
 | 
					 | 
				
			||||||
| v4.8.0        |         |        |
 | 
					 | 
				
			||||||
| v4.7.5        |         |        |
 | 
					 | 
				
			||||||
| v4.7.4        |         |        |
 | 
					 | 
				
			||||||
| v4.7.3        |         |        |
 | 
					 | 
				
			||||||
| v4.7.2        |         |        |
 | 
					 | 
				
			||||||
| v4.7.1        |         |        |
 | 
					 | 
				
			||||||
| v4.7.0        |         |        |
 | 
					 | 
				
			||||||
| v4.6.0        |         |        |
 | 
					 | 
				
			||||||
| v4.5.4        |         |        |
 | 
					 | 
				
			||||||
| v4.5.3        |         |        |
 | 
					 | 
				
			||||||
| v4.5.2        |         |        |
 | 
					 | 
				
			||||||
| v4.5.1        |         |        |
 | 
					 | 
				
			||||||
| v4.5.0        |         |        |
 | 
					 | 
				
			||||||
| v4.4.5        |         |        |
 | 
					 | 
				
			||||||
| v4.4.4        |         |        |
 | 
					 | 
				
			||||||
| v4.4.3        |         |        |
 | 
					 | 
				
			||||||
| v4.4.2        |         |        |
 | 
					 | 
				
			||||||
| v4.4.1        |         |        |
 | 
					 | 
				
			||||||
| v4.4.0        |         |        |
 | 
					 | 
				
			||||||
| v4.3.11       |         |        |
 | 
					 | 
				
			||||||
| v4.3.10       |         |        |
 | 
					 | 
				
			||||||
| v4.3.9        |         |        |
 | 
					 | 
				
			||||||
| v4.3.8        |         |        |
 | 
					 | 
				
			||||||
| v4.3.7        |         |        |
 | 
					 | 
				
			||||||
| v4.3.6        |         |        |
 | 
					 | 
				
			||||||
| v4.3.5        |         |        |
 | 
					 | 
				
			||||||
| v4.3.4        |         |        |
 | 
					 | 
				
			||||||
| v4.3.3        |         |        |
 | 
					 | 
				
			||||||
| v4.3.2        |         |        |
 | 
					 | 
				
			||||||
| v4.3.1        |         |        |
 | 
					 | 
				
			||||||
| v4.3.0        |         |        |
 | 
					 | 
				
			||||||
| v4.2.7        | 1.13.2  | 7.11.2 |
 | 
					| v4.2.7        | 1.13.2  | 7.11.2 |
 | 
				
			||||||
| v4.2.6        | 1.13.2  | 7.11.2 |
 | 
					| v4.2.6        | 1.13.2  | 7.11.2 |
 | 
				
			||||||
| v4.2.5        | 1.13.2  | 7.11.2 |
 | 
					| v4.2.5        | 1.13.2  | 7.11.2 |
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								VERSION.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								VERSION.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,4 @@
 | 
				
			|||||||
 | 
					{
 | 
				
			||||||
 | 
					    "version": "4.13.0",
 | 
				
			||||||
 | 
					    "stage": "alpha0"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -13,7 +13,7 @@ This script initializes the environment variables needed to build each of the im
 | 
				
			|||||||
The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
 | 
					The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
$ build-docker-images/build-images.sh -v 4.11.0
 | 
					$ build-docker-images/build-images.sh -v 4.13.0
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
To get all the available script options use the -h or --help option:
 | 
					To get all the available script options use the -h or --help option:
 | 
				
			||||||
@@ -26,7 +26,7 @@ Usage: build-docker-images/build-images.sh [OPTIONS]
 | 
				
			|||||||
    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
 | 
					    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
 | 
				
			||||||
    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
 | 
					    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
 | 
				
			||||||
    -r, --revision <rev>         [Optional] Package revision. By default 1
 | 
					    -r, --revision <rev>         [Optional] Package revision. By default 1
 | 
				
			||||||
    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.11.0.
 | 
					    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 4.13.0.
 | 
				
			||||||
    -h, --help                   Show this help.
 | 
					    -h, --help                   Show this help.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
@@ -1,4 +1,4 @@
 | 
				
			|||||||
WAZUH_IMAGE_VERSION=4.11.0
 | 
					WAZUH_IMAGE_VERSION=4.13.0
 | 
				
			||||||
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
 | 
					WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
 | 
				
			||||||
WAZUH_TAG_REVISION=1
 | 
					WAZUH_TAG_REVISION=1
 | 
				
			||||||
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
 | 
					WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '["]tag_name["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')
 | 
				
			||||||
@@ -12,7 +12,7 @@ IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
 | 
				
			|||||||
# License (version 2) as published by the FSF - Free Software
 | 
					# License (version 2) as published by the FSF - Free Software
 | 
				
			||||||
# Foundation.
 | 
					# Foundation.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
WAZUH_IMAGE_VERSION="4.11.0"
 | 
					WAZUH_IMAGE_VERSION="4.13.0"
 | 
				
			||||||
WAZUH_TAG_REVISION="1"
 | 
					WAZUH_TAG_REVISION="1"
 | 
				
			||||||
WAZUH_DEV_STAGE=""
 | 
					WAZUH_DEV_STAGE=""
 | 
				
			||||||
FILEBEAT_MODULE_VERSION="0.4"
 | 
					FILEBEAT_MODULE_VERSION="0.4"
 | 
				
			||||||
@@ -52,16 +52,11 @@ build() {
 | 
				
			|||||||
            FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}"
 | 
					            FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}"
 | 
				
			||||||
        elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
 | 
					        elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
 | 
				
			||||||
            FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
 | 
					            FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
 | 
				
			||||||
        else
 | 
					 | 
				
			||||||
            WAZUH_MASTER_VERSION="$(curl -s https://raw.githubusercontent.com/wazuh/wazuh/master/src/VERSION | sed -e 's/v//g')"
 | 
					 | 
				
			||||||
            if [ "${FILEBEAT_TEMPLATE_BRANCH}" == "${WAZUH_MASTER_VERSION}" ]; then
 | 
					 | 
				
			||||||
                FILEBEAT_TEMPLATE_BRANCH="master"
 | 
					 | 
				
			||||||
        else
 | 
					        else
 | 
				
			||||||
            echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
 | 
					            echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
 | 
				
			||||||
            clean 1
 | 
					            clean 1
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
    fi
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
 | 
					    echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
 | 
				
			||||||
    echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> .env
 | 
					    echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> .env
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
## Variables
 | 
					## Variables
 | 
				
			||||||
CERT_TOOL=wazuh-certs-tool.sh
 | 
					CERT_TOOL=wazuh-certs-tool.sh
 | 
				
			||||||
PACKAGES_URL=https://packages.wazuh.com/4.10/
 | 
					PACKAGES_URL=https://packages.wazuh.com/4.13/
 | 
				
			||||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
 | 
					PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.13/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Check if the cert tool exists in S3 buckets
 | 
					## Check if the cert tool exists in S3 buckets
 | 
				
			||||||
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
					CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,8 +22,8 @@ export REPO_DIR=/unattended_installer
 | 
				
			|||||||
## Variables
 | 
					## Variables
 | 
				
			||||||
CERT_TOOL=wazuh-certs-tool.sh
 | 
					CERT_TOOL=wazuh-certs-tool.sh
 | 
				
			||||||
PASSWORD_TOOL=wazuh-passwords-tool.sh
 | 
					PASSWORD_TOOL=wazuh-passwords-tool.sh
 | 
				
			||||||
PACKAGES_URL=https://packages.wazuh.com/4.10/
 | 
					PACKAGES_URL=https://packages.wazuh.com/4.13/
 | 
				
			||||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
 | 
					PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.13/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Check if the cert tool exists in S3 buckets
 | 
					## Check if the cert tool exists in S3 buckets
 | 
				
			||||||
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
					CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,12 +47,8 @@ mount_permanent_data() {
 | 
				
			|||||||
    if find ${permanent_dir} -mindepth 1 | read; then
 | 
					    if find ${permanent_dir} -mindepth 1 | read; then
 | 
				
			||||||
      print "The path ${permanent_dir} is already mounted"
 | 
					      print "The path ${permanent_dir} is already mounted"
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
      if find ${data_tmp} -mindepth 1 | read; then
 | 
					 | 
				
			||||||
        print "Installing ${permanent_dir}"
 | 
					        print "Installing ${permanent_dir}"
 | 
				
			||||||
        exec_cmd "cp -a ${data_tmp}. ${permanent_dir}"
 | 
					        exec_cmd "cp -ar ${data_tmp}. ${permanent_dir}"
 | 
				
			||||||
      else
 | 
					 | 
				
			||||||
        print "The path ${permanent_dir} is empty, skipped"
 | 
					 | 
				
			||||||
      fi
 | 
					 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
  done
 | 
					  done
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -115,8 +115,8 @@ function_entrypoint_scripts() {
 | 
				
			|||||||
function_configure_vulnerability_detection() {
 | 
					function_configure_vulnerability_detection() {
 | 
				
			||||||
if [ "$INDEXER_PASSWORD" != "" ]; then
 | 
					if [ "$INDEXER_PASSWORD" != "" ]; then
 | 
				
			||||||
  >&2 echo "Configuring password."
 | 
					  >&2 echo "Configuring password."
 | 
				
			||||||
  /var/ossec/bin/wazuh-keystore -f indexer -k username -v $INDEXER_USERNAME
 | 
					    echo "$INDEXER_USERNAME" | /var/ossec/bin/wazuh-keystore -f indexer -k username
 | 
				
			||||||
  /var/ossec/bin/wazuh-keystore -f indexer -k password -v $INDEXER_PASSWORD
 | 
					    echo "$INDEXER_PASSWORD" | /var/ossec/bin/wazuh-keystore -f indexer -k password
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,11 +30,7 @@ mkdir ${PERMANENT_PATH}
 | 
				
			|||||||
for permanent_dir in "${PERMANENT_DATA[@]}"; do
 | 
					for permanent_dir in "${PERMANENT_DATA[@]}"; do
 | 
				
			||||||
  # Create the directory for the permanent file if it does not exist
 | 
					  # Create the directory for the permanent file if it does not exist
 | 
				
			||||||
  DIR=$(dirname "${permanent_dir}")
 | 
					  DIR=$(dirname "${permanent_dir}")
 | 
				
			||||||
  if [ ! -e ${PERMANENT_PATH}${DIR}  ]
 | 
					 | 
				
			||||||
  then
 | 
					 | 
				
			||||||
  mkdir -p ${PERMANENT_PATH}${DIR}
 | 
					  mkdir -p ${PERMANENT_PATH}${DIR}
 | 
				
			||||||
  fi
 | 
					  cp -ar ${permanent_dir} ${PERMANENT_PATH}${DIR}
 | 
				
			||||||
  
 | 
					 | 
				
			||||||
  mv ${permanent_dir} ${PERMANENT_PATH}${permanent_dir}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
done
 | 
					done
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,8 +8,8 @@
 | 
				
			|||||||
## Variables
 | 
					## Variables
 | 
				
			||||||
CERT_TOOL=wazuh-certs-tool.sh
 | 
					CERT_TOOL=wazuh-certs-tool.sh
 | 
				
			||||||
PASSWORD_TOOL=wazuh-passwords-tool.sh
 | 
					PASSWORD_TOOL=wazuh-passwords-tool.sh
 | 
				
			||||||
PACKAGES_URL=https://packages.wazuh.com/4.10/
 | 
					PACKAGES_URL=https://packages.wazuh.com/4.13/
 | 
				
			||||||
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.10/
 | 
					PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.13/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Check if the cert tool exists in S3 buckets
 | 
					## Check if the cert tool exists in S3 buckets
 | 
				
			||||||
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
					CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,7 @@ version: '3.7'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  wazuh.master:
 | 
					  wazuh.master:
 | 
				
			||||||
    image: wazuh/wazuh-manager:4.11.0
 | 
					    image: wazuh/wazuh-manager:4.13.0
 | 
				
			||||||
    hostname: wazuh.master
 | 
					    hostname: wazuh.master
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ulimits:
 | 
					    ulimits:
 | 
				
			||||||
@@ -45,7 +45,7 @@ services:
 | 
				
			|||||||
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 | 
					      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wazuh.worker:
 | 
					  wazuh.worker:
 | 
				
			||||||
    image: wazuh/wazuh-manager:4.11.0
 | 
					    image: wazuh/wazuh-manager:4.13.0
 | 
				
			||||||
    hostname: wazuh.worker
 | 
					    hostname: wazuh.worker
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ulimits:
 | 
					    ulimits:
 | 
				
			||||||
@@ -81,7 +81,7 @@ services:
 | 
				
			|||||||
      - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 | 
					      - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wazuh1.indexer:
 | 
					  wazuh1.indexer:
 | 
				
			||||||
    image: wazuh/wazuh-indexer:4.11.0
 | 
					    image: wazuh/wazuh-indexer:4.13.0
 | 
				
			||||||
    hostname: wazuh1.indexer
 | 
					    hostname: wazuh1.indexer
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@@ -107,7 +107,7 @@ services:
 | 
				
			|||||||
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
					      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wazuh2.indexer:
 | 
					  wazuh2.indexer:
 | 
				
			||||||
    image: wazuh/wazuh-indexer:4.11.0
 | 
					    image: wazuh/wazuh-indexer:4.13.0
 | 
				
			||||||
    hostname: wazuh2.indexer
 | 
					    hostname: wazuh2.indexer
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
@@ -129,7 +129,7 @@ services:
 | 
				
			|||||||
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
					      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wazuh3.indexer:
 | 
					  wazuh3.indexer:
 | 
				
			||||||
    image: wazuh/wazuh-indexer:4.11.0
 | 
					    image: wazuh/wazuh-indexer:4.13.0
 | 
				
			||||||
    hostname: wazuh3.indexer
 | 
					    hostname: wazuh3.indexer
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
@@ -151,7 +151,7 @@ services:
 | 
				
			|||||||
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
					      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wazuh.dashboard:
 | 
					  wazuh.dashboard:
 | 
				
			||||||
    image: wazuh/wazuh-dashboard:4.11.0
 | 
					    image: wazuh/wazuh-dashboard:4.13.0
 | 
				
			||||||
    hostname: wazuh.dashboard
 | 
					    hostname: wazuh.dashboard
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,7 @@ version: '3.7'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  wazuh.manager:
 | 
					  wazuh.manager:
 | 
				
			||||||
    image: wazuh/wazuh-manager:4.11.0
 | 
					    image: wazuh/wazuh-manager:4.13.0
 | 
				
			||||||
    hostname: wazuh.manager
 | 
					    hostname: wazuh.manager
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ulimits:
 | 
					    ulimits:
 | 
				
			||||||
@@ -46,7 +46,7 @@ services:
 | 
				
			|||||||
      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 | 
					      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wazuh.indexer:
 | 
					  wazuh.indexer:
 | 
				
			||||||
    image: wazuh/wazuh-indexer:4.11.0
 | 
					    image: wazuh/wazuh-indexer:4.13.0
 | 
				
			||||||
    hostname: wazuh.indexer
 | 
					    hostname: wazuh.indexer
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
@@ -71,7 +71,7 @@ services:
 | 
				
			|||||||
      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
					      - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  wazuh.dashboard:
 | 
					  wazuh.dashboard:
 | 
				
			||||||
    image: wazuh/wazuh-dashboard:4.11.0
 | 
					    image: wazuh/wazuh-dashboard:4.13.0
 | 
				
			||||||
    hostname: wazuh.dashboard
 | 
					    hostname: wazuh.dashboard
 | 
				
			||||||
    restart: always
 | 
					    restart: always
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										150
									
								
								tools/repository_bumper.sh
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										150
									
								
								tools/repository_bumper.sh
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,150 @@
 | 
				
			|||||||
 | 
					#!/bin/bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# This script is used to update the version of a repository in the specified files.
 | 
				
			||||||
 | 
					# It takes a version number as an argument and updates the version in the specified files.
 | 
				
			||||||
 | 
					# Usage: ./repository_bumper.sh <version>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Global variables
 | 
				
			||||||
 | 
					DIR=$(dirname "$(pwd)")
 | 
				
			||||||
 | 
					LOG_FILE="${DIR}/tools/repository_bumper_$(date +"%Y-%m-%d_%H-%M-%S-%3N").log"
 | 
				
			||||||
 | 
					VERSION=""
 | 
				
			||||||
 | 
					STAGE=""
 | 
				
			||||||
 | 
					FILES_EDITED=()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					get_old_version_and_stage() {
 | 
				
			||||||
 | 
					    local VERSION_FILE="${DIR}/VERSION.json"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    OLD_VERSION=$(jq -r '.version' "${VERSION_FILE}")
 | 
				
			||||||
 | 
					    OLD_STAGE=$(jq -r '.stage' "${VERSION_FILE}")
 | 
				
			||||||
 | 
					    echo "Old version: ${OLD_VERSION}" | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					    echo "Old stage: ${OLD_STAGE}" | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					grep_command() {
 | 
				
			||||||
 | 
					    # This function is used to search for a specific string in the specified directory.
 | 
				
			||||||
 | 
					    # It takes two arguments: the string to search for and the directory to search in.
 | 
				
			||||||
 | 
					    # Usage: grep_command <string> <directory>
 | 
				
			||||||
 | 
					    eval grep -Rl "${1}" "${2}" --exclude-dir=".git" --exclude="repository_bumper_*.log" --exclude="CHANGELOG.md" "${3}"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					update_version_in_files() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    local OLD_MAYOR="$(echo "${OLD_VERSION}" | cut -d '.' -f 1)"
 | 
				
			||||||
 | 
					    local OLD_MINOR="$(echo "${OLD_VERSION}" | cut -d '.' -f 2)"
 | 
				
			||||||
 | 
					    local OLD_PATCH="$(echo "${OLD_VERSION}" | cut -d '.' -f 3)"
 | 
				
			||||||
 | 
					    local NEW_MAYOR="$(echo "${VERSION}" | cut -d '.' -f 1)"
 | 
				
			||||||
 | 
					    local NEW_MINOR="$(echo "${VERSION}" | cut -d '.' -f 2)"
 | 
				
			||||||
 | 
					    local NEW_PATCH="$(echo "${VERSION}" | cut -d '.' -f 3)"
 | 
				
			||||||
 | 
					    m_m_p_files=( $(grep_command "${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}" "${DIR}") )
 | 
				
			||||||
 | 
					    for file in "${m_m_p_files[@]}"; do
 | 
				
			||||||
 | 
					        sed -i "s/\bv${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}\b/v${NEW_MAYOR}\.${NEW_MINOR}\.${NEW_PATCH}/g; s/\b${OLD_MAYOR}\.${OLD_MINOR}\.${OLD_PATCH}/${NEW_MAYOR}\.${NEW_MINOR}\.${NEW_PATCH}/g" "${file}"
 | 
				
			||||||
 | 
					        if [[ $(git diff --name-only "${file}") ]]; then
 | 
				
			||||||
 | 
					            FILES_EDITED+=("${file}")
 | 
				
			||||||
 | 
					        fi
 | 
				
			||||||
 | 
					    done
 | 
				
			||||||
 | 
					    m_m_files=( $(grep_command "${OLD_MAYOR}\.${OLD_MINOR}" "${DIR}") )
 | 
				
			||||||
 | 
					    for file in "${m_m_files[@]}"; do
 | 
				
			||||||
 | 
					        sed -i -E "/[0-9]+\.[0-9]+\.[0-9]+/! s/(^|[^0-9.])(${OLD_MAYOR}\.${OLD_MINOR})([^0-9.]|$)/\1${NEW_MAYOR}.${NEW_MINOR}\3/g" "$file"
 | 
				
			||||||
 | 
					        if [[ $(git diff --name-only "${file}") ]]; then
 | 
				
			||||||
 | 
					            FILES_EDITED+=("${file}")
 | 
				
			||||||
 | 
					        fi
 | 
				
			||||||
 | 
					    done
 | 
				
			||||||
 | 
					    m_x_files=( $(grep_command "${OLD_MAYOR}\.x" "${DIR}") )
 | 
				
			||||||
 | 
					    for file in "${m_x_files[@]}"; do
 | 
				
			||||||
 | 
					        sed -i "s/\b${OLD_MAYOR}\.x\b/${NEW_MAYOR}\.x/g" "${file}"
 | 
				
			||||||
 | 
					        if [[ $(git diff --name-only "${file}") ]]; then
 | 
				
			||||||
 | 
					            FILES_EDITED+=("${file}")
 | 
				
			||||||
 | 
					        fi
 | 
				
			||||||
 | 
					    done
 | 
				
			||||||
 | 
					    if ! sed -i "/^All notable changes to this project will be documented in this file.$/a \\\n## [${VERSION}]\\n\\n### Added\\n\\n- None\\n\\n### Changed\\n\\n- None\\n\\n### Fixed\\n\\n- None\\n\\n### Deleted\\n\\n- None" "${DIR}/CHANGELOG.md"; then
 | 
				
			||||||
 | 
					        echo "Error: Failed to update CHANGELOG.md" | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					    if [[ $(git diff --name-only "${DIR}/CHANGELOG.md") ]]; then
 | 
				
			||||||
 | 
					        FILES_EDITED+=("${DIR}/CHANGELOG.md")
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					update_stage_in_files() {
 | 
				
			||||||
 | 
					    local OLD_STAGE="$(echo "${OLD_STAGE}")"
 | 
				
			||||||
 | 
					    files=( $(grep_command "${OLD_STAGE}" "${DIR}" --exclude="README.md") )
 | 
				
			||||||
 | 
					    for file in "${files[@]}"; do
 | 
				
			||||||
 | 
					        sed -i "s/${OLD_STAGE}/${STAGE}/g" "${file}"
 | 
				
			||||||
 | 
					        if [[ $(git diff --name-only "${file}") ]]; then
 | 
				
			||||||
 | 
					            FILES_EDITED+=("${file}")
 | 
				
			||||||
 | 
					        fi
 | 
				
			||||||
 | 
					    done
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					main() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    echo "Starting repository version bumping process..." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					    echo "Log file: ${LOG_FILE}"
 | 
				
			||||||
 | 
					    # Parse arguments
 | 
				
			||||||
 | 
					    while [[ $# -gt 0 ]]; do
 | 
				
			||||||
 | 
					        case $1 in
 | 
				
			||||||
 | 
					            --version)
 | 
				
			||||||
 | 
					                VERSION="$2"
 | 
				
			||||||
 | 
					                shift 2
 | 
				
			||||||
 | 
					                ;;
 | 
				
			||||||
 | 
					            --stage)
 | 
				
			||||||
 | 
					                STAGE="$2"
 | 
				
			||||||
 | 
					                shift 2
 | 
				
			||||||
 | 
					                ;;
 | 
				
			||||||
 | 
					            *)
 | 
				
			||||||
 | 
					                echo "Unknown argument: $1"
 | 
				
			||||||
 | 
					                exit 1
 | 
				
			||||||
 | 
					                ;;
 | 
				
			||||||
 | 
					        esac
 | 
				
			||||||
 | 
					    done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Validate arguments
 | 
				
			||||||
 | 
					    if [[ -z "$VERSION" ]]; then
 | 
				
			||||||
 | 
					        echo "Error: --version argument is required." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        exit 1
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if [[ -z "$STAGE" ]]; then
 | 
				
			||||||
 | 
					        echo "Error: --stage argument is required." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        exit 1
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Validate if version is in the correct format
 | 
				
			||||||
 | 
					    if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 | 
				
			||||||
 | 
					        echo "Error: Version must be in the format X.Y.Z (e.g., 1.2.3)." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        exit 1
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Validate if stage is in the correct format
 | 
				
			||||||
 | 
					    STAGE=$(echo "$STAGE" | tr '[:upper:]' '[:lower:]')
 | 
				
			||||||
 | 
					    if ! [[ "$STAGE" =~ ^(alpha[0-9]*|beta[0-9]*|rc[0-9]*|stable)$ ]]; then
 | 
				
			||||||
 | 
					        echo "Error: Stage must be one of the following examples: alpha1, beta1, rc1, stable." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        exit 1
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Get old version and stage
 | 
				
			||||||
 | 
					    get_old_version_and_stage
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if [[ "$OLD_VERSION" == "$VERSION" && "$OLD_STAGE" == "$STAGE" ]]; then
 | 
				
			||||||
 | 
					        echo "Version and stage are already up to date." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        echo "No changes needed." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        exit 0
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					    if [[ "$OLD_VERSION" != "$VERSION" ]]; then
 | 
				
			||||||
 | 
					        echo "Updating version from $OLD_VERSION to $VERSION" | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        update_version_in_files "$VERSION"
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					    if [[ "$OLD_STAGE" != "$STAGE" ]]; then
 | 
				
			||||||
 | 
					        echo "Updating stage from $OLD_STAGE to $STAGE" | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					        update_stage_in_files "$STAGE"
 | 
				
			||||||
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    echo "The following files were edited:" | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					    for file in $(printf "%s\n" "${FILES_EDITED[@]}" | sort -u); do
 | 
				
			||||||
 | 
					        echo "${file}" | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					    done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    echo "Version and stage updated successfully." | tee -a "${LOG_FILE}"
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Call the main method with all arguments
 | 
				
			||||||
 | 
					main "$@"
 | 
				
			||||||
		Reference in New Issue
	
	Block a user