Skip to content

Commit

Permalink
Merge 4.5.1 into 4.6.0 (#5671)
Browse files Browse the repository at this point in the history
* Change windows agent service name (#5538)

* Change windows agent service name to Wazuh

Change windows agent service name to Wazuh

* Add CHANGELOG

* Remove agent name in agent info ribbon (#5497)

* remove: agent name in agent info ribbon

* changelog: add pull request entry

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>

* Fix IPV6 visualizations (#5471)

* add ipv6 service

* add test for service

* Fix issue in agents-table

* fix issue in agents-info

* fix groups agents issue

* Fix width in groups agents

* use mapResponseItem

* Add copy button to groups

* Add copy button to info

* fix for node list

* Optimize code

* Fix styles

* Edit changelog

* Edit changelog

* Add imposter changes to test ipv6

* Replace onMouseDown with onClick

* Move copy buttons to the left

* fix: removed compressipv6 property of TableWzAPI

* feat: add tableLayout property to some tables and remove IPv6 address compression

add tableLayout=auto property to some tables:
- Agents/{agent_id}/Inventory data
- Management/Cluster/Nodes
- Agents
- Management/Configuration/Client
- Management/Global configuration/Remote
remove IPv6 address compression

* remove: remove unused service to IPv6 compression

* revert: revert changes in TableWzAPI component

* add: add mocked responses to some syscollector endpoints

* remove: unwanted table columns properties

* changelog: add pull request entry

* Fix imposter

---------

Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: yenienserrano <ian.serrano@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>

* Bump v4.4.4-2.6.0-rc2

* Add Apple Silicon architecture to the register Agent wizard (#5478)

* Add Apple Silicon architecture

* Add changelog

* Change macOS environment variables

* Revert "Change macOS environment variables"

This reverts commit 108e866.

* Change macOS architecture ids

* Add missing supported versions to the Docker environments (#5584)

feat(environments): add latest versions to Docker environments

- Add Kibana versions: 7.17.7, 7.17.8, 7.17.9 and 7.17.10
- Add OpenSearch: 2.6.0
- Add OpenSearch Dashboards: 2.6.0
- Add Wazuh 4.4.1, 4.4.2, 4.4.3 and 4.4.4

* Bump 4.5.1

* Change the method to make the redirect (#5539)

* Change the metod to make the redirect

* Remove unused code

* Add changelog

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>

* Fix agents active coverage stat as NaN (#5490)

* fix: agents active coverate stat as NaN

Ensure the values used to calculate have the expected types and
the total count is greater than 0.

* remove: unused openRegistrationDocs method

* changelog: add entry

* fix: check if agents active coverage is a NaN

* changelog: fix entry

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>

* [Backport 4.5.1] Update test snapshots for 4.5 (#5607)

* Update test snapshots for 4.5 (#5601)

* Add missing supported versions to the Docker environments (#5584)

feat(environments): add latest versions to Docker environments

- Add Kibana versions: 7.17.7, 7.17.8, 7.17.9 and 7.17.10
- Add OpenSearch: 2.6.0
- Add OpenSearch Dashboards: 2.6.0
- Add Wazuh 4.4.1, 4.4.2, 4.4.3 and 4.4.4

* Update test snapshost

* Update API data to 4.5

* Update branch patterns for GH Actions

---------

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
(cherry picked from commit 1ae5f19)

* Fix API reference links in endpoints.json

* Add kbn-dev 7.17.11 (#5628)

* Merge 4.5.0 into 4.5.1 (#5670)

* Update test snapshots for 4.5 (#5601)

* Add missing supported versions to the Docker environments (#5584)

feat(environments): add latest versions to Docker environments

- Add Kibana versions: 7.17.7, 7.17.8, 7.17.9 and 7.17.10
- Add OpenSearch: 2.6.0
- Add OpenSearch Dashboards: 2.6.0
- Add Wazuh 4.4.1, 4.4.2, 4.4.3 and 4.4.4

* Update test snapshost

* Update API data to 4.5

* Update branch patterns for GH Actions

---------

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>

* Fix API reference links in endpoints.json

* Merge 4.4 into 4.5.0 (#5669)

Merge v4.4.5-2.6.0 into 4.4 (#5665)

* Bump Wazuh and platform versions for v4.4.5 (#5639)

* Update changelog

* Update opensearch_dashboards.json

* Update package.json

* Update readme

* Update tag script

* Change tag.py version value

* Empty tag suffix

* Prepare tag.py for v4.4.5-rc1 (#5645)

Add -rc1 tag suffix

* Fix incompatible version of triple-beam subdependency (#5652)

fix: add yarn.lock file and set version of triple-beam in yarn.lock

* Update unit-test.yml (#5655)

* Add support for Wazuh 4.4.5-rc2 (#5659)

* Update revision of v4.4.5 in the Changelog

* Bump v4.4.5-2.6.0-rc2

---------

Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>

---------

Co-authored-by: Julio César Biset <43619595+jbiset@users.noreply.github.com>
Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
  • Loading branch information
7 people authored Jul 11, 2023
1 parent f332817 commit 3c5f965
Show file tree
Hide file tree
Showing 33 changed files with 5,051 additions and 1,840 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#
# Jest is a third-party software https://jestjs.io/


name: Run unit test

on:
Expand All @@ -22,13 +21,8 @@ on:
default: 'yarn test:jest'
description: Select the type of test to run.
options:
- 'yarn test:jest'
- '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
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ typings/
target/
build/

yarn.lock

cypress/node_modules/
cypress/.idea/
cypress/cypress.env.json
Expand All @@ -84,4 +82,4 @@ cypress/cookies.json
public/assets/custom/*

# Mac files
.DS_Store
.DS_Store
30 changes: 28 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,38 @@ All notable changes to the Wazuh app project will be documented in this file.
- Removed unnecessary requests in `Management/Status` section. [#5528](https://github.com/wazuh/wazuh-kibana-app/pull/5528)
- Removed obsolete code that caused duplicate requests to the api in `Management`. [#5485](https://github.com/wazuh/wazuh-kibana-app/pull/5485)

## 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

- Support for Wazuh 4.5.0

## Wazuh v4.4.5 - OpenSearch Dashboards 2.6.0 - Revision 02

### Added

- Support for Wazuh 4.4.5

## Wazuh v4.4.4 - OpenSearch Dashboards 2.6.0 - Revision 01

### Added
Expand Down Expand Up @@ -108,8 +134,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)
Expand Down
27 changes: 13 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -34,8 +34,8 @@

This repository contains a set of plugins for [Wazuh dashboard][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]
Expand All @@ -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

Expand Down Expand Up @@ -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
[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
17 changes: 17 additions & 0 deletions docker/images/kbn-7.17.11-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.11
RUN npm install --global @bazel/bazelisk@1.10.1
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
2 changes: 1 addition & 1 deletion docker/imposter/agents/agent.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
95 changes: 95 additions & 0 deletions docker/imposter/agents/group.json
Original file line number Diff line number Diff line change
@@ -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
}
26 changes: 13 additions & 13 deletions docker/imposter/cluster/node/response-with-everything.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,91 +5,91 @@
"name": "master-node",
"type": "master",
"version": "4.5.0",
"ip": "wazuh-master",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2020-05-27T10:50:49.175Z"
},
{
"name": "worker1",
"type": "worker",
"version": "4.5.0",
"ip": "172.26.0.7",
"ip": "FE80:1234:2223:A000:2202:B3FF:FE1E:8329",
"connection_date": "2021-05-27T10:50:51.342Z"
},
{
"name": "worker2",
"type": "worker",
"version": "4.5.0",
"ip": "172.26.0.6",
"ip": "127.0.0.2",
"connection_date": "2021-05-27T10:48:54.093Z"
},
{
"name": "worker3",
"type": "worker",
"version": "4.5.0",
"ip": "wazuh-worker",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2021-05-27T10:50:51.342Z"
},
{
"name": "worker4",
"type": "worker",
"version": "4.5.0",
"ip": "172.26.0.7",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2021-05-27T10:50:51.342Z"
},
{
"name": "worker5",
"type": "worker",
"version": "4.5.0",
"ip": "172.26.0.6",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2021-05-27T10:48:54.093Z"
},
{
"name": "worker6",
"type": "worker",
"version": "4.5.0",
"ip": "wazuh-worker",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2021-05-27T10:50:51.342Z"
},
{
"name": "worker7",
"type": "worker",
"version": "4.5.0",
"ip": "172.26.0.7",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2021-05-27T10:48:54.093Z"
},
{
"name": "worker8",
"type": "worker",
"version": "4.5.0",
"ip": "172.26.0.6",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2021-05-27T10:50:51.342Z"
},
{
"name": "worker9",
"type": "worker",
"version": "4.5.0",
"ip": "wazuh-worker",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2019-05-27T10:48:54.093Z"
},
{
"name": "worker10",
"type": "worker",
"version": "4.5.0",
"ip": "wazuh-worker",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2022-05-27T10:48:54.093Z"
},
{
"name": "worker11",
"type": "worker",
"version": "4.5.0",
"ip": "172.26.0.6",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2019-05-27T10:48:54.093Z"
},
{
"name": "worker12",
"type": "worker",
"version": "4.5.0",
"ip": "wazuh-worker",
"ip": "FE80:0034:0223:A000:0002:B3FF:0000:8329",
"connection_date": "2021-05-27T10:50:51.342Z"
}
],
Expand Down
Loading

0 comments on commit 3c5f965

Please sign in to comment.