From 1ccc05ff66e07c04a8a73d34501b2ffb2ea8675c Mon Sep 17 00:00:00 2001 From: Desvelao Date: Tue, 24 Nov 2020 11:32:45 +0100 Subject: [PATCH 1/6] fix(fronted): fixed the check of API and APP version in health check --- public/components/health-check/health-check.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/components/health-check/health-check.tsx b/public/components/health-check/health-check.tsx index a2a467e62d..7c32c3cb0f 100644 --- a/public/components/health-check/health-check.tsx +++ b/public/components/health-check/health-check.tsx @@ -219,7 +219,7 @@ export class HealthCheck extends Component { const i = this.state.results.map(item => item.id).indexOf(1); if (api.groups.version !== appSplit[0] || api.groups.minor !== appSplit[1]) { - this.errors.push( + errors.push( 'API version mismatch. Expected v' + setupData.data.data['app-version'] ); From fad3f67554c81497f8bd90dbd6980c16808d7608 Mon Sep 17 00:00:00 2001 From: Desvelao Date: Tue, 24 Nov 2020 13:55:16 +0100 Subject: [PATCH 2/6] fif(changelog): added PR to changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6d0cd324c..3b6646daed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ All notable changes to the Wazuh app project will be documented in this file. - Sample data indices name should take index pattern in use [#2593](https://github.com/wazuh/wazuh-kibana-app/issues/2593) - Added start option to macos Agents [#2653](https://github.com/wazuh/wazuh-kibana-app/pull/2653) +### Fixed +- fix(fronted): fixed the check of API and APP version in health check [#2655](https://github.com/wazuh/wazuh-kibana-app/pull/2655) + ## Wazuh v4.0.2 - Kibana v7.9.1, v7.9.3 - Revision 4011 ### Added From 420dbd6325e8b2f89e71daea7213bdf96e1fadfc Mon Sep 17 00:00:00 2001 From: Jose Sanchez Date: Fri, 27 Nov 2020 10:36:55 +0100 Subject: [PATCH 3/6] Update changelog --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b6646daed..8c64186368 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Wazuh app project will be documented in this file. +## Wazuh v4.0.2 - Kibana v7.9.1, v7.9.3 - Revision 4013 + +### Fixed + +- fix(fronted): fixed the check of API and APP version in health check [#2655](https://github.com/wazuh/wazuh-kibana-app/pull/2655) + ## Wazuh v4.0.2 - Kibana v7.9.1, v7.9.3 - Revision 4012 ### Added @@ -9,9 +15,6 @@ All notable changes to the Wazuh app project will be documented in this file. - Sample data indices name should take index pattern in use [#2593](https://github.com/wazuh/wazuh-kibana-app/issues/2593) - Added start option to macos Agents [#2653](https://github.com/wazuh/wazuh-kibana-app/pull/2653) -### Fixed -- fix(fronted): fixed the check of API and APP version in health check [#2655](https://github.com/wazuh/wazuh-kibana-app/pull/2655) - ## Wazuh v4.0.2 - Kibana v7.9.1, v7.9.3 - Revision 4011 ### Added From d7e6022b219aca4a66e6db13e52cd7a53e24ed70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Mart=C3=ADnez?= Date: Fri, 27 Nov 2020 09:24:28 +0100 Subject: [PATCH 4/6] change user instances --- server/monitoring.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/monitoring.js b/server/monitoring.js index 0e08cffee1..486f89b714 100644 --- a/server/monitoring.js +++ b/server/monitoring.js @@ -237,7 +237,7 @@ export class Monitoring { index === self.findIndex( t => - t.user === element.user && + t.username === element.username && t.password === element.password && t.url === element.url && t.port === element.port @@ -250,7 +250,7 @@ export class Monitoring { ); for (const element of filteredApis) { const apiEntry = { - user: element.user, + username: element.username, password: element.password, url: element.url, port: element.port, From ae4339ba3e9622bc4de0e2c18eb8c6ce5a6ee75c Mon Sep 17 00:00:00 2001 From: Jose Sanchez Date: Fri, 27 Nov 2020 10:53:50 +0100 Subject: [PATCH 5/6] Update CHANGELOG.md with issue #2654 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df8b94d280..0629c0ccdb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to the Wazuh app project will be documented in this file. ### Fixed - fix(fronted): fixed the check of API and APP version in health check [#2655](https://github.com/wazuh/wazuh-kibana-app/pull/2655) +- Replace user by username key in the monitoring logic [#2654](https://github.com/wazuh/wazuh-kibana-app/pull/2654) ## Wazuh v4.0.2 - Kibana v7.9.1, v7.9.3 - Revision 4012 From 7043a2df833e91206ef69fd6595d47f81eaf7f7f Mon Sep 17 00:00:00 2001 From: Jose Sanchez Date: Fri, 27 Nov 2020 11:40:54 +0100 Subject: [PATCH 6/6] Bump to Wazuh v4.0.3 --- CHANGELOG.md | 6 ++++++ README.md | 8 +++++--- package.json | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99f6422426..86fee982ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the Wazuh app project will be documented in this file. +## Wazuh v4.0.2 - Kibana v7.9.1, v7.9.3 - Revision 4013 + +### Added + +- Support for Wazuh v4.0.3. + ## Wazuh v4.0.2 - Kibana v7.9.1, v7.9.3 - Revision 4012 ### Added diff --git a/README.md b/README.md index a7323a3cf7..beb974f5fc 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ This plugin for Kibana allows you to visualize and analyze Wazuh alerts stored i ## Requisites -- Wazuh HIDS 4.0.2 +- Wazuh HIDS 4.0.3 - Kibana 7.9.3 - Elasticsearch 7.9.3 @@ -97,7 +97,7 @@ Install the Wazuh app plugin for Kibana ``` cd /usr/share/kibana -sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.0.2_7.9.3-1.zip +sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.0.3_7.9.3-1.zip ``` Restart Kibana @@ -163,7 +163,7 @@ Install the Wazuh app ``` cd /usr/share/kibana/ -sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.0.2_7.9.3-1.zip +sudo -u kibana bin/kibana-plugin install https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana-4.0.3_7.9.3-1.zip ``` Update configuration file permissions. @@ -192,6 +192,8 @@ service kibana restart | Wazuh app | Kibana | Open Distro | Package | | :-------: | :----: | :---------: | :------------------------------------------------------------------------- | +| 4.0.3 | 7.9.3 | | | +| 4.0.3 | 7.9.1 | 1.11.0 | | | 4.0.2 | 7.9.3 | | | | 4.0.2 | 7.9.1 | 1.11.0 | | | 4.0.1 | 7.9.3 | | | diff --git a/package.json b/package.json index a8d599fced..fdac1e7b61 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "wazuh", - "version": "4.0.2", - "revision": "4012", - "code": "4012-0", + "version": "4.0.3", + "revision": "4013", + "code": "4013-0", "kibana": { "version": "7.9.3" },