Merge 4.7.0 into master

.nvmrc

@@ -1 +1 @@
-14.20.1
+16.20.0

CHANGELOG.md

@@ -13,10 +13,25 @@ All notable changes to the Wazuh app project will be documented in this file.
 ### Added
 
 - Support for Wazuh 4.7.0
+- Added `status detail` column in the agents table. [#5680](https://github.com/wazuh/wazuh-kibana-app/pull/5680)
+- Added agent register wizard handle properly special characters in password [5738](https://github.com/wazuh/wazuh-kibana-app/pull/5738)
+
+### Changed
+
+- Changed Network ports table columns for Linux agents. [#5636](https://github.com/wazuh/wazuh-kibana-app/pull/5636)
+- Updated development dependencies (`@typescript-eslint/eslint-plugin, @typescript-eslint/parser, eslint, swagger-client`)[#5748](https://github.com/wazuh/wazuh-kibana-app/pull/5748)
+- Changed timelion type displays in the management > statistics section to line type displays. [5707](https://github.com/wazuh/wazuh-kibana-app/pull/5707)
 
 ### Fixed
 
+- Fixed problem with new or missing columns in agent table. [#5591](https://github.com/wazuh/wazuh-kibana-app/pull/5591)
 - Fixed the color of the agent name in the groups section in dark mode. [#5676](https://github.com/wazuh/wazuh-kibana-app/pull/5676)
+- 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-kibana-app/pull/5597)
+- Fixed the tooltips of the tables in the security section, and unnecessary requests are removed. [#5631](https://github.com/wazuh/wazuh-kibana-app/pull/5631)
+
+### Removed
+
+- Removed views in JSON and XML formats from management settings. [#5747](https://github.com/wazuh/wazuh-kibana-app/pull/5747)
 
 ## Wazuh v4.6.0 - OpenSearch Dashboards 2.6.0 - Revision 01
 
@@ -35,6 +50,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Migrate the timeFilter, metaFields, maxBuckets health checks inside the pattern check. [#5384](https://github.com/wazuh/wazuh-kibana-app/pull/5384)
 - Changed the query to search for an agent in `management/configuration`. [#5485](https://github.com/wazuh/wazuh-kibana-app/pull/5485)
 - Changed the search bar in management/log to the one used in the rest of the app. [#5476](https://github.com/wazuh/wazuh-kibana-app/pull/5476)
+- Changed the design of the wizard to add agents. [#5457](https://github.com/wazuh/wazuh-kibana-app/pull/5457)
 
 ### Fixed
 
@@ -79,6 +95,9 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Fixed the rendering of tables that contains IPs and agent overview [#5471](https://github.com/wazuh/wazuh-kibana-app/pull/5471)
 - Fixed the agents active coverage stat as NaN in Details panel of Agents section [#5490](https://github.com/wazuh/wazuh-kibana-app/pull/5490)
+- Fixed a broken documentation link to agent labels [#5687](https://github.com/wazuh/wazuh-kibana-app/pull/5687)
+- Fixed the PDF report filters applied to tables [#5714](https://github.com/wazuh/wazuh-kibana-app/pull/5714)
+- Fixed outdated year in the PDF report footer [#5766](https://github.com/wazuh/wazuh-kibana-app/pull/5766)
 
 ### Removed
 
@@ -88,6 +107,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 - Changed method to perform redirection on agent table buttons [#5539](https://github.com/wazuh/wazuh-kibana-app/pull/5539)
 - Changed windows agent service name in the deploy agent wizard [#5538](https://github.com/wazuh/wazuh-kibana-app/pull/5538)
+- Changed the requests to get the agent labels for the managers [#5687](https://github.com/wazuh/wazuh-kibana-app/pull/5687)
 
 ## Wazuh v4.5.0 - OpenSearch Dashboards 2.6.0 - Revision 01
 

docker/images/wzd-dev.Dockerfile

@@ -0,0 +1,24 @@
+# Usage: docker build --build-arg NODE_VERSION=16.20.0 --build-arg WAZUH_DASHBOARD_VERSION=4.6.0 -t quay.io/wazuh/osd-dev:4.6.0 -f wzd-dev.Dockerfile .
+
+ARG NODE_VERSION
+FROM node:${NODE_VERSION} AS base
+ARG WAZUH_DASHBOARD_VERSION
+USER node
+RUN git clone --depth 1 --branch ${WAZUH_DASHBOARD_VERSION} https://github.com/wazuh/wazuh-dashboard.git /home/node/kbn
+RUN chown node.node /home/node/kbn
+
+WORKDIR /home/node/kbn
+RUN yarn osd bootstrap --production
+
+
+WORKDIR /home/node/kbn/plugins
+RUN git clone --depth 1 --branch ${WAZUH_DASHBOARD_VERSION} https://github.com/wazuh/wazuh-security-dashboards-plugin.git
+WORKDIR /home/node/kbn/plugins/wazuh-security-dashboards-plugin
+RUN yarn install
+
+RUN mkdir -p /home/node/kbn/data/wazuh/config
+
+FROM node:${NODE_VERSION}
+USER node
+COPY --chown=node:node --from=base /home/node/kbn /home/node/kbn
+WORKDIR /home/node/kbn

docker/imposter/agents/agent.json

@@ -24,7 +24,8 @@
         "node_name": "master",
         "group": ["default", "debian"],
         "lastKeepAlive": "2022-09-12T08:48:40Z",
-        "version": "Wazuh v4.3.7"
+        "version": "Wazuh v4.3.7",
+        "status_code": 0
       }
     ],
     "total_affected_items": 1,

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,

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,

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,

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,

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,

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');

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": {
@@ -55,7 +56,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": {
@@ -76,8 +78,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": {
@@ -103,7 +106,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",
@@ -113,7 +117,8 @@
         "registerIP": "any",
         "id": "004",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 4
       },
       {
         "os": {
@@ -135,7 +140,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": {
@@ -145,6 +151,7 @@
           "version": "18.04.6 LTS"
         },
         "group_config_status": "not synced",
+        "status_code": 0,
         "ip": "172.19.0.27",
         "status": "pending",
         "name": "Pending agent",
@@ -163,7 +170,8 @@
         "registerIP": "any",
         "id": "007",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 5
       },
       {
         "status": "never_connected",
@@ -173,7 +181,8 @@
         "registerIP": "any",
         "id": "008",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 1
       },
       {
         "status": "never_connected",
@@ -183,7 +192,8 @@
         "registerIP": "any",
         "id": "009",
         "ip": "any",
-        "group_config_status": "not synced"
+        "group_config_status": "not synced",
+        "status_code": 2
       },
       {
         "os": {

docker/imposter/agents/configuration.js

@@ -0,0 +1,15 @@
+var path = context.request.path;
+var pathConfiguration = path.split('/');
+pathConfiguration.splice(0, 5);
+console.log(pathConfiguration);
+switch (pathConfiguration[0]) {
+  case 'labels':
+    respond()
+      .withStatusCode(200)
+      .withFile('agents/configuration/agent_labels.json');
+
+    break;
+  default:
+    respond().withStatusCode(200).withFile('agents/configuration/default.json');
+    break;
+}

docker/imposter/agents/configuration/agent_labels.json

@@ -0,0 +1,12 @@
+{
+  "data": {
+    "labels": [
+      {
+        "value": "customLabel",
+        "key": "custom",
+        "hidden": "no"
+      }
+    ]
+  },
+  "error": 0
+}

docker/imposter/agents/configuration/default.json

@@ -0,0 +1,33 @@
+{
+  "data": {
+    "client": {
+      "config-profile": "ubuntu, ubuntu20, ubuntu20.04",
+      "notify_time": 10,
+      "time-reconnect": 60,
+      "force_reconnect_interval": 0,
+      "ip_update_interval": 0,
+      "auto_restart": "yes",
+      "remote_conf": "yes",
+      "crypto_method": "aes",
+      "server": [
+        {
+          "address": "nginx-lb/172.25.0.4",
+          "port": 1514,
+          "max_retries": 5,
+          "retry_interval": 10,
+          "protocol": "tcp"
+        }
+      ],
+      "enrollment": [
+        {
+          "enabled": "yes",
+          "delay_after_enrollment": 20,
+          "port": 1515,
+          "ssl_cipher": "HIGH:!ADH:!EXP:!MD5:!RC4:!3DES:!CAMELLIA:@STRENGTH",
+          "auto_method": "no"
+        }
+      ]
+    }
+  },
+  "error": 0
+}

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);

docker/imposter/cluster/configuration/agent_labels.json

@@ -0,0 +1,20 @@
+{
+  "data": {
+    "affected_items": [
+      {
+        "labels": [
+          {
+            "value": "customLabel",
+            "key": "custom",
+            "hidden": "no"
+          }
+        ]
+      }
+    ],
+    "total_affected_items": 1,
+    "total_failed_items": 0,
+    "failed_items": []
+  },
+  "message": "Active configuration was successfully read in specified node.",
+  "error": 0
+}

docker/imposter/initial_data.json

@@ -1,4 +1,8 @@
 {
   "attempt": 0,
-  "callRestart": false
+  "callRestart": false,
+  "deleteUser": false,
+  "deleteRole": false,
+  "deletePolicies": false,
+  "deleteRolesMapping": false
 }

docker/imposter/manager/configuration.js

@@ -0,0 +1,22 @@
+var path = context.request.path;
+var pathConfiguration = path.split('/');
+pathConfiguration.splice(0, 4);
+switch (pathConfiguration[0]) {
+  case 'labels':
+    respond()
+      .withStatusCode(200)
+      .withFile('manager/configuration/agent_labels.json');
+
+    break;
+  case 'reports':
+    respond()
+      .withStatusCode(200)
+      .withFile('manager/configuration/monitor_reports.json');
+
+    break;
+  default:
+    respond()
+      .withStatusCode(200)
+      .withFile('manager/configuration/default.json');
+    break;
+}