Skip to content

Commit

Permalink
Merge branch 'master' into feat/6278-replace-discover-docker
Browse files Browse the repository at this point in the history
  • Loading branch information
yenienserrano authored Feb 8, 2024
2 parents 6c1ed40 + 943786e commit 7db4556
Show file tree
Hide file tree
Showing 112 changed files with 2,913 additions and 2,307 deletions.
25 changes: 21 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,29 @@ All notable changes to the Wazuh app project will be documented in this file.

- Support for Wazuh 4.8.1

## Wazuh v4.8.0 - OpenSearch Dashboards 2.10.0 - Revision 02
## Wazuh v4.8.0 - OpenSearch Dashboards 2.10.0 - Revision 03

### Added

- Support for Wazuh 4.8.0
- Added the ability to check if there are available updates from the UI. [#6093](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6093) [#6256](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6256)
- Added the ability to check if there are available updates from the UI. [#6093](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6093) [#6256](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6256) [#6328](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6328)
- Added remember server address check [#5791](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5791)
- Added the ssl_agent_ca configuration to the SSL Settings form [#6083](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6083)
- Added global vulnerabilities dashboards [#5896](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5896) [#6179](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6179) [#6173](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6173) [#6147](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6147) [#6231](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6231) [#6246](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6246)
- Added global vulnerabilities dashboards [#5896](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5896) [#6179](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6179) [#6173](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6173) [#6147](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6147) [#6231](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6231) [#6246](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6246) [#6321](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6321) [#6338](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6338) [#6356](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6356)
- Added an agent selector to the IT Hygiene application [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Added query results limit when the search exceed 10000 hits [#6106](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6106)
- Added a redirection button to Endpoint Summary from IT Hygiene application [6176](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6176)
- Added a redirection button to Endpoint Summary from IT Hygiene application [#6176](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6176)
- Added information icon with tooltip on the most active agent in the endpoint summary view [#6364](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6364)
- Added a dash with a tooltip in the server APIs table when the run as is disabled [#6354](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6354)

### Changed

- Moved the plugin menu to platform applications into the side menu [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840) [#6226](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6226) [#6244](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6244)
- Changed dashboards. [#6035](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6035)
- Change the display order of tabs in all modules. [#6067](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6067)
- Upgraded the `axios` dependency to `1.6.1` [#5062](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5062)
- Changed the api configuration title in the Server APIs section. [#6373](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6373)
- Changed overview home top KPIs. [#6379](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6379)

### Fixed

Expand All @@ -59,13 +63,26 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed exception in Inventory when agents don't have OS information [#6177](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6177)
- Fixed pinned agent state in URL [#6177](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6177)
- Fixed invalid date format in about and agent views [#6234](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6234)
- Fixed script to install agents on macOS when you have password to deploy [#6305](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6305)
- Fixed a problem with the address validation on Deploy New Agent [#6327](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6327)
- Fixed a typo in an abbreviation for Fully Qualified Domain Name [#6333](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6333)
- Fixed server statistics when cluster mode is disabled [#6352](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6352)
- Fixed unnecessary scrolling in Vulnerability Inventory table [#6345](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6345)
- Fixed wrong value at server stat Archives queue usage [#6342](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6342)
- Fixed the inventory data table when maximized and the docked menu [#6344](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6344)
- Fixed implicit filter close button in the search bar [#6346](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6346)
- Fixed the help menu, to be consistent and avoid duplication [#6374](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6374)
- Fixed the axis label visual bug from dashboards [#6378](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6378)

### Removed

- Removed the `disabled_roles` and `customization.logo.sidebar` settings [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Removed the ability to configure the visibility of modules and removed `extensions.*` settings [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Removed the application menu in the IT Hygiene application [#6176](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6176)
- Removed the implicit filter of WQL language of the search bar UI [#6174](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6174)
- Removed notice of old Discover deprecation [#6341](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6341)
- Removed compilation date field from the app [#6366](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6366)
- Removed WAZUH_REGISTRATION_SERVER from Windows agent deployment command [#6361](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6361)

## Wazuh v4.7.2 - OpenSearch Dashboards 2.8.0 - Revision 02

Expand Down
37 changes: 37 additions & 0 deletions docker/imposter/agents/agent_manager.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"data": {
"affected_items": [
{
"os": {
"arch": "x86_64",
"codename": "stretch",
"major": "9",
"name": "Debian GNU/Linux",
"platform": "debian",
"uname": "Linux |ip-10-0-1-106 |4.9.0-9-amd64 |#1 SMP Debian 4.9.168-1+deb9u2 (2019-05-13) |x86_64",
"version": "9"
},
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"configSum": "6f4293818ef64291ca53727fb9ab8958",
"mergedSum": "7976a83d1aebcca09bc14459b5518ed5",
"id": "000",
"registerIP": "any",
"dateAdd": "2022-08-25T16:25:53Z",
"disconnection_time": "2022-08-25T16:36:35Z",
"name": "Debian",
"status": "active",
"manager": "wazuh-manager-master-0",
"node_name": "master",
"group": ["default", "debian"],
"lastKeepAlive": "2022-09-12T08:48:40Z",
"version": "Wazuh v4.3.7",
"status_code": 0
}
],
"total_affected_items": 1,
"total_failed_items": 0,
"failed_items": []
},
"message": "All selected agents information was returned",
"error": 0
}
3 changes: 3 additions & 0 deletions docker/imposter/agents/agents.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ switch (agentId) {
case undefined:
respond().withStatusCode(200).withFile('agents/agents.json');
break;
case '000':
respond().withStatusCode(200).withFile('agents/agent_manager.json');
break;
case '001':
respond().withStatusCode(200).withFile('agents/agent_active_groups.json');
break;
Expand Down
120 changes: 13 additions & 107 deletions docker/imposter/cluster/configuration/wmodules_wmodules.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"interval": 86400,
"java_path": "wodles/java",
"ciscat_path": "wodles/ciscat",
"ciscat_binary": "CIS-CAT.sh",
"timeout": 1800
}
},
Expand Down Expand Up @@ -59,114 +60,19 @@
}
},
{
"vulnerability-detector": {
"vulnerability-detection": {
"enabled": "yes",
"run_on_start": "yes",
"interval": 300,
"min_full_scan_interval": 21600,
"retry_interval": 30,
"providers": [
{
"name": "canonical",
"version": "TRUSTY",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "canonical",
"version": "XENIAL",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "canonical",
"version": "BIONIC",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "canonical",
"version": "FOCAL",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "debian",
"version": "STRETCH",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "debian",
"version": "BUSTER",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "redhat",
"version": "5",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "redhat",
"version": "6",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "redhat",
"version": "7",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "redhat",
"version": "8",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "jredhat",
"update_interval": 3600,
"download_timeout": 0
},
{
"name": "alas",
"version": "Amazon-Linux",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "test",
"version": "test",
"url": "https://test.com",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "arch",
"update_interval": 3600,
"download_timeout": 300
},
{
"name": "nvd",
"update_from_year": 2010,
"update_interval": 3600,
"download_timeout": 300
}
]
"feed-update-interval": "60m"
}
},
{
"wazuh_control": {
"enabled": "yes"
}
},
{
"wazuh_control": {
"enabled": "yes"
}
},
{
Expand Down
6 changes: 6 additions & 0 deletions docker/imposter/manager/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ switch (pathConfiguration[0]) {
.withStatusCode(200)
.withFile('manager/configuration/monitor_reports.json');

break;
case 'wmodules':
respond()
.withStatusCode(200)
.withFile('manager/configuration/monitor_reports.json');

break;
default:
respond()
Expand Down
105 changes: 105 additions & 0 deletions docker/imposter/manager/configuration/wmodules_wmodules.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"data": {
"affected_items": [
{
"wmodules": [
{
"agent-upgrade": {
"enabled": "yes",
"max_threads": 8,
"chunk_size": 512
}
},
{
"task-manager": {
"enabled": "yes"
}
},
{
"cis-cat": {
"disabled": "yes",
"scan-on-start": "yes",
"interval": 86400,
"java_path": "wodles/java",
"ciscat_path": "wodles/ciscat",
"ciscat_binary": "CIS-CAT.sh",
"timeout": 1800
}
},
{
"osquery": {
"disabled": "yes",
"run_daemon": "yes",
"add_labels": "yes",
"log_path": "/var/log/osquery/osqueryd.results.log",
"config_path": "/etc/osquery/osquery.conf"
}
},
{
"syscollector": {
"disabled": "no",
"scan-on-start": "yes",
"interval": 3600,
"network": "yes",
"os": "yes",
"hardware": "yes",
"packages": "yes",
"ports": "yes",
"ports_all": "no",
"processes": "yes",
"sync_max_eps": 10
}
},
{
"sca": {
"interval": 43200,
"enabled": "yes",
"scan_on_start": "yes",
"skip_nfs": "yes",
"policies": ["/var/ossec/ruleset/sca/cis_ubuntu20-04.yml"]
}
},
{
"vulnerability-detection": {
"enabled": "yes",
"feed-update-interval": "60m"
}
},
{
"wazuh_control": {
"enabled": "yes"
}
},
{
"wazuh_control": {
"enabled": "yes"
}
},
{
"database": {
"sync_agents": "yes",
"real_time": "yes",
"interval": 60,
"max_queued_events": 0
}
},
{
"wazuh_download": {
"enabled": "yes"
}
},
{
"wazuh_control": {
"enabled": "yes"
}
}
]
}
],
"total_affected_items": 1,
"total_failed_items": 0,
"failed_items": []
},
"message": "Active configuration was successfully read",
"error": 0
}
3 changes: 1 addition & 2 deletions docker/integrations/extra/dashboards/Splunk/wazuh-pci-dss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"viz_9NIbkgTo": {
"type": "splunk.bubble",
"options": {
"backgroundColor": "#ffffff",
"xAxisTitleText": "timestamp",
"yAxisTitleText": "count"
},
Expand Down Expand Up @@ -134,4 +133,4 @@
},
"description": "",
"title": "wazuh-pci-dss-v1.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"viz_R8LMR6U6": {
"type": "splunk.singlevalueradial",
"options": {
"backgroundColor": "#ffffff",
"majorColor": "#bf0561"
},
"dataSources": {
Expand Down Expand Up @@ -294,4 +293,4 @@
},
"description": "",
"title": "wazuh-security-events-v1.0"
}
}
Loading

0 comments on commit 7db4556

Please sign in to comment.