Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.6.0 into 4.7.0 #5811

Merged
merged 58 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from 55 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2bc8984
Change windows agent service name (#5538)
jbiset Jun 14, 2023
858205f
Remove agent name in agent info ribbon (#5497)
Desvelao Jun 14, 2023
1153509
Fix IPV6 visualizations (#5471)
Tostti Jun 14, 2023
2ce7375
Bump v4.4.4-2.6.0-rc2
yenienserrano Jun 8, 2023
0135df9
Add Apple Silicon architecture to the register Agent wizard (#5478)
asteriscos Jun 19, 2023
b6813de
Add missing supported versions to the Docker environments (#5584)
Desvelao Jun 20, 2023
7c4bdcd
Merge remote-tracking branch 'origin/4.5.0' into 4.5.1
asteriscos Jun 26, 2023
4860631
Bump 4.5.1
asteriscos Jun 26, 2023
74927fb
Change the method to make the redirect (#5539)
yenienserrano Jun 27, 2023
53bf022
Fix agents active coverage stat as NaN (#5490)
Desvelao Jun 27, 2023
5b5859c
[Backport 4.5.1] Update test snapshots for 4.5 (#5607)
AlexRuiz7 Jun 27, 2023
ef70b9a
Add kbn-dev 7.17.11 (#5628)
AlexRuiz7 Jul 5, 2023
4e396c5
Merge 4.5.0 into 4.5.1 (#5670)
yenienserrano Jul 11, 2023
3c5f965
Merge 4.5.1 into 4.6.0 (#5671)
yenienserrano Jul 11, 2023
249eb8b
Remove unused embedded jquery-ui (#5592)
Desvelao Jul 12, 2023
de033d2
Fixes redirection problem to inventory data, stats and configuration …
yenienserrano Jul 18, 2023
5f7772a
Bump Wazuh version 4.5.2 (#5702)
Desvelao Jul 19, 2023
657fecb
Fix conflicts in branch synchronization (#5708)
Desvelao Jul 20, 2023
a957b24
Fix 4.6.0 changelog merge errors (#5692)
yenienserrano Jul 20, 2023
4b03d25
Merge 4.5.0 into 4.5.1 (#5719)
Desvelao Jul 21, 2023
d3a7f8a
Merge 4.5.1 into 4.5.2 (#5720)
Desvelao Jul 21, 2023
8e2405b
Merge 4.5.2 into 4.6.0 (#5721)
Desvelao Jul 21, 2023
6a18172
Fix API request to get the manager labels and broken documentation li…
Desvelao Jul 24, 2023
f7eee3c
Fix server side query in pdf report filter (#5714)
asteriscos Jul 27, 2023
e84f88e
Upgrade environments to 4.6 and 4.7 (#5741)
yenienserrano Jul 28, 2023
b8298b4
Redesign deploy new agent page (#5457)
chantal-kelm Aug 1, 2023
db9a2c7
Update API data for 4.5.1 (#5758)
Desvelao Aug 4, 2023
cbf6a03
Add new search bar with WQL (#5363)
Desvelao Aug 9, 2023
a997dcf
Fix outdated year in PDF report footer (#5766)
Tostti Aug 9, 2023
4833f59
[Redesign add agent] Fix custom Eui styles in register agent wizard …
asteriscos Aug 10, 2023
6371935
Merge 4.5 into 4.5.1 (#5773)
yenienserrano Aug 11, 2023
806c063
Merge 4.5.1 into 4.5.2 (#5774)
yenienserrano Aug 11, 2023
afc2b3b
Merge 4.5.2 into 4.6.0 (#5775)
yenienserrano Aug 11, 2023
f987351
Replace search bar on TableWzAPI component (#5442)
Desvelao Aug 11, 2023
0656efb
Replace search bar on Agent > Inventory data (#5443)
Desvelao Aug 11, 2023
a628371
Replace search bar on Modules > Integrity monitoring > Inventory (#5444)
Desvelao Aug 11, 2023
1c145d9
Replace search bar on Management > Groups (#5445)
Desvelao Aug 11, 2023
6a69d67
Bump revision
asteriscos Aug 11, 2023
559f255
Replace search bar on Explore agent modal (#5447)
Desvelao Aug 11, 2023
0ecdcb0
Replace search bar on Agents (#5452)
Desvelao Aug 11, 2023
ee587da
Replace search bar in Management > Cluster > Nodes (#5491)
Desvelao Aug 11, 2023
8500a13
Fix management of custom rule and decoders files (#5734)
Desvelao Aug 11, 2023
283e842
Fix clicking on agent table cell doesn't open the agent details (#5785)
Desvelao Aug 11, 2023
b2d6338
Bump revision 03
asteriscos Aug 17, 2023
b4fa960
Update step 7 in deployment of Oracle Linux 6+ (#5764)
JuanGarriuz Aug 17, 2023
3ff3816
Add kbn-dev 7.17.12 (#5792)
JuanGarriuz Aug 21, 2023
db246ee
Fix broken GitHub documentation link (#5796)
JuanGarriuz Aug 22, 2023
25b0d27
merge: merge 4.5.1 into 4.5.2
asteriscos Aug 24, 2023
099ab65
Merge 4.5.1 into 4.5.2 (#5807)
asteriscos Aug 24, 2023
8de64c0
merge: merge 4.5.2 into 4.6.0
asteriscos Aug 24, 2023
ca0e345
Update settings.json - undo changes
asteriscos Aug 24, 2023
fe4ef67
Delete root scripts
asteriscos Aug 24, 2023
6cf9598
Update test snapshots
asteriscos Aug 24, 2023
06f6eb4
Merge 4.5.2 into 4.6.0 (#5808)
asteriscos Aug 24, 2023
14024af
merge: merge 4.6.0 into 4.7.0
asteriscos Aug 24, 2023
7db39f0
Update test snapshots
asteriscos Aug 24, 2023
574c326
Update test snapshots
asteriscos Aug 24, 2023
d2bdad0
Skip broken unit tests
asteriscos Aug 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ All notable changes to the Wazuh app project will be documented in this file.
- Added new global error treatment (client-side) [#4163](https://github.com/wazuh/wazuh-kibana-app/pull/4163)
- Added new CLI to generate API data from specification file [#5519](https://github.com/wazuh/wazuh-kibana-app/pull/5519)
- Added specific RBAC permissions to Security section [#5551](https://github.com/wazuh/wazuh-kibana-app/pull/5551)
- Added Refresh and Export formatted button to panels in Agents > Inventory data [#5443](https://github.com/wazuh/wazuh-kibana-app/pull/5443)
- Added Refresh and Export formatted buttons to Management > Cluster > Nodes [#5491](https://github.com/wazuh/wazuh-kibana-app/pull/5491)

### Changed

Expand All @@ -45,6 +47,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- 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)
- Changed the search bar in Management (Rules, Decoders, CDB List, Groups, Cluster > Nodes) and Modules (Vulnerabilities > Inventory, Security Configuration Assessment > Inventory > {Policy ID} > Checks, MITRE ATT&CK > Intelligence > {Resource}, Integrity monitoring > Inventory > Files, Integrity monitoring > Inventory > Registry), Agent Inventory data, Explore agent modal, Agents [#5363](https://github.com/wazuh/wazuh-kibana-app/pull/5363) [#5442](https://github.com/wazuh/wazuh-kibana-app/pull/5442) [#5443](https://github.com/wazuh/wazuh-kibana-app/pull/5443) [#5444](https://github.com/wazuh/wazuh-kibana-app/pull/5444) [#5445](https://github.com/wazuh/wazuh-kibana-app/pull/5445) [#5447](https://github.com/wazuh/wazuh-kibana-app/pull/5447) [#5452](https://github.com/wazuh/wazuh-kibana-app/pull/5452) [#5491](https://github.com/wazuh/wazuh-kibana-app/pull/5491) [#5785](https://github.com/wazuh/wazuh-kibana-app/pull/5785)

### Fixed

Expand All @@ -61,6 +64,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Fixed repeated requests in inventory data and configurations of an agent. [#5460](https://github.com/wazuh/wazuh-kibana-app/pull/5460)
- Fixed repeated requests in the group table when adding a group or refreshing the table [#5465](https://github.com/wazuh/wazuh-kibana-app/pull/5465)
- Fixed an error in the request body suggestions of API Console [#5521](https://github.com/wazuh/wazuh-kibana-app/pull/5521)
- Fixed some errors related to relative dirname of rule and decoder files [#5734](https://github.com/wazuh/wazuh-kibana-app/pull/5734)

### Removed

Expand All @@ -79,7 +83,12 @@ All notable changes to the Wazuh app project will be documented in this file.

- Support for Wazuh 4.5.2

## Wazuh v4.5.1 - OpenSearch Dashboards 2.6.0 - Revision 01
### Fixed

- Fixed an error with the commands in the Deploy new agent section for Oracle Linux 6+ agents [#5764](https://github.com/wazuh/wazuh-kibana-app/pull/5764)
- Fixed broken documentation links in `Management/Configuration` section [#5796](https://github.com/wazuh/wazuh-kibana-app/pull/5796)

## Wazuh v4.5.1 - OpenSearch Dashboards 2.6.0 - Revision 03

### Added

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</a>
</p>

- [Welcome!](#welcome)
- [Welcome](#welcome)
- [Project resources](#project-resources)
- [Wazuh UI](#wazuh-ui)
- [Contribute](#contribute)
Expand Down
17 changes: 17 additions & 0 deletions docker/images/kbn-7.17.12-dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM node:16.20.1 AS builder-kbn-7.17.12
RUN npm install --global @bazel/bazelisk@1.10.1
USER node
RUN git clone --depth 1 --branch v7.17.12 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.12 /home/node/ /home/node/
WORKDIR /home/node/kbn
5 changes: 4 additions & 1 deletion docker/imposter/agents/agent.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"status": "active",
"manager": "wazuh-manager-master-0",
"node_name": "master",
"group": ["default", "debian"],
"group": [
"default",
"debian"
],
"lastKeepAlive": "2022-09-12T08:48:40Z",
"version": "Wazuh v4.3.7",
"status_code": 0
Expand Down
33 changes: 27 additions & 6 deletions docker/imposter/agents/agents.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,14 @@
"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"],
"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",
Expand All @@ -68,7 +75,11 @@
"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"],
"group": [
"default",
"test",
"test2"
],
"ip": "127.0.0.1",
"id": "002",
"registerIP": "127.0.0.1",
Expand Down Expand Up @@ -97,7 +108,10 @@
"status": "disconnected",
"name": "disconnected-agent",
"dateAdd": "1970-01-01T00:00:00Z",
"group": ["default", "test"],
"group": [
"default",
"test"
],
"lastKeepAlive": "2023-03-14T04:20:51Z",
"node_name": "node01",
"registerIP": "any",
Expand Down Expand Up @@ -131,7 +145,9 @@
},
"ip": "127.0.0.1",
"id": "005",
"group": ["default"],
"group": [
"default"
],
"registerIP": "127.0.0.1",
"dateAdd": "2022-08-25T16:17:46Z",
"name": "macOS High Sierra agent",
Expand All @@ -155,7 +171,9 @@
"ip": "172.19.0.27",
"status": "pending",
"name": "Pending agent",
"group": ["default"],
"group": [
"default"
],
"node_name": "master-node",
"version": "Wazuh v4.4.0",
"lastKeepAlive": "2023-03-16T15:15:05+00:00",
Expand Down Expand Up @@ -210,7 +228,10 @@
"status": "disconnected",
"name": "disconnected-agent-2",
"dateAdd": "1970-01-01T00:00:00Z",
"group": ["default", "test"],
"group": [
"default",
"test"
],
"lastKeepAlive": "2023-03-14T04:20:51Z",
"node_name": "node01",
"registerIP": "any",
Expand Down
1 change: 1 addition & 0 deletions docker/kbn-dev/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ elastic_versions=(
'7.17.9'
'7.17.10'
'7.17.11'
'7.17.12'
'8.0.0'
'8.1.0'
'8.2.1'
Expand Down
Loading