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

Refine UI and Remove wazuh prefix #6155

Merged
merged 33 commits into from Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b340fe3
refine ui and remove wazuh prefix
JuanGarriuz Nov 27, 2023
87dc932
test fix
JuanGarriuz Nov 29, 2023
2c62179
test fixed
JuanGarriuz Nov 29, 2023
17176c0
Merge branch 'feat/6128-refine-ui-remove-wazuh-prefix' of https://git…
JuanGarriuz Nov 29, 2023
6edd0f9
Fixed a test bug
JuanGarriuz Nov 29, 2023
7c44979
Tests generalInfo and general-tab fixed
JuanGarriuz Nov 30, 2023
8cc1c12
Merge branch 'master' into feat/6128-refine-ui-remove-wazuh-prefix
JuanGarriuz Dec 1, 2023
046e868
Resolve conflicts
JuanGarriuz Dec 21, 2023
e17af9d
Wazuh Dashboard prefix remove
JuanGarriuz Dec 21, 2023
a726b51
Test fixed
JuanGarriuz Dec 21, 2023
d20074e
Merge branch 'master' into feat/6128-refine-ui-remove-wazuh-prefix
JuanGarriuz Dec 21, 2023
91de521
Merge branch 'master' into feat/6128-refine-ui-remove-wazuh-prefix
asteriscos Jan 11, 2024
68cd97c
Replace Wazuh in cache-api-user-has-run-as
asteriscos Jan 11, 2024
78bb713
Fix unit test
asteriscos Jan 11, 2024
1f1a267
Change to lowercase "Server"
JuanGarriuz Feb 21, 2024
b6697bc
Fix some wazuh prefix
JuanGarriuz Feb 23, 2024
0513db4
Merge branch '4.9.0' into feat/6128-refine-ui-remove-wazuh-prefix
JuanGarriuz Feb 23, 2024
1fb19c5
Merge branch '4.9.0' into feat/6128-refine-ui-remove-wazuh-prefix
JuanGarriuz Mar 20, 2024
3d3d2fa
Merge branch '4.9.0' into feat/6128-refine-ui-remove-wazuh-prefix
JuanGarriuz Mar 21, 2024
0f3a3be
Merge branch '4.9.0' into feat/6128-refine-ui-remove-wazuh-prefix
asteriscos Mar 22, 2024
0a58a61
PluginAppName comment has fixed
JuanGarriuz Mar 25, 2024
acc2553
snaps and constants updated
JuanGarriuz Mar 25, 2024
87fc785
test updated
JuanGarriuz Mar 25, 2024
0e46ec3
test updated
JuanGarriuz Mar 25, 2024
c21a8ab
Wazuh not ready yet changed
JuanGarriuz Mar 25, 2024
7973be4
endpoints.json wazuh prefix remove
JuanGarriuz Mar 26, 2024
0993cef
Add commnents to generate-api-data
JuanGarriuz Mar 26, 2024
3f2d38c
Added changelog
JuanGarriuz Mar 26, 2024
fa4276c
fix: replace some references to Wazuh
Desvelao Mar 27, 2024
e84c910
feat: update API data
Desvelao Mar 27, 2024
f51d25a
fix: label of documenation links
Desvelao Mar 27, 2024
9a6279f
changelog: edit entry
Desvelao Mar 27, 2024
95b924d
Merge branch '4.9.0' into feat/6128-refine-ui-remove-wazuh-prefix
asteriscos Apr 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/main/common/api-info/endpoints.json
Desvelao marked this conversation as resolved.
Show resolved Hide resolved
JuanGarriuz marked this conversation as resolved.
Show resolved Hide resolved
Expand Up @@ -1603,7 +1603,7 @@
{
"name": "/cluster/:node_id/stats/analysisd",
"documentation": "https://documentation.wazuh.com/4.8/user-manual/api/reference.html#operation/api.controllers.cluster_controller.get_stats_analysisd_node",
"description": "Return Wazuh analysisd statistical information in node {node_id}",
"description": "Return analysisd statistical information in node {node_id}",
"summary": "Get node stats analysisd",
"tags": [
"Cluster"
Expand Down Expand Up @@ -5231,7 +5231,7 @@
{
"name": "/manager/stats/analysisd",
"documentation": "https://documentation.wazuh.com/4.8/user-manual/api/reference.html#operation/api.controllers.manager_controller.get_stats_analysisd",
"description": "Return Wazuh analysisd statistical information",
"description": "Return analysisd statistical information",
"summary": "Get stats analysisd",
"tags": [
"Manager"
Expand Down
4 changes: 2 additions & 2 deletions plugins/main/common/config-equivalences.js
Expand Up @@ -3,7 +3,7 @@ import { ASSETS_PUBLIC_URL, PLUGIN_PLATFORM_NAME } from './constants';
export const configEquivalences = {
pattern:
"Default index pattern to use on the app. If there's no valid index pattern, the app will automatically create one with the name indicated in this option.",
'customization.logo.app': `Set the name of the app logo stored at ${ASSETS_PUBLIC_URL}. It is used while the user is logging into Wazuh API.`,
'customization.logo.app': `Set the name of the app logo stored at ${ASSETS_PUBLIC_URL}. It is used while the user is logging into the API.`,
'customization.logo.healthcheck': `Set the name of the health-check logo stored at ${ASSETS_PUBLIC_URL}`,
'customization.logo.reports': `Set the name of the reports logo (.png) stored at ${ASSETS_PUBLIC_URL}`,
'checks.pattern':
Expand All @@ -23,7 +23,7 @@ export const configEquivalences = {
'ip.selector':
'Define if the user is allowed to change the selected index pattern directly from the top menu bar.',
'ip.ignore':
'Disable certain index pattern names from being available in index pattern selector from the Wazuh app.',
'Disable certain index pattern names from being available in index pattern selector from the app.',
'wazuh.monitoring.enabled':
'Enable or disable the wazuh-monitoring index creation and/or visualization.',
'wazuh.monitoring.frequency':
Expand Down
4 changes: 2 additions & 2 deletions plugins/main/common/constants.ts
Expand Up @@ -304,7 +304,7 @@ export const PLUGIN_PLATFORM_REQUEST_HEADERS = {
};

// Plugin app
export const PLUGIN_APP_NAME = 'Wazuh dashboard';
export const PLUGIN_APP_NAME = 'Dashboard';

// UI
export const API_NAME_AGENT_STATUS = {
Expand Down Expand Up @@ -1151,7 +1151,7 @@ export const PLUGIN_SETTINGS: { [key: string]: TPluginSetting } = {
},
'customization.logo.app': {
title: 'App main logo',
description: `This logo is used as loading indicator while the user is logging into Wazuh API.`,
description: `This logo is used as loading indicator while the user is logging into API`,
category: SettingCategory.CUSTOMIZATION,
type: EpluginSettingType.filepicker,
defaultValue: '',
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/common/wazuh-modules.ts
Expand Up @@ -158,7 +158,7 @@ export const WAZUH_MODULES = {
devTools: {
title: 'API console',
appId: 'api-console',
description: 'Test the Wazuh API endpoints.',
description: 'Test the API endpoints.',
},
logtest: {
title: 'Test your logs',
Expand Down
90 changes: 50 additions & 40 deletions plugins/main/public/components/add-modules-data/guides/audit.js
@@ -1,24 +1,26 @@
/*
* Wazuh app - System auditing interactive extension guide
* Copyright (C) 2015-2022 Wazuh, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* Find more information about this on the LICENSE file.
*/
* Wazuh app - System auditing interactive extension guide
* Copyright (C) 2015-2022 Wazuh, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* Find more information about this on the LICENSE file.
*/

import { webDocumentationLink } from "../../../../common/services/web_documentation";
import { webDocumentationLink } from '../../../../common/services/web_documentation';

export default {
id: 'audit',
name: 'System auditing',
xml_tag: 'localfile',
description: 'Configuration options of the System auditing extension.',
category: 'Auditing and policy monitoring',
documentation_link: webDocumentationLink('user-manual/reference/ossec-conf/localfile.html'),
documentation_link: webDocumentationLink(
'user-manual/reference/ossec-conf/localfile.html',
),
icon: 'securityApp',
avaliable_for_manager: true,
avaliable_for_agent: true,
Expand All @@ -29,50 +31,54 @@ export default {
elements: [
{
name: 'log_format',
description: 'Set the format of the log to be read. field is required',
description:
'Set the format of the log to be read. field is required',
type: 'input',
required: true,
placeholder: 'audit',
default_value: 'audit',
field_read_only: true
field_read_only: true,
},
{
name: 'location',
description: 'Option to get the location of a log or a group of logs. strftime format strings may be used for log file names.',
description:
'Option to get the location of a log or a group of logs. strftime format strings may be used for log file names.',
type: 'input',
required: true,
placeholder: 'Log or group of logs location',
default_value: '/var/log/audit/audit.log',
field_read_only: true
field_read_only: true,
},
{
name: 'command',
description: 'Given a command output, it will be read as one or more log messages depending on command or full_command is used.',
description:
'Given a command output, it will be read as one or more log messages depending on command or full_command is used.',
type: 'input',
placeholder: 'Any command line, optionally including arguments'
placeholder: 'Any command line, optionally including arguments',
},
{
name: 'alias',
description: 'Change a command name in the log message.',
type: 'input',
placeholder: 'Alias'
placeholder: 'Alias',
},
{
name: 'frequency',
description: 'Prevents a command from being executed in less time than the specified time (in seconds). This options can be used with command and full_command.',
description:
'Prevents a command from being executed in less time than the specified time (in seconds). This options can be used with command and full_command.',
type: 'input-number',
values: { min: 1 },
default_value: '',
placeholder: 'Frequency',
validate_error_message: 'Any positive number of seconds'
validate_error_message: 'Any positive number of seconds',
},
{
name: 'only-future-events',
description: `Set it to no to collect events generated since Wazuh agent was stopped.
description: `Set it to no to collect events generated since agent was stopped.
By default, when Wazuh starts it will only read all log content from a given Windows Event Channel since the agent started.
This feature is only compatible with eventchannel log format.`,
type: 'switch',
default_value: true
default_value: true,
},
// { //Not for log_format audit
// name: 'query',
Expand All @@ -94,14 +100,16 @@ export default {
// },
{
name: 'target',
description: 'Target specifies the name of the socket where the output will be redirected. The socket must be defined previously.',
description:
'Target specifies the name of the socket where the output will be redirected. The socket must be defined previously.',
type: 'input',
default_value: 'agent',
placeholder: 'Any defined socket'
placeholder: 'Any defined socket',
},
{
name: 'out_format',
description: 'This option allows formatting logs from Logcollector using field substitution.',
description:
'This option allows formatting logs from Logcollector using field substitution.',
info: `log: Message from the log.
json_escaped_log: Message from the log, escaping JSON reserver characters.
output: Output from a command. Alias of log.
Expand All @@ -112,24 +120,26 @@ export default {
hostname: System’s host name.
host_ip: Host’s primary IP address.`,
type: 'input',
placeholder: 'Formatting logs from Logcollector using field substitution',
placeholder:
'Formatting logs from Logcollector using field substitution',
show_attributes: true,
attributes: [
{
name: 'target',
description: 'This option selects a defined target to apply the output format',
description:
'This option selects a defined target to apply the output format',
type: 'input',
required: true,
placeholder: 'Any target defined in the option <target>.'
}
]
placeholder: 'Any target defined in the option <target>.',
},
],
},
{
name: 'ignore_binaries',
description: `This specifies to ignore binary files, testing if the file is UTF8 or ASCII.
If this is set to yes and the file is, for example, a binary file, it will be discarded.`,
info: 'On Windows agents, it will also check if the file is encoded with UCS-2 LE BOM or UCS-2 BE BOM.',
type: 'switch'
type: 'switch',
},
{
name: 'age',
Expand All @@ -138,23 +148,23 @@ export default {
type: 'input',
placeholder: 'Time in format <number><time unit suffix>',
validate_error_message: `A positive number that should contain a suffix character indicating a time unit, such as, s (seconds), m (minutes), h (hours), d (days).`,
validate_regex: /^[1-9]\d*[s|m|h|d]$/
validate_regex: /^[1-9]\d*[s|m|h|d]$/,
},
{
name: 'exclude',
description: `This indicates the location of a wild-carded group of logs to be excluded.
For example, we may want to read all the files from a directory, but exclude those files whose name starts with an e.`,
type: 'input',
placeholder: 'Any log file or wildcard'
placeholder: 'Any log file or wildcard',
},
{
name: 'exclude',
description: `This indicates the location of a wild-carded group of logs to be excluded.
For example, we may want to read all the files from a directory, but exclude those files whose name starts with an e.`,
type: 'input',
placeholder: 'Any log file or wildcard'
}
]
}
]
}
placeholder: 'Any log file or wildcard',
},
],
},
],
};