Skip to content

Commit

Permalink
Merge branch '4.8.0' of https://github.com/wazuh/wazuh-kibana-app int…
Browse files Browse the repository at this point in the history
…o merge-4.8.0-into-master
  • Loading branch information
Desvelao committed Nov 14, 2023
2 parents e6e9e2b + 35992c5 commit 141200d
Show file tree
Hide file tree
Showing 357 changed files with 39,310 additions and 14,359 deletions.
40 changes: 29 additions & 11 deletions .github/workflows/dev-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,33 @@ on:
default: false
required: false

env:
MAIN_PLUGIN_PATH: 'wazuh/plugins/main'

jobs:
# Deploy the plugin in a development environment and run a command
# using a pre-built Docker image, hosted in Quay.io.
deploy_and_run_command:
name: Deploy and run command
runs-on: ubuntu-latest
strategy:
matrix:
plugins:
[
{
name: 'Main',
path: 'wazuh/plugins/main',
container_path: 'wazuh',
},
{
name: 'Wazuh Check Updates',
path: 'wazuh/plugins/wazuh-check-updates',
container_path: 'wazuh-check-updates',
},
{
name: 'Wazuh Core',
path: 'wazuh/plugins/wazuh-core',
container_path: 'wazuh-core',
},
]

steps:
- name: Step 01 - Download the plugin's source code
uses: actions/checkout@v3
Expand All @@ -65,13 +83,13 @@ jobs:
# Detect which platform to use from source code
platform=kbn;
echo "Detecting platform [kbn, osd]...";
find ${{ env.MAIN_PLUGIN_PATH }}/opensearch_dashboards.json && { platform=osd; };
find ${{ matrix.plugins.path }}/opensearch_dashboards.json && { platform=osd; };
echo "Platform is $platform";
# Read the platform version from the package.json file
echo "Reading the platform version from the package.json...";
# Support plugins whose version is defined under pluginPlatform or Kibana properties
platform_version=$(jq -r '.pluginPlatform.version, .kibana.version | select(. != null)' ${{ env.MAIN_PLUGIN_PATH }}/package.json);
platform_version=$(jq -r '.pluginPlatform.version, .kibana.version | select(. != null)' ${{ matrix.plugins.path }}/package.json);
echo "Plugin platform version: $platform_version";
# Set the environment variable to the correct platform
Expand All @@ -81,26 +99,26 @@ jobs:
# Up the environment and run the command
docker run -t --rm \
-e ${docker_env_plugin_platform}=${platform_version} \
-v `pwd`/${{ env.MAIN_PLUGIN_PATH }}:/home/node/kbn/plugins/wazuh \
-v `pwd`/${{ matrix.plugins.path }}:/home/node/kbn/plugins/${{ matrix.plugins.container_path }} \
${{ inputs.docker_run_extra_args }} \
quay.io/wazuh/${platform}-dev:${platform_version} \
bash -c '
yarn config set registry https://registry.yarnpkg.com;
cd /home/node/kbn/plugins/wazuh && yarn && ${{ inputs.command }};
cd /home/node/kbn/plugins/${{ matrix.plugins.container_path }} && yarn && ${{ inputs.command }};
'
- name: Step 04 - Upload artifact to GitHub
if: ${{ inputs.artifact_name && inputs.artifact_path }}
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.artifact_name }}
path: ${{env.MAIN_PLUGIN_PATH}}/${{ inputs.artifact_path }}
path: ${{ matrix.plugins.path }}/${{ inputs.artifact_path }}
if-no-files-found: 'error'

- name: Step 05 - Upload coverage results to GitHub
if: ${{ inputs.notify_jest_coverage_summary && github.event_name == 'pull_request' }}
uses: AthleticNet/comment-test-coverage@1.2.2
uses: lucianogorza/comment-test-coverage@1.0.3
with:
token: ${{ secrets.GITHUB_TOKEN }}
path: ./${{ env.MAIN_PLUGIN_PATH }}/target/test-coverage/coverage-summary.json
title: "Code coverage (Jest)"
path: ./${{ matrix.plugins.path }}/target/test-coverage/coverage-summary.json
title: '${{ matrix.plugins.name }} plugin code coverage (Jest) test'
30 changes: 29 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,43 @@ All notable changes to the Wazuh app project will be documented in this file.
### Added

- Support for Wazuh 4.8.0
- Added the ability to check if there are available updates from the UI. [#6093](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6093)
- Added remember server address check [#5791](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5791)
- Added the ssl_agent_ca configuration to the SSL Settings form [#6083](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6083)
- Added global vulnerabilities dashboards [#5896](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5896)
- Added an agent selector to the IT Hygiene application [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Added query results limit when the search exceed 10000 hits [#6106](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6106)

### Changed

- Moved the plugin menu to platform applications into the side menu [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Changed dashboards. [#6035](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6035)
- Change the display order of tabs in all modules. [#6067](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6067)
- Upgraded the `axios` dependency to `1.6.1` [#5062](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5062)

### Fixed

- Fixed a problem with the agent menu header when the side menu is docked [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Fixed how the query filters apply on the Security Alerts table [#6102](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6102)

### Removed

- Removed the `disabled_roles` and `customization.logo.sidebar` settings [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)
- Removed the ability to configure the visibility of modules and removed `extensions.*` settings [#5840](https://github.com/wazuh/wazuh-dashboard-plugins/pull/5840)

## Wazuh v4.7.1 - OpenSearch Dashboards 2.8.0 - Revision 00

### Added

- Support for Wazuh 4.7.1

## Wazuh v4.7.0 - OpenSearch Dashboards 2.8.0 - Revision 01
### Fixed

- Fixed problem when using non latin characters in the username [#6076](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6076)
- Fixed UI crash on retrieving log collection configuration for macos agent. [#6104](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6104)
- Fixed incorrect validation of the agent name on the Deploy new agent window [#6105](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6105)

## Wazuh v4.7.0 - OpenSearch Dashboards 2.8.0 - Revision 03

### Added

Expand Down
Loading

0 comments on commit 141200d

Please sign in to comment.