Skip to content

Commit

Permalink
Merge branch '4.4-7.10' into feat/centralize-plugin-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexRuiz7 authored Oct 20, 2022
2 parents 19c7cac + 9f53850 commit dc79490
Show file tree
Hide file tree
Showing 129 changed files with 2,766 additions and 1,226 deletions.
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

38 changes: 0 additions & 38 deletions .eslintrc.js

This file was deleted.

91 changes: 91 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
{
"root": true,
"env": {
"browser": true,
"node": true,
"jest": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"overrides": [],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"react",
"react-hooks",
"@typescript-eslint",
"prettier",
"filenames-simple"
],
"settings": {
"import/resolver": {
"typescript": {}
},
"react": {
"version": "16.12.0"
}
},
"ignorePatterns": [
"node_modules/",
"public/utils/codemirror/",
"public/kibana-integrations/",
"public/utils/jquery-ui.js"
],
"rules": {
"filenames-simple/naming-convention": "error",
"indent": ["error", 2, { "SwitchCase": 1 }],
"quotes": ["error", "single"],
"semi": ["error", "always"],
"react/react-in-jsx-scope": "off",
"camelcase": "error",
"spaced-comment": "error",
"no-duplicate-imports": "error",
"no-await-in-loop": "error",
"block-scoped-var": "error",
"curly": "error",
"default-case": "error",
"default-param-last": "error",
"eqeqeq": "error",
"no-var": "error",
"require-await": "error",
"array-bracket-newline": ["error", "consistent"],
"array-bracket-spacing": [
"error",
"always",
{
"singleValue": false
}
],
"array-element-newline": ["error", "always"],
"arrow-parens": ["error", "as-needed"],
"arrow-spacing": "error",
"block-spacing": "error",
"comma-spacing": [
"error",
{
"before": false,
"after": true
}
],
"func-call-spacing": ["error", "never"],
"function-call-argument-newline": ["error", "consistent"],
"max-len": [
"error",
{
"code": 100
}
],
"no-trailing-spaces": "error",
"semi-spacing": "error"
}
}
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# This should match the owning team set up in https://github.com/orgs/wazuh/teams
* @wazuh/frontend
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: enhancement
assignees: ''

---

## Description

Example:
> Wazuh 4.3.8 will be released shortly. Our Wazuh-dashboard and Kibana needs 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 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-kibana-app/wiki/Compatibility)
19 changes: 19 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Description
[Describe what this change achieves]

### Issues Resolved
[List any issues this PR will resolve]

### Evidence
[Provide screenshots or videos to prove this PR solves the issues]

### Test
[Provide instructions to test this PR]

### Check List
- [ ] All tests pass
- [ ] `yarn test:jest`
- [ ] New functionality includes testing.
- [ ] New functionality has been documented.
- [ ] Update [CHANGELOG.md](./../CHANGELOG.md)
- [ ] Commits are signed per the DCO using --signoff
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
backport:
name: Backport
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
# Only react to merged PRs for security reasons.
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
if: >
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This workflow builds a production-ready package from the given Git reference.
# Any branch, tag or commit SHA existing in the origin can be used.
#
# This workflow is based on the `dev-environment` workflow.

name: Build

on:
workflow_dispatch:
inputs:
reference:
required: true
type: string
default: master
description: Source code reference (branch, tag or commit SHA)

jobs:
# Build an app package from the given source code reference.
build:
name: Build app package
uses: ./.github/workflows/dev-environment.yml
with:
reference: ${{ github.event.inputs.reference }}
command: 'yarn build'
archive_name: 'wazuh-package'
archive_path: './wazuh/build'
secrets: inherit
44 changes: 0 additions & 44 deletions .github/workflows/create-wazuh-packages.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/cypress-basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
jobs:
setup-wazuh-kibana-app:
name: Run setup environment wazuh kibana app
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Step 01 - Set up environment variables
run: |
Expand Down Expand Up @@ -86,7 +86,6 @@ jobs:
run: |
cd ${{ env.PATH_TEMPLATE }}
docker exec $(docker-compose ps -q cypress) bash -c " . /home/automation/nvm/nvm.sh && nvm use && npm run cypress:report"
docker exec $(docker-compose ps -q cypress) bash -c "cp -R /home/automation/wazuh-cypress/cypress/* /home/automation/wazuh-cypress/cypress-slack"
- name: Step 09 - Archive reports
uses: actions/upload-artifact@v2
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cypress-odfe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ on:
jobs:
setup-wazuh-kibana-app:
name: Run setup environment wazuh kibana app
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Step 01 - Set up environment variables
run: |
Expand Down Expand Up @@ -92,7 +92,6 @@ jobs:
run: |
cd ${{ env.PATH_TEMPLATE }}
docker exec $(docker-compose ps -q cypress) bash -c " . /home/automation/nvm/nvm.sh && nvm use && npm run cypress:report"
docker exec $(docker-compose ps -q cypress) bash -c "cp -R /home/automation/wazuh-cypress/cypress/* /home/automation/wazuh-cypress/cypress-slack"
- name: Step 09 - Archive reports
uses: actions/upload-artifact@v2
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cypress-wzd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
jobs:
setup-wazuh-dashboard-app:
name: Run setup environment wazuh dashboard app
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Step 01 - Set up environment variables
run: |
Expand Down Expand Up @@ -83,7 +83,6 @@ jobs:
run: |
cd ${{ env.PATH_TEMPLATE }}
docker exec $(docker-compose ps -q cypress) bash -c " . /home/automation/nvm/nvm.sh && nvm use && npm run cypress:report"
docker exec $(docker-compose ps -q cypress) bash -c "cp -R /home/automation/wazuh-cypress/cypress/* /home/automation/wazuh-cypress/cypress-slack"
- name: Step 09 - Archive reports
uses: actions/upload-artifact@v2
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/cypress-xpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:
jobs:
setup-wazuh-kibana-app:
name: Run setup environment wazuh kibana app
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- name: Step 01 - Set up environment variables
run: |
Expand Down Expand Up @@ -87,7 +87,6 @@ jobs:
run: |
cd ${{ env.PATH_TEMPLATE }}
docker exec $(docker-compose ps -q cypress) bash -c " . /home/automation/nvm/nvm.sh && nvm use && npm run cypress:report"
docker exec $(docker-compose ps -q cypress) bash -c "cp -R /home/automation/wazuh-cypress/cypress/* /home/automation/wazuh-cypress/cypress-slack"
- name: Step 09 - Archive reports
uses: actions/upload-artifact@v2
with:
Expand Down
Loading

0 comments on commit dc79490

Please sign in to comment.