Merge branch '4.5.1' of https://github.com/wazuh/wazuh-kibana-app int…

…o feat/5643-update-release-utilities
wazuh · Jul 20, 2023 · 06240fc · 06240fc
2 parents a532593 + 4e396c5
commit 06240fc
Show file tree

Hide file tree

Showing 29 changed files with 2,220 additions and 1,464 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 All notable changes to the Wazuh app project will be documented in this file.
 
+## Wazuh v4.5.1 - OpenSearch Dashboards 2.6.0 - 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 - OpenSearch Dashboards 2.6.0 - Revision 01
 
 ### Added
@@ -16,6 +36,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 
 ## Wazuh v4.4.4 - OpenSearch Dashboards 2.6.0 - Revision 01
 
+
 ### Added
 
 - Support for Wazuh 4.4.4
@@ -62,8 +83,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)

diff --git a/README.md b/README.md
@@ -89,9 +89,10 @@ This plugin for OpenSearch Dashboards allows you to visualize and analyze Wazuh
 
 ## Requisites
 
-- Wazuh HIDS 4.5.0
-- Wazuh dashboard 4.5.0
-- Wazuh indexer 4.5.0
+- Wazuh HIDS 4.5.1
+- Wazuh dashboard 4.5.1
+- Wazuh indexer 4.5.1
+
 
 
 ## Contribute

diff --git a/docker/images/kbn-7.17.11-dev.Dockerfile b/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
diff --git a/docker/imposter/agents/agent.json b/docker/imposter/agents/agent.json
@@ -1,39 +1,39 @@
 {
-    "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": "10.0.1.106",
-                "configSum": "6f4293818ef64291ca53727fb9ab8958",
-                "mergedSum": "7976a83d1aebcca09bc14459b5518ed5",
-                "id": "001",
-                "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"
-            }
+  "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": "001",
+        "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"
         ],
-        "total_affected_items": 1,
-        "total_failed_items": 0,
-        "failed_items": []
-    },
-    "message": "All selected agents information was returned",
-    "error": 0
-}
+        "lastKeepAlive": "2022-09-12T08:48:40Z",
+        "version": "Wazuh v4.3.7"
+      }
+    ],
+    "total_affected_items": 1,
+    "total_failed_items": 0,
+    "failed_items": []
+  },
+  "message": "All selected agents information was returned",
+  "error": 0
+}
diff --git a/docker/imposter/agents/agents.json b/docker/imposter/agents/agents.json
@@ -1,114 +1,121 @@
 {
-    "data": {
-        "affected_items": [
-            {
-                "os": {
-                    "arch": "x86_64",
-                    "major": "2",
-                    "name": "Amazon Linux",
-                    "platform": "amzn",
-                    "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"
-                },
-                "group": [
-                    "default",
-                    "test",
-                    "test2",
-                    "test3",
-                    "test4",
-                    "test5",
-                    "test6",
-                    "test7",
-                    "test8",
-                    "test9",
-                    "test10"
-                ],
-                "ip": "127.0.0.1",
-                "id": "000",
-                "registerIP": "127.0.0.1",
-                "dateAdd": "2022-08-25T16:17:46Z",
-                "name": "wazuh-manager-master-0",
-                "status": "active",
-                "manager": "wazuh-manager-master-0",
-                "node_name": "master",
-                "lastKeepAlive": "9999-12-31T23:59:59Z",
-                "version": "Wazuh v4.4.0",
-                "group_config_status": "synced"
-            },{
-                "os": {
-                    "arch": "x86_64",
-                    "major": "2",
-                    "name": "Amazon Linux",
-                    "platform": "amzn",
-                    "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"
-                },
-                "group": [
-                  "default",
-                  "test",
-                  "test2",
-                  "test3",
-                  "test4",
-                  "test5"
-                ],
-                "ip": "127.0.0.1",
-                "id": "001",
-                "registerIP": "127.0.0.1",
-                "dateAdd": "2022-08-25T16:17:46Z",
-                "name": "wazuh-manager-master-0",
-                "status": "active",
-                "manager": "wazuh-manager-master-0",
-                "node_name": "master",
-                "lastKeepAlive": "9999-12-31T23:59:59Z",
-                "version": "Wazuh v4.4.0",
-                "group_config_status": "not synced"
-            },{
-                "os": {
-                    "arch": "x86_64",
-                    "major": "2",
-                    "name": "Amazon Linux",
-                    "platform": "amzn",
-                    "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"
-                },
-                "group": ["default", "test", "test2"],
-                "ip": "127.0.0.1",
-                "id": "002",
-                "registerIP": "127.0.0.1",
-                "dateAdd": "2022-08-25T16:17:46Z",
-                "name": "wazuh-manager-master-0",
-                "status": "active",
-                "manager": "wazuh-manager-master-0",
-                "node_name": "master",
-                "lastKeepAlive": "9999-12-31T23:59:59Z",
-                "version": "Wazuh v4.4.0",
-                "group_config_status": "synced"
-            },{
-                "os": {
-                    "arch": "x86_64",
-                    "major": "2",
-                    "name": "Amazon Linux",
-                    "platform": "amzn",
-                    "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": "003",
-                "registerIP": "127.0.0.1",
-                "dateAdd": "2022-08-25T16:17:46Z",
-                "name": "wazuh-manager-master-0",
-                "status": "active",
-                "manager": "wazuh-manager-master-0",
-                "node_name": "master",
-                "lastKeepAlive": "9999-12-31T23:59:59Z",
-                "version": "Wazuh v4.4.0",
-                "group_config_status": "not synced"
-            }
+  "data": {
+    "affected_items": [
+      {
+        "os": {
+          "arch": "x86_64",
+          "major": "2",
+          "name": "Amazon Linux",
+          "platform": "amzn",
+          "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"
+        },
+        "group": [
+          "default",
+          "test",
+          "test2",
+          "test3",
+          "test4",
+          "test5",
+          "test6",
+          "test7",
+          "test8",
+          "test9",
+          "test10"
         ],
-        "total_affected_items": 4,
-        "total_failed_items": 0,
-        "failed_items": []
-    },
-    "message": "All selected agents information was returned",
-    "error": 0
+        "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": "wazuh-manager-master-0",
+        "status": "active",
+        "manager": "wazuh-manager-master-0",
+        "node_name": "master",
+        "lastKeepAlive": "9999-12-31T23:59:59Z",
+        "version": "Wazuh v4.4.0",
+        "group_config_status": "synced"
+      },
+      {
+        "os": {
+          "arch": "x86_64",
+          "major": "2",
+          "name": "Amazon Linux",
+          "platform": "amzn",
+          "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"
+        },
+        "group": [
+          "default",
+          "test",
+          "test2",
+          "test3",
+          "test4",
+          "test5"
+        ],
+        "ip": "FE80:1234:2223:A000:2202:B3FF:FE1E:8329",
+        "id": "001",
+        "registerIP": "FE80:1234:2223:A000:2202:B3FF:FE1E:8329",
+        "dateAdd": "2022-08-25T16:17:46Z",
+        "name": "wazuh-manager-master-0",
+        "status": "active",
+        "manager": "wazuh-manager-master-0",
+        "node_name": "master",
+        "lastKeepAlive": "9999-12-31T23:59:59Z",
+        "version": "Wazuh v4.4.0",
+        "group_config_status": "not synced"
+      },
+      {
+        "os": {
+          "arch": "x86_64",
+          "major": "2",
+          "name": "Amazon Linux",
+          "platform": "amzn",
+          "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"
+        },
+        "group": [
+          "default",
+          "test",
+          "test2"
+        ],
+        "ip": "127.0.0.1",
+        "id": "002",
+        "registerIP": "127.0.0.1",
+        "dateAdd": "2022-08-25T16:17:46Z",
+        "name": "wazuh-manager-master-0",
+        "status": "active",
+        "manager": "wazuh-manager-master-0",
+        "node_name": "master",
+        "lastKeepAlive": "9999-12-31T23:59:59Z",
+        "version": "Wazuh v4.4.0",
+        "group_config_status": "synced"
+      },
+      {
+        "os": {
+          "arch": "x86_64",
+          "major": "2",
+          "name": "Amazon Linux",
+          "platform": "amzn",
+          "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": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
+        "id": "003",
+        "registerIP": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
+        "dateAdd": "2022-08-25T16:17:46Z",
+        "name": "wazuh-manager-master-0",
+        "status": "active",
+        "manager": "wazuh-manager-master-0",
+        "node_name": "master",
+        "lastKeepAlive": "9999-12-31T23:59:59Z",
+        "version": "Wazuh v4.4.0",
+        "group_config_status": "not synced"
+      }
+    ],
+    "total_affected_items": 4,
+    "total_failed_items": 0,
+    "failed_items": []
+  },
+  "message": "All selected agents information was returned",
+  "error": 0
 }