Migrate wazuh.yml configuration to opensearch_dashboards.yml #7175

Machi3mfl · 2024-11-25T19:02:09Z

Description

This PR move the location of the wazuh.yml to opensearch_dashboards.yml

Test

Check the Dashboard `Management > Advanced settings` validations

Field	Type	Validations	Chrome	Firefox	Safari
alerts.sample.prefix	EpluginSettingType.text	- String - notEmpty - noSpaces - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#', '*')	⚫	⚫	⚫
configuration.ui_api_editable	EpluginSettingType.switch	- Boolean	⚫	⚫	⚫
cron.prefix	EpluginSettingType.text	- String - notEmpty - noSpaces - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>','#', '*')	⚫	⚫	⚫
customization.enabled	EpluginSettingType.switch	- Boolean	⚫	⚫	⚫
enrollment.dns	EpluginSettingType.text	- String - serverAddressHostnameFQDNIPv4IPv6	⚫	⚫	⚫
enrollment.password	EpluginSettingType.text	- String	⚫	⚫	⚫
hideManagerAlerts	EpluginSettingType.switch	- Boolean	⚫	⚫	⚫
ip.ignore	EpluginSettingType.editor	- Array of: - String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#')	⚫	⚫	⚫
ip.selector	EpluginSettingType.switch	- Boolean	⚫	⚫	⚫
wazuh.updates.disabled	EpluginSettingType.switch	- Boolean	⚫	⚫	⚫
pattern	EpluginSettingType.text	- String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#')	⚫	⚫	⚫
timeout	EpluginSettingType.number	- Number (min: 1500, integer)	⚫	⚫	⚫
vulnerabilities.pattern	EpluginSettingType.text	- String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', ',', '#')	⚫	⚫	⚫

Check the `opensearch_dashboards.yml` validations

Field	Type	Validations	Chrome	Firefox	Safari
hosts	EpluginSettingType.objectOf	`url`: - String - notEmpty `port`: - Number (0-65535) `username`: - String - notEmpty `password`: - String - notEmpty `run_as`: - Boolean	⚫	⚫	⚫

Check List

All tests pass
- yarn test:jest
New functionality includes testing.
New functionality has been documented.
Update CHANGELOG.md
Commits are signed per the DCO using --signoff

JuanGarriuz · 2024-12-23T10:57:42Z

Pre-test

Something is going wrong with the environment loading.

Grabacion.2024-12-02.123459.mp4

Change URL manually to app/management/opensearch-dashboards/settings

Test

Check the Dashboard `Management > Advanced settings` validations

Field	Type	Validations	Chrome	Firefox	Safari
alerts.sample.prefix	EpluginSettingType.text	- String - notEmpty - noSpaces - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#', '*')	🟢	⚫	⚫
configuration.ui_api_editable	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
cron.prefix	EpluginSettingType.text	- String - notEmpty - noSpaces - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>','#', '*')	🟢	⚫	⚫
customization.enabled	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
enrollment.dns	EpluginSettingType.text	- String - serverAddressHostnameFQDNIPv4IPv6	⚫	⚫	⚫
enrollment.password	EpluginSettingType.text	- String	🟢	⚫	⚫
hideManagerAlerts	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
ip.ignore	EpluginSettingType.editor	- Array of: - String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#')	🟢	⚫	⚫
ip.selector	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
wazuh.updates.disabled	EpluginSettingType.switch	- Boolean	⚫	⚫	⚫
pattern	EpluginSettingType.text	- String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#')	🟢	⚫	⚫
timeout	EpluginSettingType.number	- Number (min: 1500, integer)	🟢	⚫	⚫
vulnerabilities.pattern	EpluginSettingType.text	- String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', ',', '#')	🟢	⚫	⚫

Check the `opensearch_dashboards.yml` validations

Testing error message from

chantal-kelm

CR: ✅
TEST: ✅

Captura de pantalla 2024-12-23 a la(s) 6 00 58 p m

Captura de pantalla 2024-12-23 a la(s) 6 00 45 p m

Captura de pantalla 2024-12-23 a la(s) 6 00 28 p m

Captura de pantalla 2024-12-23 a la(s) 6 00 03 p m

Captura de pantalla 2024-12-23 a la(s) 5 59 44 p m

Captura de pantalla 2024-12-23 a la(s) 5 59 24 p m

Captura de pantalla 2024-12-23 a la(s) 5 59 00 p m

Captura de pantalla 2024-12-23 a la(s) 5 57 05 p m

Captura de pantalla 2024-12-23 a la(s) 5 56 23 p m

chantal-kelm

CR: ✅
TEST: ✅

Captura de pantalla 2024-12-24 a la(s) 11 30 16 a m

Captura de pantalla 2024-12-24 a la(s) 11 30 01 a m

Captura de pantalla 2024-12-24 a la(s) 11 29 44 a m

Captura de pantalla 2024-12-24 a la(s) 11 29 09 a m

Captura de pantalla 2024-12-24 a la(s) 11 28 39 a m

Captura de pantalla 2024-12-24 a la(s) 11 28 02 a m

Captura de pantalla 2024-12-24 a la(s) 11 27 46 a m

Captura de pantalla 2024-12-24 a la(s) 11 27 30 a m

Captura de pantalla 2024-12-24 a la(s) 11 27 12 a m

plugins/wazuh-core/server/services/manage-hosts.ts

plugins/wazuh-core/public/plugin.ts

plugins/wazuh-core/common/settings-adapter.ts

plugins/wazuh-core/common/services/configuration/configuration.test.ts

plugins/wazuh-core/common/services/configuration/configuration-store.test.ts

github-actions · 2024-12-26T17:42:50Z

Wazuh Engine plugin code coverage (Jest) test	%	values
Statements	8.63%	( 64 / 741 )
Branches	7.94%	( 22 / 277 )
Functions	1.87%	( 7 / 373 )
Lines	9.1%	( 64 / 703 )

github-actions · 2024-12-26T17:42:58Z

Wazuh Fleet plugin code coverage (Jest) test	%	values
Statements	4.68%	( 9 / 192 )
Branches	16.66%	( 7 / 42 )
Functions	1.11%	( 1 / 90 )
Lines	4.76%	( 9 / 189 )

github-actions · 2024-12-26T17:47:22Z

Main plugin code coverage (Jest) test	%	values
Statements	13.5%	( 4027 / 29825 )
Branches	9.02%	( 1749 / 19389 )
Functions	13.01%	( 943 / 7245 )
Lines	13.67%	( 3925 / 28708 )

guidomodarelli · 2024-12-26T19:34:03Z

Test

Check the Dashboard `Management > Advanced settings` validations

Field	Type	Validations	Chrome	Firefox	Safari
alerts.sample.prefix	EpluginSettingType.text	- String - notEmpty - noSpaces - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#', '*')	🟢	⚫	⚫
configuration.ui_api_editable	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
cron.prefix	EpluginSettingType.text	- String - notEmpty - noSpaces - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>','#', '*')	🟢	⚫	⚫
customization.enabled	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
enrollment.dns	EpluginSettingType.text	- String - serverAddressHostnameFQDNIPv4IPv6	🟢	⚫	⚫
enrollment.password	EpluginSettingType.text	- String	🟢	⚫	⚫
hideManagerAlerts	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
ip.ignore	EpluginSettingType.editor	- Array of: - String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#')	🟢	⚫	⚫
ip.selector	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
wazuh.updates.disabled	EpluginSettingType.switch	- Boolean	🟢	⚫	⚫
pattern	EpluginSettingType.text	- String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', '#')	🟢	⚫	⚫
timeout	EpluginSettingType.number	- Number (min: 1500, integer)	🟢	⚫	⚫
vulnerabilities.pattern	EpluginSettingType.text	- String - notEmpty - noSpaces - noLiteralString('.', '..') - noStartsWith('-', '_', '+', '.') - noInvalidCharacters('\', '/', '?', '"', '<', '>', ',', '#')	🟢	⚫	⚫

Check the `opensearch_dashboards.yml` validations

Field	Type	Validations	Chrome	Firefox	Safari
hosts	EpluginSettingType.objectOf	`url`: - String - notEmpty `port`: - Number (0-65535) `username`: - String - notEmpty `password`: - String - notEmpty `run_as`: - Boolean	🔴	⚫	⚫

alerts.sample.prefix 🟢

notEmpty

noSpaces

noStartsWith('-', '_', '+', '.')

noInvalidCharacters('\', '/', '?', '"', '<', '>', '#', '*')

configuration.ui_api_editable 🟢

cron.prefix 🟢

notEmpty

noSpaces

noStartsWith('-', '_', '+', '.')

noInvalidCharacters('\', '/', '?', '"', '<', '>', '#', '*')

customization.enabled 🟢

enrollment.dns 🟢

enrollment.password 🟢

hideManagerAlerts 🟢

ip.ignore 🟢

Array of

ip.selector 🟢

wazuh.updates.disabled 🟢

pattern 🟢

timeout 🟢

vulnerabilities.pattern 🟢

opensearch_dashboards.yml » hosts 🔴

url: String 🟢

url: notEmpty 🟢

port: -1 🔴

port: 65536 🔴

port: Number 🟢

username: String 🟢

username: notEmpty 🟢

password: String 🟢

password: notEmpty 🟢

run_as: Boolean 🟢

Machi3mfl · 2024-12-30T15:42:54Z

Fixed opensearch_dashboards.yml » hosts validation

Host with negative value on yml

Validation error on start osd server

C.C: @guidomodarelli.

github-actions · 2024-12-30T15:46:55Z

Wazuh Check Updates plugin code coverage (Jest) test	%	values
Statements	76.44%	( 172 / 225 )
Branches	58.65%	( 61 / 104 )
Functions	61.7%	( 29 / 47 )
Lines	76.44%	( 172 / 225 )

github-actions · 2024-12-30T15:46:56Z

Wazuh Core plugin code coverage (Jest) test	%	values
Statements	30.36%	( 621 / 2045 )
Branches	30.19%	( 333 / 1103 )
Functions	27.53%	( 155 / 563 )
Lines	30.51%	( 616 / 2019 )

guidomodarelli · 2024-12-30T15:52:55Z

Check the `opensearch_dashboards.yml` validations

Field	Type	Validations	Chrome	Firefox	Safari
hosts	EpluginSettingType.objectOf	`url`: - String - notEmpty `port`: - Number (0-65535) `username`: - String - notEmpty `password`: - String - notEmpty `run_as`: - Boolean	🟢	⚫	⚫

port: -1 🟢

port: 65536 🟢

guidomodarelli

LGTM 🟢

Machi3mfl and others added 23 commits November 25, 2024 15:59

Added wazuh configuration in wazuh_core plugin

e2ecc3d

Add hosts config on opensearch_dashboards.yml

ea8ad34

Merge branch 'master' into enhancement/migrate-wazuh-configuration

4c25766

Add advanced settings (ui_settings)

25886e3

Move all configurations to yml and ui settings

0467def

Add new configuration providers and repository

c7922d3

Update providers

c933616

Update core with new configuration store interface

4855482

Fix main errores

94a9dad

Create configuration services folder on common

1dacb0b

Update server configuration services and types

634f43d

Create public configuration types

511b3e5

Apply new configuration store implementation on server

d6b66e5

Apply new configuration store implementation on public context

9a4d2fe

Moved ui settings to common

3ab5831

Update providers and configuration types

e5d0f95

Use configuration service on public

4fc58e2

Add configuration store unit tests

ff50249

Update configuration service unit tests

86bc999

Adapt the plugin settings to ui settings

bced596

Use settings adapter to create plugin config

d6ae59d

Merge branch 'master' into enhancement/migrate-wazuh-configuration

ddea925

Fix conflicts with master

da87f62

Machi3mfl marked this pull request as ready for review December 20, 2024 19:27

Machi3mfl added 2 commits December 20, 2024 16:36

Apply prettier

f8e7b16

Apply prettier

2382b23

chantal-kelm self-requested a review December 20, 2024 20:03

chantal-kelm assigned Machi3mfl Dec 20, 2024

yenienserrano self-requested a review December 20, 2024 20:27

chantal-kelm previously approved these changes Dec 23, 2024

View reviewed changes

Machi3mfl dismissed chantal-kelm’s stale review via 42c49c0 December 24, 2024 12:01

Machi3mfl added 7 commits December 24, 2024 09:24

Fix linter errors

6db1a11

Fix linter errors

72c36c5

Fix linter error

cd37ed7

Fix linter errors

f42c941

Fix linter errors

1b69592

Apply prettier

7d3ab5f

Fix errors and unit tests

5fa2c4a

JuanGarriuz previously approved these changes Dec 24, 2024

View reviewed changes

chantal-kelm previously approved these changes Dec 24, 2024

View reviewed changes

guidomodarelli requested changes Dec 24, 2024

View reviewed changes

yenienserrano removed their request for review December 26, 2024 12:42

Resolve requested changes

0b38816

Machi3mfl dismissed stale reviews from chantal-kelm and JuanGarriuz via 0b38816 December 26, 2024 17:40

Add port number validation

473271a

Merge branch 'master' into enhancement/migrate-wazuh-configuration

c25b048

JuanGarriuz approved these changes Dec 30, 2024

View reviewed changes

guidomodarelli approved these changes Dec 30, 2024

View reviewed changes

Tostti merged commit 09dd139 into master Dec 30, 2024
5 checks passed

Tostti deleted the enhancement/migrate-wazuh-configuration branch December 30, 2024 16:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate wazuh.yml configuration to opensearch_dashboards.yml #7175

Migrate wazuh.yml configuration to opensearch_dashboards.yml #7175

Machi3mfl commented Nov 25, 2024 •

edited

Loading

JuanGarriuz commented Dec 23, 2024 •

edited

Loading

chantal-kelm left a comment

chantal-kelm left a comment

github-actions bot commented Dec 26, 2024

github-actions bot commented Dec 26, 2024

github-actions bot commented Dec 26, 2024

guidomodarelli commented Dec 26, 2024 •

edited

Loading

Machi3mfl commented Dec 30, 2024

github-actions bot commented Dec 30, 2024

github-actions bot commented Dec 30, 2024

guidomodarelli commented Dec 30, 2024 •

edited

Loading

guidomodarelli left a comment

Migrate wazuh.yml configuration to opensearch_dashboards.yml #7175

Migrate wazuh.yml configuration to opensearch_dashboards.yml #7175

Conversation

Machi3mfl commented Nov 25, 2024 • edited Loading

Description

Test

Check the Dashboard Management > Advanced settings validations

Check the opensearch_dashboards.yml validations

Check List

JuanGarriuz commented Dec 23, 2024 • edited Loading

Pre-test

Test

Check the Dashboard Management > Advanced settings validations

Check the opensearch_dashboards.yml validations

chantal-kelm left a comment

Choose a reason for hiding this comment

chantal-kelm left a comment

Choose a reason for hiding this comment

github-actions bot commented Dec 26, 2024

github-actions bot commented Dec 26, 2024

github-actions bot commented Dec 26, 2024

guidomodarelli commented Dec 26, 2024 • edited Loading

Test

Check the Dashboard Management > Advanced settings validations

Check the opensearch_dashboards.yml validations

Machi3mfl commented Dec 30, 2024

Fixed opensearch_dashboards.yml » hosts validation

Host with negative value on yml

Validation error on start osd server

github-actions bot commented Dec 30, 2024

github-actions bot commented Dec 30, 2024

guidomodarelli commented Dec 30, 2024 • edited Loading

Check the opensearch_dashboards.yml validations

guidomodarelli left a comment

Choose a reason for hiding this comment

Machi3mfl commented Nov 25, 2024 •

edited

Loading

Check the Dashboard `Management > Advanced settings` validations

Check the `opensearch_dashboards.yml` validations

JuanGarriuz commented Dec 23, 2024 •

edited

Loading

Check the Dashboard `Management > Advanced settings` validations

Check the `opensearch_dashboards.yml` validations

guidomodarelli commented Dec 26, 2024 •

edited

Loading

Check the Dashboard `Management > Advanced settings` validations

Check the `opensearch_dashboards.yml` validations

guidomodarelli commented Dec 30, 2024 •

edited

Loading

Check the `opensearch_dashboards.yml` validations