Merge branch '4.7.0' into merge-4.6.0-into-4.7.0

wazuh · Oct 24, 2023 · f79b198 · f79b198
2 parents 7385d04 + cbec6aa
commit f79b198
Show file tree

Hide file tree

Showing 166 changed files with 17,343 additions and 5,199 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,34 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
+## Wazuh v4.7.0 - OpenSearch Dashboards 2.8.0 - Revision 01
+
+### Added
+
+- Support for Wazuh 4.7.0
+- Added `status detail` column in the agents table. [#5680](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5680)
+- Added agent register wizard handle properly special characters in password [5738](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5738)
+
+### Changed
+
+- Changed Network ports table columns for Linux agents. [#5636](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5636)
+- Updated development dependencies (`@typescript-eslint/eslint-plugin, @typescript-eslint/parser, eslint, swagger-client`)[#5748](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5748)
+- Changed timelion type displays in the management > statistics section to line type displays. [5707](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5707)
+
+### Fixed
+
+- Fixed problem with new or missing columns in agent table. [#5591](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5591)
+- Fixed the color of the agent name in the groups section in dark mode. [#5676](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5676) [#6018](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6018)
+- Fixed the propagation event so that the flyout data, in the decoders, does not change when the button is pressed. [#5597](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5597)
+- Fixed the tooltips of the tables in the security section, and unnecessary requests are removed. [#5631](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5631)
+
+### Removed
+
+- Removed views in JSON and XML formats from management settings. [#5747](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5747)
+
 ## Wazuh v4.6.0 - OpenSearch Dashboards 2.8.0 - Revision 03
 
+
 ### Added
 
 - Added rel="noopener noreferrer" in documentation links. [#5197](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5197) [#5274](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5274) [#5298](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5298) [#5409](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5409)

diff --git a/docker/imposter/agents/agent.json b/docker/imposter/agents/agent.json
@@ -27,7 +27,8 @@
           "debian"
         ],
         "lastKeepAlive": "2022-09-12T08:48:40Z",
-        "version": "Wazuh v4.3.7"
+        "version": "Wazuh v4.3.7",
+        "status_code": 0
       }
     ],
     "total_affected_items": 1,

diff --git a/docker/imposter/agents/agent_active_groups.json b/docker/imposter/agents/agent_active_groups.json
@@ -34,7 +34,8 @@
           "test8"
         ],
         "lastKeepAlive": "2022-09-12T08:48:40Z",
-        "version": "Wazuh v4.5.0"
+        "version": "Wazuh v4.5.0",
+        "status_code": 0
       }
     ],
     "total_affected_items": 1,

diff --git a/docker/imposter/agents/agent_disconnected.json b/docker/imposter/agents/agent_disconnected.json
@@ -25,7 +25,8 @@
         "ip": "111.111.1.111",
         "mergedSum": "e669d89eba52f6897060fc65a45300ac",
         "configSum": "97fccbb67e250b7c80aadc8d0dc59abe",
-        "group_config_status": "synced"
+        "group_config_status": "synced",
+        "status_code": 2
       }
     ],
     "total_affected_items": 1,

diff --git a/docker/imposter/agents/agent_macos.json b/docker/imposter/agents/agent_macos.json
@@ -21,7 +21,8 @@
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
         "version": "Wazuh v4.5.0",
-        "group_config_status": "synced"
+        "group_config_status": "synced",
+        "status_code": 3
       }
     ],
     "total_affected_items": 1,

diff --git a/docker/imposter/agents/agent_never_connected.json b/docker/imposter/agents/agent_never_connected.json
@@ -8,7 +8,8 @@
         "node_name": "unknown",
         "registerIP": "any",
         "id": "004",
-        "ip": "any"
+        "ip": "any",
+        "status_code": 4
       }
     ],
     "total_affected_items": 1,

diff --git a/docker/imposter/agents/agent_pending.json b/docker/imposter/agents/agent_pending.json
@@ -24,7 +24,8 @@
         "status": "pending",
         "mergedSum": "x",
         "node_name": "master-node",
-        "manager": "wazuh_manager_filebeat_sources_cmake-v4.4.0-rc1-7.10.2"
+        "manager": "wazuh_manager_filebeat_sources_cmake-v4.4.0-rc1-7.10.2",
+        "status_code": 5
       }
     ],
     "total_affected_items": 1,

diff --git a/docker/imposter/agents/agents.js b/docker/imposter/agents/agents.js
@@ -1,7 +1,5 @@
 var agentId = context.request.queryParams.agents_list;
 
-console.log(agentId);
-
 switch (agentId) {
   case undefined:
     respond().withStatusCode(200).withFile('agents/agents.json');

diff --git a/docker/imposter/agents/agents.json b/docker/imposter/agents/agents.json
@@ -33,7 +33,8 @@
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
         "version": "Wazuh v4.4.0",
-        "group_config_status": "synced"
+        "group_config_status": "synced",
+        "status_code": 0
       },
       {
         "os": {
@@ -62,7 +63,8 @@
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
         "version": "Wazuh v4.4.0",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 0
       },
       {
         "os": {
@@ -87,8 +89,9 @@
         "manager": "wazuh-manager-master-0",
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
-        "version": "Wazuh v4.4.0",
-        "group_config_status": "synced"
+        "version": "Wazuh v4.5.0",
+        "group_config_status": "synced",
+        "status_code": 0
       },
       {
         "os": {
@@ -117,7 +120,8 @@
         "ip": "111.111.1.111",
         "mergedSum": "e669d89eba52f6897060fc65a45300ac",
         "configSum": "97fccbb67e250b7c80aadc8d0dc59abe",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 1
       },
       {
         "status": "never_connected",
@@ -127,7 +131,8 @@
         "registerIP": "any",
         "id": "004",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 4
       },
       {
         "os": {
@@ -151,7 +156,8 @@
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
         "version": "Wazuh v4.5.0",
-        "group_config_status": "synced"
+        "group_config_status": "synced",
+        "status_code": 2
       },
       {
         "os": {
@@ -161,6 +167,7 @@
           "version": "18.04.6 LTS"
         },
         "group_config_status": "not synced",
+        "status_code": 0,
         "ip": "172.19.0.27",
         "status": "pending",
         "name": "Pending agent",
@@ -181,7 +188,8 @@
         "registerIP": "any",
         "id": "007",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 5
       },
       {
         "status": "never_connected",
@@ -191,7 +199,8 @@
         "registerIP": "any",
         "id": "008",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 1
       },
       {
         "status": "never_connected",
@@ -201,7 +210,8 @@
         "registerIP": "any",
         "id": "009",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 2
       },
       {
         "os": {

diff --git a/docker/imposter/api-info/api_info.json b/docker/imposter/api-info/api_info.json
@@ -1,7 +1,7 @@
 {
   "data": {
     "title": "Wazuh API REST",
-    "api_version": "4.6.0",
+    "api_version": "4.7.0",
     "revision": 1,
     "license_name": "GPL 2.0",
     "license_url": "https://github.com/wazuh/wazuh/blob/4.5/LICENSE",

diff --git a/docker/imposter/cluster/component_configuration.js b/docker/imposter/cluster/component_configuration.js
@@ -1,10 +1,6 @@
 var path = context.request.path;
-var pathArray = path.split('/')
-pathArray.splice(0, 4)
-var pathFile = 'cluster/configuration/' + pathArray.join('_') + '.json'
+var pathArray = path.split('/');
+pathArray.splice(0, 4);
+var pathFile = 'cluster/configuration/' + pathArray.join('_') + '.json';
 
-console.log(pathFile)
-
-respond()
-  .withStatusCode(200)
-  .withFile(pathFile)
+respond().withStatusCode(200).withFile(pathFile);
diff --git a/docker/imposter/initial_data.json b/docker/imposter/initial_data.json
@@ -1,4 +1,8 @@
 {
   "attempt": 0,
-  "callRestart": false
+  "callRestart": false,
+  "deleteUser": false,
+  "deleteRole": false,
+  "deletePolicies": false,
+  "deleteRolesMapping": false
 }
diff --git a/docker/imposter/sca/policy-checks.js b/docker/imposter/sca/policy-checks.js
@@ -1,8 +1,6 @@
 var status =
   context.request.queryParams.status || context.request.queryParams.result;
 
-console.log(status);
-
 switch (status) {
   case 'failed':
     respond().withStatusCode(200).withFile('sca/policy_checks_failed.json');

diff --git a/docker/imposter/security/policies/delete-policies.js b/docker/imposter/security/policies/delete-policies.js
@@ -0,0 +1,28 @@
+var id = context.request.queryParams.policy_ids;
+var storeWazuh = stores.open('storeWazuh');
+
+storeWazuh.save('deletePolicies', true);
+
+var data = {
+  data: {
+    affected_items: [
+      {
+        id: id,
+        name: 'TestWazuhPolicy',
+        policy: {
+          actions: ['security:delete'],
+          resources: ['user:id:*'],
+          effect: 'deny',
+        },
+        roles: [],
+      },
+    ],
+    total_affected_items: 1,
+    total_failed_items: 0,
+    failed_items: [],
+  },
+  message: 'All specified policies were deleted',
+  error: 0,
+};
+
+respond().withStatusCode(200).withData(JSON.stringify(data));