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

Compatibility with opensearch 2.17.1 #383

Merged
merged 39 commits into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
13caebb
Compatibility with OpenSearch 2.11.1 (#131)
yenienserrano Dec 22, 2023
2777683
Add script test packages (#133)
yenienserrano Jan 2, 2024
d00c20f
140 update the repo with the latest changes of wazuh dashboard (#141)
yenienserrano Feb 20, 2024
f84d2f1
Modify action to allow uploading artifact to S3 (#151)
Tostti Mar 20, 2024
fddb224
Modify package generation actions (#157)
Tostti Apr 4, 2024
328de49
Remove unrequired bundle
Tostti Apr 5, 2024
b3e557b
Fix service
Tostti Apr 5, 2024
85a1ea4
Fix repository tests (#163)
Tostti Apr 12, 2024
01bff25
Fix reference in building workflow
Tostti Apr 16, 2024
a5400ff
Fix tar error in build workflow (#168)
Tostti Apr 17, 2024
7088f9e
Fix errors in package build workflow (#169)
Tostti Apr 19, 2024
d6a0bd9
Add secret for aws region (#171)
Tostti Apr 24, 2024
7ac788d
Change default theme (#174)
Tostti May 10, 2024
9030f75
Add ID input to workflows (#179)
rauldpm May 17, 2024
a38c8c4
Fix css selector to login button (#181)
lucianogorza May 22, 2024
5904e49
Fix error generating packages in branches that contain `/` (#183)
Tostti May 23, 2024
602d123
Add information to build workflow title (#188)
Tostti May 28, 2024
42bbbbb
Build packages with docker (#185)
yenienserrano May 31, 2024
72bda15
Added S3 URI output to package generation upload (#190)
rauldpm Jun 5, 2024
38cd753
Added missing name statement in package generation workflows (#191)
rauldpm Jun 6, 2024
3371776
Added missing name statement in package generation workflows
Tostti Jun 19, 2024
ede1313
Sync 4.9.0 to 4.10.0 (#269)
yenienserrano Aug 19, 2024
2e75e8f
Change the path to the name of the application to the logo redirectio…
yenienserrano Aug 30, 2024
d223035
Remove setting new home (#282)
yenienserrano Sep 3, 2024
6b35cfb
Merge 4.9.1 into 4.10.0 (#306)
yenienserrano Sep 10, 2024
ad42837
Support Wazuh 5.0.0
yenienserrano Sep 10, 2024
0800bee
Integrates the reporting plugin into the construction process (#340)
yenienserrano Oct 9, 2024
4e0777c
Merge 4.10.2 into master (#367)
Tostti Oct 17, 2024
4549838
Fix home:useNewHomePage undefined
yenienserrano Oct 28, 2024
9b080f7
Fix snapshots
yenienserrano Oct 29, 2024
e7b2b16
Make upload to s3 optional (#384)
yenienserrano Oct 29, 2024
0598183
Add dockerfile and entrypoint
yenienserrano Oct 29, 2024
8ecae44
Create image with plugins
yenienserrano Oct 29, 2024
8d68801
Add install-plugins and entrypoint to wzd.dockerfile
yenienserrano Oct 30, 2024
4368516
change usage comment
yenienserrano Oct 30, 2024
bb643d1
Change entrypoint
yenienserrano Oct 31, 2024
8c387a6
Add commit sha of all repositories in package name (#390)
Tostti Nov 4, 2024
1a2f78e
Merge 4.10.2 into master (#398)
Tostti Nov 6, 2024
2210738
Change branch to use build
yenienserrano Nov 6, 2024
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
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/compatibility_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: Compatibility request
about: Suggest supporting a new version of OpenSearch
title: 'Compatibility with OpenSearch (version)'
labels: compatibility, level/task, type/research
assignees: ''

---

## Description
We need to ensure the UI compatibility with the next version of OpenSearch vX.X.
This update is still being discussed, but we need to be aware of potential issues.

For that, we need to:

- [ ] Review opensearch and opensearch-dashboard latest stable changelog.
- [ ] Identify improvements and potential impact on the UI.
- [ ] Create new tracking and development branches.
- [ ] Develop a testing environment to verify our components would work under this new build.


## Issues
- _List here the detected issues_
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/new_release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: New release
about: "[wazuh-team] Track the effort of the team to release a new version of Wazuh"
title: Support for Wazuh 4.x.x
labels: level/task, type/enhancement
assignees: ''

---

## Description

Example:
> Wazuh 4.3.8 will be released shortly. Our Wazuh Dashboard app need to support this new version. From our side, no changes will be included, so we only need to bump the version.


## Tasks

### Pre-release
- [ ] Add support for Wazuh 4.x.x (bump).
- [ ] Generate the required tags.
- [ ] Generate the packages.
- [ ] Test the packages, to verify they install, and the app works as expected.
- [ ] [Optional] Run Regression Testing (#issue)
- [ ] Generate draft releases.
- [ ] Notify the @wazuh/cicd and @wazuh/content teams that the release is good to go, from our side.

### Post-release
- [ ] Make draft releases final and public.
- [ ] Sync branches.

### Supported versions

Same as on [previous releases](https://github.com/wazuh/wazuh-dashboard/wiki/Compatibility)
78 changes: 45 additions & 33 deletions .github/workflows/build_and_test_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ name: Build and test
# trigger on every commit push and PR for all branches except feature branches and pushes for backport branches
on:
push:
branches: [ '**', '!feature/**', '!backport/**' ]
branches: ['**', '!feature/**', '!backport/**']
paths-ignore:
- '**/*.md'
- 'docs/**'
- '.lycheeignore'
- 'CODEOWNERS'
- 'changelogs/fragments/**'
pull_request:
branches: [ '**', '!feature/**' ]
branches: ['**', '!feature/**']
paths-ignore:
- '**/*.md'
- 'docs/**'
Expand All @@ -31,21 +31,21 @@ env:
TEST_OPENSEARCH_TRANSPORT_PORT: 9403
TEST_OPENSEARCH_PORT: 9400
OSD_SNAPSHOT_SKIP_VERIFY_CHECKSUM: true
NODE_OPTIONS: "--max-old-space-size=6144 --dns-result-order=ipv4first"
NODE_OPTIONS: '--max-old-space-size=6144 --dns-result-order=ipv4first'

jobs:
build-lint-test:
name: Build and Verify on ${{ matrix.name }} (ciGroup${{ matrix.group }})
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest] #Removed 'windows-latest'
group: [1, 2, 3, 4]
include:
- os: ubuntu-latest
name: Linux
- os: windows-latest
name: Windows
# - os: windows-latest
# name: Windows
runs-on: ${{ matrix.os }}
steps:
- name: Configure git's autocrlf (Windows only)
Expand All @@ -59,7 +59,7 @@ jobs:
with:
minimum-size: 16GB
maximum-size: 64GB
disk-root: "C:"
disk-root: 'C:'

- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -145,13 +145,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
os: [ubuntu-latest] #Removed 'windows-latest'
group: [1, 2, 4, 6, 7, 8, 9, 10, 11, 13]
include:
- os: ubuntu-latest
name: Linux
- os: windows-latest
name: Windows
# - os: windows-latest
# name: Windows
runs-on: ${{ matrix.os }}
steps:
- run: echo Running functional tests for ciGroup${{ matrix.group }}
Expand All @@ -167,7 +167,7 @@ jobs:
with:
minimum-size: 16GB
maximum-size: 64GB
disk-root: "C:"
disk-root: 'C:'

- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -262,12 +262,12 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest] #Removed 'windows-latest'
include:
- os: ubuntu-latest
name: Linux
- os: windows-latest
name: Windows
# - os: windows-latest
# name: Windows
runs-on: ${{ matrix.os }}
steps:
- run: echo Running plugin functional tests
Expand All @@ -283,7 +283,7 @@ jobs:
with:
minimum-size: 16GB
maximum-size: 64GB
disk-root: "C:"
disk-root: 'C:'

- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -383,21 +383,21 @@ jobs:
ext: tar.gz
suffix: linux-arm64
script: build-platform --linux-arm --skip-os-packages
- os: macos-latest
name: macOS x64
ext: tar.gz
suffix: darwin-x64
script: build-platform --darwin --skip-os-packages
- os: macos-latest
name: macOS ARM64
ext: tar.gz
suffix: darwin-arm64
script: build-platform --darwin-arm --skip-os-packages
- os: windows-latest
name: Windows x64
ext: zip
suffix: windows-x64
script: build-platform --windows --skip-os-packages
# - os: macos-latest
# name: macOS x64
# ext: tar.gz
# suffix: darwin-x64
# script: build-platform --darwin --skip-os-packages
# - os: macos-latest
# name: macOS ARM64
# ext: tar.gz
# suffix: darwin-arm64
# script: build-platform --darwin-arm --skip-os-packages
# - os: windows-latest
# name: Windows x64
# ext: zip
# suffix: windows-x64
# script: build-platform --windows --skip-os-packages
runs-on: ${{ matrix.os }}
defaults:
run:
Expand All @@ -415,7 +415,7 @@ jobs:
with:
minimum-size: 16GB
maximum-size: 64GB
disk-root: "C:"
disk-root: 'C:'

- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -492,7 +492,19 @@ jobs:
working-directory: ./artifacts
strategy:
matrix:
version: [osd-2.0.0, osd-2.1.0, osd-2.2.0, osd-2.3.0, osd-2.4.0, osd-2.5.0, osd-2.6.0, osd-2.7.0, osd-2.8.0, osd-2.9.0]
version:
[
osd-2.0.0,
osd-2.1.0,
osd-2.2.0,
osd-2.3.0,
osd-2.4.0,
osd-2.5.0,
osd-2.6.0,
osd-2.7.0,
osd-2.8.0,
osd-2.9.0,
]
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
97 changes: 97 additions & 0 deletions .github/workflows/build_base.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# This is a basic workflow that is manually triggered

name: Build base

on:
workflow_call:
inputs:
CHECKOUT_TO: # This is the branch to checkout to. Defaults to 'master'
description: 'The branch/tag/commit to checkout to'
required: true
default: ''
type: string
ARCHITECTURE:
description: 'The architecture to build the package for'
required: true
default: 'amd64'
type: string

workflow_dispatch:
inputs:
CHECKOUT_TO: # This is the branch to checkout to. Defaults to 'master'
description: 'The branch/tag/commit to checkout to'
required: true
default: ''
ARCHITECTURE:
description: 'The architecture to build the package for'
required: true
default: 'amd64'
type: string

jobs:
build:
runs-on: ${{ (inputs.ARCHITECTURE == 'x86_64' || inputs.ARCHITECTURE == 'amd64') && 'ubuntu-latest' || 'wz-linux-arm64' }}
name: Build
defaults:
run:
working-directory: ./artifacts
strategy:
matrix:
DISTRIBUTION: [tar.gz]

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
repository: wazuh/wazuh-dashboard
path: ./artifacts
ref: ${{ inputs.CHECKOUT_TO }}

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version-file: './artifacts/.nvmrc'
registry-url: 'https://registry.npmjs.org'

- name: Setup Yarn
run: |
npm uninstall -g yarn
npm i -g [email protected]
yarn config set network-timeout 1000000 -g

- name: Configure Yarn Cache
run: echo "YARN_CACHE_LOCATION=$(yarn cache dir)" >> $GITHUB_ENV

- name: Initialize Yarn Cache
uses: actions/cache@v3
with:
path: ${{ env.YARN_CACHE_LOCATION }}
key: yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
yarn-

- name: Get package version
run: |
echo "VERSION=$(yarn --silent pkg-version)" >> $GITHUB_ENV
echo "WZD_VERSION=$(yarn --silent wzd-version)" >> $GITHUB_ENV
echo "WZD_REVISION=$(yarn --silent wzd-revision)" >> $GITHUB_ENV

- name: Get artifact build name
run: |
echo "ARTIFACT_BUILD_NAME=wazuh-dashboard_${{ env.WZD_VERSION }}-${{ env.WZD_REVISION }}_${{ (inputs.ARCHITECTURE == 'x86_64' || inputs.ARCHITECTURE == 'amd64') && 'x64' || 'arm64' }}.${{ matrix.DISTRIBUTION }}" >> $GITHUB_ENV

- name: Run bootstrap
run: yarn osd bootstrap

- name: Build
run: yarn build-platform --${{(inputs.ARCHITECTURE == 'x86_64' || inputs.ARCHITECTURE == 'amd64') && 'linux' || 'linux-arm'}} --skip-os-packages --release

- name: Rename artifact
run: mv /home/runner/work/wazuh-dashboard/wazuh-dashboard/artifacts/target/opensearch-dashboards-${{ env.VERSION }}-linux-${{ (inputs.ARCHITECTURE == 'x86_64' || inputs.ARCHITECTURE == 'amd64') && 'x64' || 'arm64' }}.${{ matrix.DISTRIBUTION }} /home/runner/work/wazuh-dashboard/wazuh-dashboard/artifacts/target/${{ env.ARTIFACT_BUILD_NAME }}

- uses: actions/upload-artifact@v3
if: success()
with:
name: ${{ env.ARTIFACT_BUILD_NAME }}
path: ./artifacts/target/${{ env.ARTIFACT_BUILD_NAME }}
retention-days: 30
Loading
Loading