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.

Sign up for GitHub

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 master into feat/83-move-menu-items-to-applications #5901

Merged
merged 3 commits into from
Sep 19, 2023
Merged

Merge master into feat/83-move-menu-items-to-applications #5901

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5acda5f
Merge master into feat/83-move-menu-items-to-applications
Desvelao Sep 19, 2023
9e8d7d7
fix: remove comment on test file
Desvelao Sep 19, 2023
5224a83
fix: remove comment on test file
Desvelao Sep 19, 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
10 changes: 3 additions & 7 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ labels: bug
assignees: ''
---

| Wazuh | Elastic | Rev | Security |
| ----- | ------- | ---- | -------- |
| 4.x | 7.x | 4xxx | Basic, ODFE, Xpack |

| Browser |
| ------- |
| Chrome, Firefox, Safari, etc|
| Wazuh | Rev | Browser |
|-------|------|------------------------------|
| X.Y.Z | xyzw | Chrome, Firefox, Safari, etc |

**Description**
Short description of your issue.
Expand Down
25 changes: 20 additions & 5 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

All notable changes to the Wazuh app project will be documented in this file.

## Wazuh v4.8.0 - OpenSearch Dashboards 2.6.0 - Revision 01
## Wazuh v4.8.0 - OpenSearch Dashboards 2.9.0 - Revision 00

### Added

- Support for Wazuh 4.8.0

## Wazuh v4.7.0 - OpenSearch Dashboards 2.6.0 - Revision 01
## Wazuh v4.7.0 - OpenSearch Dashboards 2.9.0 - Revision 00

### Added

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

- Removed views in JSON and XML formats from management settings. [#5747](https://github.com/wazuh/wazuh-kibana-app/pull/5747)

## Wazuh v4.6.0 - OpenSearch Dashboards 2.6.0 - Revision 01
## Wazuh v4.6.0 - OpenSearch Dashboards 2.8.0 - Revision 00

### Added

Expand All @@ -43,6 +43,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 @@ -51,6 +53,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) [#5813](https://github.com/wazuh/wazuh-kibana-app/pull/5813)

### Fixed

Expand All @@ -67,6 +70,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,13 +83,24 @@ 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.2 - OpenSearch Dashboards 2.6.0 - Revision 01
## Wazuh v4.5.3 - OpenSearch Dashboards 2.6.0 - Revision 01

### Added

- Support for Wazuh 4.5.3

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

### Added

- 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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Frontend development environments

Install [Docker Desktop][0] as per its instructions, available for Windows, Mac
Install [Docker Desktop][0] as per its instructions (make sure that the docker compose version is 2.20.2 or higher), available for Windows, Mac
and Linux (Ubuntu, Debian & Fedora).
This ensures that the development experience between Linux, Mac and Windows is as
similar as possible.
Expand Down Expand Up @@ -289,4 +289,4 @@ error getting credentials - err: exit status 1, out: `error getting credentials
[2]: <https://grafana.com/oss/loki/> "Loki"
[3]: <https://prometheus.io/docs/visualization/grafana/> "Prometheus"
[4]: <https://quay.io/organization/wazuh> "quay.io/wazuh"
[5]: <https://github.com/wazuh/wazuh-kibana-app/issues/3872#issuecomment-1305507626> "App permissions"
[5]: <https://github.com/wazuh/wazuh-kibana-app/issues/3872#issuecomment-1305507626> "App permissions"
17 changes: 17 additions & 0 deletions docker/images/kbn-7.17.12-dev.Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
35 changes: 28 additions & 7 deletions docker/imposter/agents/agents.json
View file
Open in desktop
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 All @@ -228,4 +249,4 @@
},
"message": "All selected agents information was returned",
"error": 0
}
}
2 changes: 1 addition & 1 deletion docker/imposter/api-info/api_info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"timestamp": "2022-06-13T17:20:03Z"
},
"error": 0
}
}
1 change: 1 addition & 0 deletions docker/kbn-dev/dev.sh
View file
Open in desktop
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
Loading