mirror of
				https://github.com/wazuh/wazuh-docker.git
				synced 2025-10-31 03:53:33 +00:00 
			
		
		
		
	Merge pull request #2007 from wazuh/merge-4.14.0-into-4.14.1
Merge 4.14.0 into 4.14.1
This commit is contained in:
		| @@ -27,6 +27,8 @@ All notable changes to this project will be documented in this file. | |||||||
|  |  | ||||||
| ### Changed | ### Changed | ||||||
|  |  | ||||||
|  | - Rollback data source setting ([#1999](https://github.com/wazuh/wazuh-docker/pull/1999)) | ||||||
|  | - Dashboard settings added ([#1998](https://github.com/wazuh/wazuh-docker/pull/1998)) | ||||||
| - Add filebeat config file in the PERMANENT_DATA_EXCP list ([#1898](https://github.com/wazuh/wazuh-docker/pull/1898)) | - Add filebeat config file in the PERMANENT_DATA_EXCP list ([#1898](https://github.com/wazuh/wazuh-docker/pull/1898)) | ||||||
| - Change validation of existing certs tool in S3 buckets ([#1880](https://github.com/wazuh/wazuh-docker/pull/1880)) | - Change validation of existing certs tool in S3 buckets ([#1880](https://github.com/wazuh/wazuh-docker/pull/1880)) | ||||||
|  |  | ||||||
| @@ -58,6 +60,7 @@ All notable changes to this project will be documented in this file. | |||||||
|  |  | ||||||
| ### Changed | ### Changed | ||||||
|  |  | ||||||
|  | - Syscollector configuration change ([#1994](https://github.com/wazuh/wazuh-docker/pull/1994)) | ||||||
| - Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore) | - Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore) | ||||||
|  |  | ||||||
| ### Fixed | ### Fixed | ||||||
|   | |||||||
| @@ -79,7 +79,7 @@ | |||||||
|     <os>yes</os> |     <os>yes</os> | ||||||
|     <network>yes</network> |     <network>yes</network> | ||||||
|     <packages>yes</packages> |     <packages>yes</packages> | ||||||
|     <ports all="no">yes</ports> |     <ports all="yes">yes</ports> | ||||||
|     <processes>yes</processes> |     <processes>yes</processes> | ||||||
|  |  | ||||||
|     <!-- Database synchronization settings --> |     <!-- Database synchronization settings --> | ||||||
|   | |||||||
| @@ -79,7 +79,7 @@ | |||||||
|     <os>yes</os> |     <os>yes</os> | ||||||
|     <network>yes</network> |     <network>yes</network> | ||||||
|     <packages>yes</packages> |     <packages>yes</packages> | ||||||
|     <ports all="no">yes</ports> |     <ports all="yes">yes</ports> | ||||||
|     <processes>yes</processes> |     <processes>yes</processes> | ||||||
|  |  | ||||||
|     <!-- Database synchronization settings --> |     <!-- Database synchronization settings --> | ||||||
|   | |||||||
| @@ -14,3 +14,4 @@ uiSettings.overrides.defaultRoute: /app/wz-home | |||||||
| opensearch_security.cookie.ttl: 900000 | opensearch_security.cookie.ttl: 900000 | ||||||
| opensearch_security.session.ttl: 900000 | opensearch_security.session.ttl: 900000 | ||||||
| opensearch_security.session.keepalive: true | opensearch_security.session.keepalive: true | ||||||
|  | assistant.chat.enabled: true | ||||||
|   | |||||||
| @@ -79,7 +79,7 @@ | |||||||
|     <os>yes</os> |     <os>yes</os> | ||||||
|     <network>yes</network> |     <network>yes</network> | ||||||
|     <packages>yes</packages> |     <packages>yes</packages> | ||||||
|     <ports all="no">yes</ports> |     <ports all="yes">yes</ports> | ||||||
|     <processes>yes</processes> |     <processes>yes</processes> | ||||||
|  |  | ||||||
|     <!-- Database synchronization settings --> |     <!-- Database synchronization settings --> | ||||||
|   | |||||||
| @@ -14,3 +14,4 @@ uiSettings.overrides.defaultRoute: /app/wz-home | |||||||
| opensearch_security.cookie.ttl: 900000 | opensearch_security.cookie.ttl: 900000 | ||||||
| opensearch_security.session.ttl: 900000 | opensearch_security.session.ttl: 900000 | ||||||
| opensearch_security.session.keepalive: true | opensearch_security.session.keepalive: true | ||||||
|  | assistant.chat.enabled: true | ||||||
|   | |||||||
| @@ -83,7 +83,7 @@ | |||||||
|     <os>yes</os> |     <os>yes</os> | ||||||
|     <network>yes</network> |     <network>yes</network> | ||||||
|     <packages>yes</packages> |     <packages>yes</packages> | ||||||
|     <ports all="no">yes</ports> |     <ports all="yes">yes</ports> | ||||||
|     <processes>yes</processes> |     <processes>yes</processes> | ||||||
|  |  | ||||||
|     <!-- Database synchronization settings --> |     <!-- Database synchronization settings --> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user