Merge 4.5.1-7.10 into 4.6.0-7.10

.github/workflows/unit-test.yml

@@ -24,11 +24,6 @@ on:
         options:
         - 'yarn test:jest'
   pull_request:
-    branches:
-      - 'master'
-      - '[345].[0-9]+'                    # Minor branches
-      - '[345].[0-9]+.[0-9]+'             # Patch branches
-      - '[345].[0-9]+.[0-9]+-7.[0-9]+'    # Minor branches - Kibana
 
 jobs:
   # Run unit tests with Jest

.gitignore

@@ -72,8 +72,6 @@ typings/
 target/
 build/
 
-yarn.lock
-
 cypress/node_modules/
 cypress/.idea/
 cypress/cypress.env.json
@@ -84,4 +82,4 @@ cypress/cookies.json
 public/assets/custom/*
 
 # Mac files
-.DS_Store
+.DS_Store

CHANGELOG.md

@@ -54,12 +54,38 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Removed obsolete code that caused duplicate requests to the api in `Management`. [#5485](https://github.com/wazuh/wazuh-kibana-app/pull/5485)
 - Removed unused embedded jquery-ui [#5592](https://github.com/wazuh/wazuh-kibana-app/pull/5592)
 
+## Wazuh v4.5.1 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 01
+
+### Added
+
+- Add Apple Silicon architecture button to the register Agent wizard [#5478](https://github.com/wazuh/wazuh-kibana-app/pull/5478)
+
+### Fixed
+
+- 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)
+
+### Removed
+
+- Removed the agent name in the agent info ribbon [#5497](https://github.com/wazuh/wazuh-kibana-app/pull/5497)
+
+### Changed
+
+- 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)
+
 ## Wazuh v4.5.0 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 01
 
 ### Added
 
 - Support for Wazuh 4.5.0
 
+## Wazuh v4.4.5 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 02
+
+### Added
+
+- Support for Wazuh 4.4.5
+
 ## Wazuh v4.4.4 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 01
 
 ### Added
@@ -106,8 +132,8 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Added the option to sort by the agent's count in the group table. [#4323](https://github.com/wazuh/wazuh-kibana-app/pull/4323)
 - Added agent synchronization status in the agent module. [#3874](https://github.com/wazuh/wazuh-kibana-app/pull/3874) [#5143](https://github.com/wazuh/wazuh-kibana-app/pull/5143) [#5177](https://github.com/wazuh/wazuh-kibana-app/pull/5177)
 - Added the ability to set the agent name in the installation command. [#4739](https://github.com/wazuh/wazuh-kibana-app/pull/4739)
-- Added validation to the plugin's settings [#4503](https://github.com/wazuh/wazuh-kibana-app/pull/4503)[#4785](https://github.com/wazuh/wazuh-kibana-app/pull/4785)
-- Added new settings to customize the header and footer on the PDF reports [#4505](https://github.com/wazuh/wazuh-kibana-app/pull/4505)[#4798](https://github.com/wazuh/wazuh-kibana-app/pull/4798)[#4805](https://github.com/wazuh/wazuh-kibana-app/pull/4805)
+- Added validation to the plugin's settings [#4503](https://github.com/wazuh/wazuh-kibana-app/pull/4503) [#4785](https://github.com/wazuh/wazuh-kibana-app/pull/4785)
+- Added new settings to customize the header and footer on the PDF reports [#4505](https://github.com/wazuh/wazuh-kibana-app/pull/4505) [#4798](https://github.com/wazuh/wazuh-kibana-app/pull/4798) [#4805](https://github.com/wazuh/wazuh-kibana-app/pull/4805)
 - Added a new setting to enable or disable the customization [#4507](https://github.com/wazuh/wazuh-kibana-app/pull/4507)
 - Added the ability to upload an image for the `customization.logo.*` settings in `Settings/Configuration` [#4504](https://github.com/wazuh/wazuh-kibana-app/pull/4504)
 - Added macOS support to the 'Deploy new agent' section [#4867](https://github.com/wazuh/wazuh-kibana-app/pull/4867)

README.md

@@ -21,9 +21,9 @@
 - [Wazuh UI](#wazuh-ui)
 - [Contribute](#contribute)
 - [License](#license)
-- [Copyright](#copyright)   
+- [Copyright](#copyright)
 
-<!-- 
+<!--
 [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://wazuh.com/community/join-us-on-slack/)
 [![Email](https://img.shields.io/badge/email-join-blue.svg)](https://groups.google.com/forum/#!forum/wazuh)
 [![Documentation](https://img.shields.io/badge/docs-view-green.svg)](https://documentation.wazuh.com)
@@ -32,10 +32,10 @@
 
 ## Welcome
 
-This repository contains a set of plugins for [Wazuh dashboard][dashboard].
+This repository contains a set of plugins for [Kibana][dashboard].
 
-Wazuh is a security detection, visibility, and compliance open source project. Wazuh helps 
-you to gain deeper security visibility into your infrastructure by monitoring hosts at an 
+Wazuh is a security detection, visibility, and compliance open source project. Wazuh helps
+you to gain deeper security visibility into your infrastructure by monitoring hosts at an
 operating system and application level.
 
 You can learn more about it at [wazuh.com][web]
@@ -49,10 +49,10 @@ You can learn more about it at [wazuh.com][web]
 - [Contributing](CONTRIBUTING.md)
 - [Styleguide](STYLEGUIDE.md)
 - [Security](SECURITY.md)
-<!-- - [Contributing](CONTRIBUTING.md) -->
-<!-- - [Maintainer Responsibilities](MAINTAINERS.md) -->
-<!-- - [Release Management](RELEASING.md) -->
-<!-- - [Testing](TESTING.md) -->
+  <!-- - [Contributing](CONTRIBUTING.md) -->
+  <!-- - [Maintainer Responsibilities](MAINTAINERS.md) -->
+  <!-- - [Release Management](RELEASING.md) -->
+  <!-- - [Testing](TESTING.md) -->
 
 ## Wazuh UI
 
@@ -100,27 +100,26 @@ You can learn more about it at [wazuh.com][web]
 
 ## Contribute
 
-If you want to contribute to our project please don't hesitate to send a pull request. 
-Take a look at the [branches and tags][branches] page in our Wiki, and also to our 
+If you want to contribute to our project please don't hesitate to send a pull request.
+Take a look at the [branches and tags][branches] page in our Wiki, and also to our
 [contributing](CONTRIBUTING.md) guidelines.
 
 ## License
 
 This project is licensed under the [GNU General Public License v2.0](LICENSE).
 
-This program is free software; you can redistribute it and/or modify it under the terms 
-of the GNU General Public License as published by the Free Software Foundation; either 
+This program is free software; you can redistribute it and/or modify it under the terms
+of the GNU General Public License as published by the Free Software Foundation; either
 version 2 of the License, or (at your option) any later version.
 
 ## Copyright
 
 - Copyright &copy; Wazuh, Inc.
 
-
-[dashboard]: https://github.com/wazuh/wazuh-dashboard
+[dashboard]: https://github.com/elastic/kibana
 [web]: https://wazuh.com
 [docs]: https://documentation.wazuh.com
 [install]: https://documentation.wazuh.com/current/installation-guide/index.html
 [slack]: https://join.slack.com/t/wazuh/shared_invite/zt-1lgu531ur-7M_k_ZQbpdo4QCn_pHee3w
 [branches]: https://github.com/wazuh/wazuh-kibana-app/wiki/About-our-branches-and-tags
-[wiki]: https://github.com/wazuh/wazuh-kibana-app/wiki
+[wiki]: https://github.com/wazuh/wazuh-kibana-app/wiki

docker/images/kbn-7.17.11-dev.Dockerfile

@@ -0,0 +1,17 @@
+FROM node:16.20.1 AS builder-kbn-7.17.11
+RUN npm install --global @bazel/[email protected]
+USER node
+RUN git clone --depth 1 --branch v7.17.11 https://github.com/elastic/kibana /home/node/kbn
+RUN chown node.node /home/node/kbn
+
+WORKDIR /home/node/kbn
+RUN yarn kbn bootstrap
+RUN yarn config set registry http://host.docker.internal:4873 && \
+    sed -i 's/https:\/\/registry.yarnpkg.com/http:\/\/host.docker.internal:4873/g' yarn.lock
+RUN rm -rf /home/node/.cache/yarn && rm -rf /home/node/.cache/Cypress && rm -rf /home/node/.cache/ms-playwright
+RUN mkdir -p /home/node/kbn/data/wazuh/config
+
+FROM node:16.20.1
+USER node
+COPY --from=builder-kbn-7.17.11 /home/node/ /home/node/
+WORKDIR /home/node/kbn

docker/imposter/agents/agent.json

@@ -11,7 +11,7 @@
           "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": "10.0.1.106",
+        "ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
         "configSum": "6f4293818ef64291ca53727fb9ab8958",
         "mergedSum": "7976a83d1aebcca09bc14459b5518ed5",
         "id": "001",
@@ -24,7 +24,7 @@
         "node_name": "master",
         "group": ["default", "debian"],
         "lastKeepAlive": "2022-09-12T08:48:40Z",
-        "version": "Wazuh v4.5.0"
+        "version": "Wazuh v4.6.0"
       }
     ],
     "total_affected_items": 1,

docker/imposter/agents/agents.json

@@ -10,8 +10,6 @@
           "uname": "Linux |wazuh-manager-master-0 |4.14.114-105.126.amzn2.x86_64 |#1 SMP Tue May 7 02:26:40 UTC 2019 |x86_64",
           "version": "2"
         },
-        "ip": "127.0.0.1",
-        "id": "001",
         "group": [
           "default",
           "test",
@@ -21,16 +19,20 @@
           "test5",
           "test6",
           "test7",
-          "test8"
+          "test8",
+          "test9",
+          "test10"
         ],
-        "registerIP": "127.0.0.1",
+        "ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
+        "id": "000",
+        "registerIP": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
         "dateAdd": "2022-08-25T16:17:46Z",
-        "name": "Debian agent",
+        "name": "wazuh-manager-master-0",
         "status": "active",
         "manager": "wazuh-manager-master-0",
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
-        "version": "Wazuh v4.5.0",
+        "version": "Wazuh v4.6.0",
         "group_config_status": "not synced"
       },
       {
@@ -52,7 +54,7 @@
         "manager": "wazuh-manager-master-0",
         "node_name": "master",
         "lastKeepAlive": "9999-12-31T23:59:59Z",
-        "version": "Wazuh v4.5.0",
+        "version": "Wazuh v4.6.0",
         "group_config_status": "synced"
       },
       {

docker/imposter/agents/group.json

@@ -0,0 +1,95 @@
+{
+  "data": {
+    "affected_items": [
+      {
+        "os": {
+          "arch": "x86_64",
+          "codename": "Focal Fossa",
+          "major": 20,
+          "minor": 4,
+          "name": "Ubuntu",
+          "platform": "ubuntu",
+          "uname": "Linux |b2497efbf876 |5.8.0-45-generic |#51~20.04.1-Ubuntu SMP Tue Feb 23 13:46:31 UTC 2021 |x86_64",
+          "version": "20.04.2 LTS"
+        },
+        "mergedSum": "2c769b2ea138d472ee8f1ba23412b5d4",
+        "node_name": "worker1",
+        "ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
+        "id": 4,
+        "manager": "wazuh-worker1",
+        "group": [
+          "default",
+          "group1"
+        ],
+        "name": "b2497efbf876",
+        "configSum": "052374472f3a0d5c8508241dcc455ea7",
+        "status": "active",
+        "dateAdd": "2021-05-27T09:14:19Z",
+        "registerIP": "any",
+        "lastKeepAlive": "2021-05-27T09:23:59Z",
+        "version": "Wazuh v4.3.0"
+      },
+      {
+        "os": {
+          "arch": "x86_64",
+          "codename": "Focal Fossa",
+          "major": 20,
+          "minor": 4,
+          "name": "Ubuntu",
+          "platform": "ubuntu",
+          "uname": "Linux |600e27371700 |5.8.0-45-generic |#51~20.04.1-Ubuntu SMP Tue Feb 23 13:46:31 UTC 2021 |x86_64",
+          "version": "20.04.2 LTS"
+        },
+        "mergedSum": "9a016508cea1e997ab8569f5cfab30f5",
+        "node_name": "worker1",
+        "ip": "FE80:1234:2223:A000:2202:B3FF:FE1E:8329",
+        "id": 5,
+        "manager": "wazuh-worker1",
+        "group": [
+          "default",
+          "group2"
+        ],
+        "name": "Infinity",
+        "configSum": "ab73af41699f13fdd81903b5f23d8d00",
+        "status": "active",
+        "dateAdd": "2021-05-27T09:14:19Z",
+        "registerIP": "any",
+        "lastKeepAlive": "2021-05-27T09:23:52Z",
+        "version": "Wazuh v4.3.0"
+      },
+      {
+        "os": {
+          "arch": "x86_64",
+          "codename": "Focal Fossa",
+          "major": 20,
+          "minor": 4,
+          "name": "Ubuntu",
+          "platform": "ubuntu",
+          "uname": "Linux |4bdac19ce5e3 |5.8.0-45-generic |#51~20.04.1-Ubuntu SMP Tue Feb 23 13:46:31 UTC 2021 |x86_64",
+          "version": "20.04.2 LTS"
+        },
+        "mergedSum": "9a016508cea1e997ab8569f5cfab30f5",
+        "node_name": "worker2",
+        "ip": "172.20.0.10",
+        "id": 6,
+        "manager": "wazuh-worker2",
+        "group": [
+          "default",
+          "group3"
+        ],
+        "name": "4bdac19ce5e3",
+        "configSum": "ab73af41699f13fdd81903b5f23d8d00",
+        "status": "active",
+        "dateAdd": "2021-05-27T09:14:19Z",
+        "registerIP": "any",
+        "lastKeepAlive": "2021-05-27T09:23:52Z",
+        "version": "Wazuh v4.3.0"
+      }
+    ],
+    "total_affected_items": 3,
+    "total_failed_items": 0,
+    "failed_items": []
+  },
+  "message": "All selected agents information was returned",
+  "error": 0
+}

docker/imposter/syscollector/netaddr.js

@@ -0,0 +1,29 @@
+var data = {
+  data: {
+    affected_items: [
+      {
+        address: '172.26.0.7',
+        iface: 'eth0',
+        netmask: '255.255.0.0',
+        broadcast: '172.26.255.255',
+        proto: 'ipv4',
+        agent_id: 1,
+      },
+      {
+        address: 'FE80:0034:0223:A000:0002:B3FF:0000:8329',
+        iface: 'eth0',
+        netmask: 'FE80:0034:0223:A000:0002:B3FF:0000:8329',
+        broadcast: 'FE80:0034:0223:A000:0002:B3FF:0000:8329',
+        proto: 'ipv6',
+        agent_id: 1,
+      },
+    ],
+    total_affected_items: 1,
+    total_failed_items: 0,
+    failed_items: [],
+  },
+  message: 'All specified syscollector information was returned',
+  error: 0,
+};
+
+respond().withStatusCode(200).withData(JSON.stringify(data));