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.8.0 into master #6119

Merged
merged 26 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c90a6ae
Fix error when using chinese characters in username (#6076)
Tostti Nov 1, 2023
077ee53
Add ssl agent ca configuration entry (#6083)
asteriscos Nov 2, 2023
87f1baa
Bump 4.7.0 - Revision 02 - Alpha2 (#6090)
Tostti Nov 2, 2023
0744482
[Vulnerabilities dashboards] Add global vulnerabilities dashboards (#…
Machi3mfl Nov 3, 2023
7b12b0d
Update check service UI (#6093)
lucianogorza Nov 3, 2023
8651d16
Add applications to global menu (#5840)
Desvelao Nov 3, 2023
62988b0
Update dashboards (#6035)
chantal-kelm Nov 3, 2023
4ccd5c9
Add Github actions to run wazuh check updates plugin tests (#6096)
lucianogorza Nov 3, 2023
74c493a
Fix Security Events table query filter (#6102)
asteriscos Nov 7, 2023
b2c3ab4
Adapt the breadcrumbs to the platform (#6101)
yenienserrano Nov 7, 2023
2737506
Fix agent name validation (#6105)
Tostti Nov 8, 2023
226f7bb
Fix UI crash on retrieving log collection configuration for macos age…
jbiset Nov 8, 2023
059c2bd
Added query results limit when the search exceed 10000 hits (#6106)
Machi3mfl Nov 8, 2023
99ee146
Handle wazuh api error on check updates (#6103)
lucianogorza Nov 8, 2023
f63b6da
Fix tests in core plugin (#6111)
Desvelao Nov 9, 2023
4cacc85
Fix manual build workflow for current plugins (#6110)
Desvelao Nov 9, 2023
545eb92
Adapt and enhance the releasing tools (#6092)
Desvelao Nov 13, 2023
d69d81c
Fix Changelog 4.8.0
asteriscos Nov 13, 2023
b6454e5
Bump revision 03 for 4.7.0-RC1 (#6115)
Tostti Nov 13, 2023
2a6884b
Upgrade version axios (#6114)
Desvelao Nov 13, 2023
aa5b62a
Fix revision number to 00 in wazuh-core and wazuh-check-updates plugins
asteriscos Nov 13, 2023
c04ba02
merge: merge 4.7.0 into 4.7.1
Desvelao Nov 14, 2023
4e0dcbd
Merge 4.7.0 into 4.7.1 (#6117)
Desvelao Nov 14, 2023
8b8e944
merge: merge 4.7.1 into 4.8.0
Desvelao Nov 14, 2023
35992c5
Merge 4.7.1 into 4.8.0 (#6118)
Desvelao Nov 14, 2023
141200d
Merge branch '4.8.0' of https://github.com/wazuh/wazuh-kibana-app int…
Desvelao Nov 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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
Loading