-
+
Last registered agent
@@ -77,7 +77,9 @@ export class WzStatusAgentInfo extends Component {
Status
- {agentStatusLabelByAgentStatus(agentInfo.status)}
+
+ {agentStatusLabelByAgentStatus(agentInfo.status)}
+
IP address
@@ -85,13 +87,17 @@ export class WzStatusAgentInfo extends Component {
Date added
- {formatUIDate(agentInfo.dateAdd)}
+
+ {formatUIDate(agentInfo.dateAdd)}
+
{status !== API_NAME_AGENT_STATUS.NEVER_CONNECTED && (
Version
- {agentInfo.version || '-'}
+
+ {agentInfo.version || '-'}
+
Last keep alive
@@ -114,7 +120,7 @@ export class WzStatusAgentInfo extends Component {
const mapStateToProps = state => {
return {
- state: state.statusReducers
+ state: state.statusReducers,
};
};
diff --git a/plugins/main/public/react-services/check-daemons-status.js b/plugins/main/public/react-services/check-daemons-status.js
index b2a3bc7b02..7b263862d7 100644
--- a/plugins/main/public/react-services/check-daemons-status.js
+++ b/plugins/main/public/react-services/check-daemons-status.js
@@ -39,7 +39,7 @@ export class CheckDaemonsStatus {
throw new Error('Not recovered');
}
} catch (error) {
- store.dispatch(updateWazuhNotReadyYet('Wazuh could not be recovered.'));
+ store.dispatch(updateWazuhNotReadyYet('Server could not be recovered.'));
throw error;
}
busy = false;
diff --git a/plugins/main/public/react-services/error-handler.ts b/plugins/main/public/react-services/error-handler.ts
index dd73442e1a..3bf1e5bb52 100644
--- a/plugins/main/public/react-services/error-handler.ts
+++ b/plugins/main/public/react-services/error-handler.ts
@@ -22,9 +22,12 @@ interface IHistoryItem {
const wzMisc = new WzMisc();
let history = [];
const filterHistoryTimeInMs = 2000;
-const filterRecentHistory = (date) =>
- history.filter((item: IHistoryItem) => date - item.date <= filterHistoryTimeInMs);
-const isErrorRecentlyShown = (text) => history.some((item: IHistoryItem) => item.text === text);
+const filterRecentHistory = date =>
+ history.filter(
+ (item: IHistoryItem) => date - item.date <= filterHistoryTimeInMs,
+ );
+const isErrorRecentlyShown = text =>
+ history.some((item: IHistoryItem) => item.text === text);
export class ErrorHandler {
/**
@@ -35,9 +38,10 @@ export class ErrorHandler {
if ((error || {}).status === -1) {
const origin = ((error || {}).config || {}).url || '';
const isFromAPI =
- origin.includes('/api/request') ||
- origin.includes('/api/csv');
- return isFromAPI ? 'Wazuh API is not reachable. Reason: timeout.' : 'Server did not respond';
+ origin.includes('/api/request') || origin.includes('/api/csv');
+ return isFromAPI
+ ? 'API is not reachable. Reason: timeout.'
+ : 'Server did not respond';
}
if ((((error || {}).response || {}).data || {}).message) {
@@ -139,9 +143,9 @@ export class ErrorHandler {
const message = ErrorHandler.extractMessage(error);
const messageIsString = typeof message === 'string';
if (messageIsString && message.includes('ERROR3099')) {
- const updateNotReadyYet = updateWazuhNotReadyYet('Wazuh not ready yet.');
+ const updateNotReadyYet = updateWazuhNotReadyYet('Server not ready yet.');
store.dispatch(updateNotReadyYet);
- CheckDaemonsStatus.makePing().catch((error) => {});
+ CheckDaemonsStatus.makePing().catch(error => {});
return;
}
@@ -178,7 +182,9 @@ export class ErrorHandler {
if (!params.silent && !recentlyShown) {
if (
params.warning ||
- (text && typeof text === 'string' && text.toLowerCase().includes('no results'))
+ (text &&
+ typeof text === 'string' &&
+ text.toLowerCase().includes('no results'))
) {
getToasts().addWarning(text);
} else {
diff --git a/plugins/main/public/react-services/error-management/docs/examples/error-handler-class-example.test.tsx b/plugins/main/public/react-services/error-management/docs/examples/error-handler-class-example.test.tsx
index fa813e7efe..13ec30ecae 100644
--- a/plugins/main/public/react-services/error-management/docs/examples/error-handler-class-example.test.tsx
+++ b/plugins/main/public/react-services/error-management/docs/examples/error-handler-class-example.test.tsx
@@ -6,7 +6,6 @@ import { AxiosError, AxiosResponse } from 'axios';
import { HttpError } from '../../error-factory';
import { ErrorOrchestratorService } from '../../../error-orchestrator/error-orchestrator.service';
-
// mocked some required kibana-services
jest.mock('../../../../kibana-services', () => ({
...(jest.requireActual('../../../../kibana-services') as object),
@@ -87,7 +86,7 @@ describe('Error Handler class example tests', () => {
data: {
statusCode: 500,
error: 'Internal Server Error',
- message: 'Wazuh not ready yet',
+ message: 'Server not ready yet',
},
status: 500,
statusText: 'Internal Server Error',
diff --git a/plugins/main/public/react-services/error-management/error-factory/error-factory.test.ts b/plugins/main/public/react-services/error-management/error-factory/error-factory.test.ts
index 635312d6a5..da2cc020bb 100644
--- a/plugins/main/public/react-services/error-management/error-factory/error-factory.test.ts
+++ b/plugins/main/public/react-services/error-management/error-factory/error-factory.test.ts
@@ -11,14 +11,19 @@
*/
import { AxiosError, AxiosResponse } from 'axios';
import { ErrorFactory } from './error-factory';
-import { IndexerApiError, WazuhReportingError, HttpError, WazuhApiError } from './errors';
+import {
+ IndexerApiError,
+ WazuhReportingError,
+ HttpError,
+ WazuhApiError,
+} from './errors';
import WazuhError from './errors/WazuhError';
const response: AxiosResponse = {
data: {
statusCode: 500,
error: 'Internal Server Error',
- message: '3099 - ERROR3099 - Wazuh not ready yet',
+ message: '3099 - ERROR3099 - Server not ready yet',
},
status: 500,
statusText: 'Internal Server Error',
@@ -44,7 +49,7 @@ describe('Error Factory', () => {
};
const errorCreated = ErrorFactory.create(errorType, {
error,
- message: response.data.message
+ message: response.data.message,
});
expect(errorCreated.name).toBe(name);
expect(errorCreated.stack).toBe(error.stack);
diff --git a/plugins/main/public/react-services/error-management/error-handler/error-handler.test.ts b/plugins/main/public/react-services/error-management/error-handler/error-handler.test.ts
index c249107268..06a96be49f 100644
--- a/plugins/main/public/react-services/error-management/error-handler/error-handler.test.ts
+++ b/plugins/main/public/react-services/error-management/error-handler/error-handler.test.ts
@@ -30,7 +30,7 @@ const responseBody: AxiosResponse = {
data: {
statusCode: 500,
error: 'Internal Server Error',
- message: '3099 - ERROR3099 - Wazuh not ready yet',
+ message: '3099 - ERROR3099 - Server not ready yet',
},
status: 500,
statusText: 'Internal Server Error',
@@ -38,17 +38,16 @@ const responseBody: AxiosResponse = {
config: {
url: '/api/request',
data: {
- params: 'here-any-custom-params'
+ params: 'here-any-custom-params',
}, // the data could contain the params of the request
},
request: {},
};
describe('Error Handler', () => {
-
beforeAll(() => {
jest.clearAllMocks();
- })
+ });
describe('createError', () => {
it.each([
{ ErrorType: Error, name: 'Error' },
@@ -105,7 +104,9 @@ describe('Error Handler', () => {
error.response.data.message = message;
error.response.data.error = error;
error.response.config.url = url;
- const spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError').mockImplementation(() => true);
+ const spyIshttp = jest
+ .spyOn(ErrorHandler, 'isHttpError')
+ .mockImplementation(() => true);
const errorCreated = ErrorHandler.createError(error);
expect(errorCreated).toBeInstanceOf(WazuhError);
expect(errorCreated.message).toBe(message);
@@ -117,10 +118,9 @@ describe('Error Handler', () => {
});
describe('handleError', () => {
-
afterEach(() => {
jest.clearAllMocks();
- })
+ });
it('should send the error to the ERROR ORCHESTRATOR service with custom log options when is defined', () => {
const mockedError = new Error('Mocked error');
ErrorHandler.handleError(mockedError, {
@@ -183,7 +183,7 @@ describe('Error Handler', () => {
ErrorType,
name,
message,
- url
+ url,
}: {
ErrorType?: ErrorConstructor;
name: string;
@@ -191,12 +191,16 @@ describe('Error Handler', () => {
url?: string;
}) => {
let error;
- let spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError')
+ let spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError');
if (ErrorType) {
- spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError').mockImplementation(() => false);
+ spyIshttp = jest
+ .spyOn(ErrorHandler, 'isHttpError')
+ .mockImplementation(() => false);
error = new ErrorType(message);
} else {
- spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError').mockImplementation(() => true);
+ spyIshttp = jest
+ .spyOn(ErrorHandler, 'isHttpError')
+ .mockImplementation(() => true);
error = new Error(message) as AxiosError;
error.response = responseBody;
error.response.data.message = message;
@@ -271,7 +275,7 @@ describe('Error Handler', () => {
ErrorType,
name,
message,
- url
+ url,
}: {
ErrorType?: ErrorConstructor;
name: string;
@@ -279,12 +283,16 @@ describe('Error Handler', () => {
url?: string;
}) => {
let error;
- let spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError')
+ let spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError');
if (ErrorType) {
- spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError').mockImplementation(() => false);
+ spyIshttp = jest
+ .spyOn(ErrorHandler, 'isHttpError')
+ .mockImplementation(() => false);
error = new ErrorType(message);
} else {
- spyIshttp = jest.spyOn(ErrorHandler, 'isHttpError').mockImplementation(() => true);
+ spyIshttp = jest
+ .spyOn(ErrorHandler, 'isHttpError')
+ .mockImplementation(() => true);
error = new Error(message) as AxiosError;
error.response = responseBody;
error.response.data.message = message;
@@ -300,7 +308,7 @@ describe('Error Handler', () => {
expect(errorFromHandler.message).toBe(message);
expect(errorFromHandler.name).toBe(name);
spyIshttp.mockRestore();
- }
+ },
);
});
});
diff --git a/plugins/main/public/react-services/saved-objects.test.ts b/plugins/main/public/react-services/saved-objects.test.ts
index ddcc60b565..0009bba26e 100644
--- a/plugins/main/public/react-services/saved-objects.test.ts
+++ b/plugins/main/public/react-services/saved-objects.test.ts
@@ -45,7 +45,7 @@ describe('SavedObjects', () => {
data: {
statusCode: 500,
error: 'Internal Server Error',
- message: '3099 - ERROR3099 - Wazuh not ready yet',
+ message: '3099 - ERROR3099 - Server not ready yet',
},
status: 500,
statusText: 'Internal Server Error',
diff --git a/plugins/main/public/react-services/wz-api-check.test.ts b/plugins/main/public/react-services/wz-api-check.test.ts
index 012c664543..2e0e160d55 100644
--- a/plugins/main/public/react-services/wz-api-check.test.ts
+++ b/plugins/main/public/react-services/wz-api-check.test.ts
@@ -27,7 +27,7 @@ describe('Wz Api Check', () => {
data: {
statusCode: 500,
error: 'Internal Server Error',
- message: '3099 - ERROR3099 - Wazuh not ready yet',
+ message: '3099 - ERROR3099 - Server not ready yet',
},
status: 500,
statusText: 'Internal Server Error',
diff --git a/plugins/main/public/services/check-daemon-status.js b/plugins/main/public/services/check-daemon-status.js
index 558df37dd0..1b028fd6a6 100644
--- a/plugins/main/public/services/check-daemon-status.js
+++ b/plugins/main/public/services/check-daemon-status.js
@@ -40,11 +40,11 @@ export class CheckDaemonsStatus {
this.tries = 10;
const updateNotReadyYet = updateWazuhNotReadyYet(
- 'Wazuh could not be recovered.'
+ 'Server could not be recovered.',
);
store.dispatch(updateNotReadyYet);
- this.$rootScope.wazuhNotReadyYet = 'Wazuh could not be recovered.';
+ this.$rootScope.wazuhNotReadyYet = 'Server could not be recovered.';
this.$rootScope.$applyAsync();
throw error;
}
diff --git a/plugins/main/public/services/error-handler.js b/plugins/main/public/services/error-handler.js
index 55ed62f207..3e5f9f9b01 100644
--- a/plugins/main/public/services/error-handler.js
+++ b/plugins/main/public/services/error-handler.js
@@ -9,7 +9,7 @@
*
* Find more information about this on the LICENSE file.
*/
-import { getToasts } from '../kibana-services';
+import { getToasts } from '../kibana-services';
import store from '../redux/store';
import { updateWazuhNotReadyYet } from '../redux/actions/appStateActions';
import { WzMisc } from '../factories/misc';
@@ -33,10 +33,9 @@ export class ErrorHandler {
if ((error || {}).status === -1) {
const origin = ((error || {}).config || {}).url || '';
const isFromAPI =
- origin.includes('/api/request') ||
- origin.includes('/api/csv');
+ origin.includes('/api/request') || origin.includes('/api/csv');
return isFromAPI
- ? 'Wazuh API is not reachable. Reason: timeout.'
+ ? 'API is not reachable. Reason: timeout.'
: 'Server did not respond';
}
if ((((error || {}).data || {}).errorData || {}).message)
@@ -98,10 +97,10 @@ export class ErrorHandler {
const message = this.extractMessage(error);
const messageIsString = typeof message === 'string';
if (messageIsString && message.includes('ERROR3099')) {
- const updateNotReadyYet = updateWazuhNotReadyYet('Wazuh not ready yet.');
+ const updateNotReadyYet = updateWazuhNotReadyYet('Server not ready yet.');
store.dispatch(updateNotReadyYet);
- this.$rootScope.wazuhNotReadyYet = 'Wazuh not ready yet.';
+ this.$rootScope.wazuhNotReadyYet = 'Server not ready yet.';
this.$rootScope.$applyAsync();
this.checkDaemonsStatus.makePing();
return;
diff --git a/plugins/main/public/services/resolves/settings-wizard.js b/plugins/main/public/services/resolves/settings-wizard.js
index 83ddd08426..eaa04511b6 100644
--- a/plugins/main/public/services/resolves/settings-wizard.js
+++ b/plugins/main/public/services/resolves/settings-wizard.js
@@ -34,7 +34,7 @@ export function settingsWizard(
let fromWazuhHosts = false;
if (parseInt(data.data.error) === 2) {
!disableErrors &&
- ErrorHandler.handle('Please set up Wazuh API credentials.', '', {
+ ErrorHandler.handle('Please set up API credentials.', '', {
warning: true,
});
} else if (
@@ -64,7 +64,7 @@ export function settingsWizard(
) {
!disableErrors &&
ErrorHandler.handle(
- 'Wrong Wazuh API credentials, please add a new API and/or modify the existing one',
+ 'Wrong API credentials, please add a new API and/or modify the existing one',
);
if (!$location.path().includes('/settings')) {
$location.search('_a', null);
@@ -170,12 +170,12 @@ export function settingsWizard(
// Try to set some API entry as default
const defaultApi = await tryToSetDefault(data.data);
setUpCredentials(
- 'Default Wazuh API has been updated.',
+ 'Default API has been updated.',
defaultApi,
);
$location.path('health-check');
} else {
- setUpCredentials('Please set up Wazuh API credentials.');
+ setUpCredentials('Please set up API credentials.');
}
deferred.resolve();
})
@@ -205,17 +205,17 @@ export function settingsWizard(
// Try to set some as default
const defaultApi = await tryToSetDefault(data.data);
setUpCredentials(
- 'Default Wazuh API has been updated.',
+ 'Default API has been updated.',
defaultApi,
);
$location.path('health-check');
} else {
- setUpCredentials('Please set up Wazuh API credentials.', false);
+ setUpCredentials('Please set up API credentials.', false);
}
}
})
.catch(error => {
- setUpCredentials('Please set up Wazuh API credentials.');
+ setUpCredentials('Please set up API credentials.');
});
}
}
diff --git a/plugins/main/public/styles/common.scss b/plugins/main/public/styles/common.scss
index 47e043662b..84af4c800a 100644
--- a/plugins/main/public/styles/common.scss
+++ b/plugins/main/public/styles/common.scss
@@ -1602,28 +1602,14 @@ kbn-dis.hide-filter-control .globalFilterGroup__branch {
}
@media (min-width: 1600px) {
- .agents-evolution-visualization {
- width: 35vw;
- }
-
.agents-details-card {
- width: 55vw;
+ width: 80vw;
}
}
@media (max-width: 1599px) {
- .agents-evolution-visualization {
- width: 30vw;
- }
-
.agents-details-card {
- width: 45vw;
- }
-}
-
-@media (max-width: 1439px) {
- .agents-evolution-visualization {
- width: 25vw;
+ width: 70vw;
}
}
@@ -1631,11 +1617,6 @@ kbn-dis.hide-filter-control .globalFilterGroup__branch {
.agents-evolution-visualization-group {
flex-wrap: wrap;
}
-
- .agents-evolution-visualization {
- width: 100vw;
- }
-
.agents-details-card {
width: 100vw;
}
diff --git a/plugins/main/public/utils/applications.ts b/plugins/main/public/utils/applications.ts
index c28b2917d7..8aa61376b9 100644
--- a/plugins/main/public/utils/applications.ts
+++ b/plugins/main/public/utils/applications.ts
@@ -40,7 +40,7 @@ export const overview = {
}),
description: i18n.translate('wz-app-overview-description', {
defaultMessage:
- 'This application provides you with an overview of Wazuh applications.',
+ 'This application provides you with an overview of applications.',
}),
euiIconType: 'lensApp',
order: 1,
@@ -514,7 +514,7 @@ export const rules = {
defaultMessage: 'Rules',
}),
description: i18n.translate('wz-app-rules-description', {
- defaultMessage: 'Manage your Wazuh cluster rules.',
+ defaultMessage: 'Manage your cluster rules.',
}),
euiIconType: 'indexRollupApp',
order: 602,
@@ -533,7 +533,7 @@ export const decoders = {
defaultMessage: 'Decoders',
}),
description: i18n.translate('wz-app-decoders-description', {
- defaultMessage: 'Manage your Wazuh cluster decoders.',
+ defaultMessage: 'Manage your cluster decoders.',
}),
euiIconType: 'indexRollupApp',
order: 603,
@@ -552,7 +552,7 @@ export const cdbLists = {
defaultMessage: 'CDB Lists',
}),
description: i18n.translate('wz-app-cdb-lists-description', {
- defaultMessage: 'Manage your Wazuh cluster CDB list.',
+ defaultMessage: 'Manage your cluster CDB list.',
}),
euiIconType: 'indexRollupApp',
order: 604,
@@ -590,7 +590,7 @@ export const serverStatus = {
defaultMessage: 'Status',
}),
description: i18n.translate('wz-app-server-status-description', {
- defaultMessage: 'Manage your Wazuh cluster status.',
+ defaultMessage: 'Manage your cluster status.',
}),
euiIconType: 'indexRollupApp',
order: 605,
@@ -609,7 +609,7 @@ export const cluster = {
defaultMessage: 'Cluster',
}),
description: i18n.translate('wz-app-cluster-description', {
- defaultMessage: 'Manage your Wazuh cluster.',
+ defaultMessage: 'Manage your cluster.',
}),
euiIconType: 'indexRollupApp',
order: 606,
@@ -628,7 +628,7 @@ export const statistics = {
defaultMessage: 'Statistics',
}),
description: i18n.translate('wz-app-statistics-description', {
- defaultMessage: 'Information about the Wazuh enviroment.',
+ defaultMessage: 'Information about the enviroment.',
}),
euiIconType: 'indexRollupApp',
order: 607,
@@ -647,7 +647,7 @@ export const logs = {
defaultMessage: 'Logs',
}),
description: i18n.translate('wz-app-logs-description', {
- defaultMessage: 'Logs from your Wazuh cluster.',
+ defaultMessage: 'Logs from your cluster.',
}),
euiIconType: 'indexRollupApp',
order: 608,
@@ -666,7 +666,7 @@ export const reporting = {
defaultMessage: 'Reporting',
}),
description: i18n.translate('wz-app-reporting-description', {
- defaultMessage: 'Check your stored Wazuh reports.',
+ defaultMessage: 'Check your stored reports.',
}),
euiIconType: 'indexRollupApp',
order: 10002,
@@ -685,7 +685,7 @@ export const settings = {
defaultMessage: 'Settings',
}),
description: i18n.translate('wz-app-settings-description', {
- defaultMessage: 'Manage your Wazuh cluster configuration.',
+ defaultMessage: 'Manage your cluster configuration.',
}),
euiIconType: 'indexRollupApp',
order: 609,
@@ -704,7 +704,7 @@ export const devTools = {
defaultMessage: 'Dev Tools',
}),
description: i18n.translate('wz-app-dev-tools-description', {
- defaultMessage: 'Test the Wazuh API endpoints.',
+ defaultMessage: 'Test the API endpoints.',
}),
euiIconType: 'devToolsApp',
order: 610,
@@ -800,7 +800,7 @@ export const appSettings = {
defaultMessage: 'App Settings',
}),
description: i18n.translate('wz-app-settings-description', {
- defaultMessage: 'Manage your Wazuh cluster configuration.',
+ defaultMessage: 'Manage your cluster configuration.',
}),
euiIconType: 'indexRollupApp',
order: 10004,
diff --git a/plugins/main/scripts/generate-api-data.js b/plugins/main/scripts/generate-api-data.js
index bef205af8d..3170bb0ad9 100644
--- a/plugins/main/scripts/generate-api-data.js
+++ b/plugins/main/scripts/generate-api-data.js
@@ -14,8 +14,8 @@
const OUTPUT_FILE_SECURITY_ACTIONS = 'security-actions.json';
// Define the CLI information
- const cliName = 'Wazuh API data extractor';
- const cliDescription = `Extract the Wazuh API data
+ const cliName = 'API data extractor';
+ const cliDescription = `Extract the API data
Some warning messages are sent to stderr.`;
const cliFilePath = process.argv[1];
@@ -392,16 +392,32 @@ node ${cliFilePath} --spec https://raw.githubusercontent.com/wazuh/wazuh/master/
}
: null;
+ //Wazuh prefix is removed due issue [#6155](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6155)
+
accum[httpMethodUppercase] = [
...accum[httpMethodUppercase],
{
name,
documentation,
- description,
- summary,
+ description: description.replace(/Wazuh/g, 'Server'),
+ summary: summary.replace(/Wazuh/g, 'Server'),
tags,
...(args.length ? { args } : {}),
- ...(query.length ? { query } : {}),
+ ...(query.length
+ ? {
+ query: query.map(({ ...params }) => ({
+ ...params,
+ ...(params.description
+ ? {
+ description: params.description.replace(
+ /Wazuh/g,
+ 'Server',
+ ),
+ }
+ : {}),
+ })),
+ }
+ : {}),
...(body ? { body: [body] } : {}),
},
];
diff --git a/plugins/main/server/controllers/wazuh-api.ts b/plugins/main/server/controllers/wazuh-api.ts
index 115bc5850a..182213dd13 100644
--- a/plugins/main/server/controllers/wazuh-api.ts
+++ b/plugins/main/server/controllers/wazuh-api.ts
@@ -156,7 +156,7 @@ export class WazuhApiCtrl {
if (this.checkResponseIsDown(context, responseManagerInfo)) {
return ErrorResponse(
`ERROR3099 - ${
- responseManagerInfo.data.detail || 'Wazuh not ready yet'
+ responseManagerInfo.data.detail || 'Server not ready yet'
}`,
3099,
HTTP_STATUS_CODES.SERVICE_UNAVAILABLE,
@@ -286,7 +286,7 @@ export class WazuhApiCtrl {
if (this.checkResponseIsDown(context, responseManagerInfo)) {
return ErrorResponse(
`ERROR3099 - ${
- response.data.detail || 'Wazuh not ready yet'
+ response.data.detail || 'Server not ready yet'
}`,
3099,
HTTP_STATUS_CODES.SERVICE_UNAVAILABLE,
@@ -397,7 +397,7 @@ export class WazuhApiCtrl {
} catch (error) {
return ErrorResponse(
`ERROR3099 - ${
- error.response?.data?.detail || 'Wazuh not ready yet'
+ error.response?.data?.detail || 'Server not ready yet'
}`,
3099,
error?.response?.status || HTTP_STATUS_CODES.SERVICE_UNAVAILABLE,
@@ -473,7 +473,7 @@ export class WazuhApiCtrl {
);
if (responseCluster.status === HTTP_STATUS_CODES.OK) {
- context.wazuh.logger.debug('Wazuh API response is valid');
+ context.wazuh.logger.debug('Server API response is valid');
if (responseCluster.data.data.enabled === 'yes') {
// If cluster mode is active
let responseClusterLocal =
@@ -540,7 +540,7 @@ export class WazuhApiCtrl {
}
if (error.code === 'EPROTO') {
return ErrorResponse(
- 'Wrong protocol being used to connect to the Wazuh API',
+ 'Wrong protocol being used to connect to the API',
3005,
HTTP_STATUS_CODES.BAD_REQUEST,
response,
@@ -564,7 +564,7 @@ export class WazuhApiCtrl {
isDown &&
context.wazuh.logger.error(
- 'Wazuh API is online but Wazuh is not ready yet',
+ 'Server API is online but the server is not ready yet',
);
return isDown;
@@ -612,7 +612,7 @@ export class WazuhApiCtrl {
}
if (!isValid) {
- throw new Error('Wazuh not ready yet');
+ throw new Error('Server not ready yet');
}
} catch (error) {
context.wazuh.logger.error(error.message || error);
@@ -750,10 +750,10 @@ export class WazuhApiCtrl {
const isDown = (error || {}).code === 'ECONNREFUSED';
if (!isDown) {
context.wazuh.logger.error(
- 'Wazuh API is online but Wazuh is not ready yet',
+ 'Server API is online but the server is not ready yet',
);
return ErrorResponse(
- `ERROR3099 - ${error.message || 'Wazuh not ready yet'}`,
+ `ERROR3099 - ${error.message || 'Server not ready yet'}`,
3099,
HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR,
response,
@@ -788,7 +788,7 @@ export class WazuhApiCtrl {
const responseIsDown = this.checkResponseIsDown(context, responseToken);
if (responseIsDown) {
return ErrorResponse(
- `ERROR3099 - ${response.body.message || 'Wazuh not ready yet'}`,
+ `ERROR3099 - ${response.body.message || 'Server not ready yet'}`,
3099,
HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR,
response,
@@ -821,7 +821,7 @@ export class WazuhApiCtrl {
}
throw responseError && responseBody.detail
? { message: responseBody.detail, code: responseError }
- : new Error('Unexpected error fetching data from the Wazuh API');
+ : new Error('Unexpected error fetching data from the API');
} catch (error) {
if (
error &&
@@ -830,7 +830,7 @@ export class WazuhApiCtrl {
) {
return ErrorResponse(
error.message || error,
- error.code ? `Wazuh API error: ${error.code}` : 3013,
+ error.code ? `API error: ${error.code}` : 3013,
HTTP_STATUS_CODES.UNAUTHORIZED,
response,
);
@@ -847,7 +847,7 @@ export class WazuhApiCtrl {
}
return ErrorResponse(
errorMsg.detail || error,
- error.code ? `Wazuh API error: ${error.code}` : 3013,
+ error.code ? `API error: ${error.code}` : 3013,
HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR,
response,
);
diff --git a/plugins/main/server/controllers/wazuh-elastic.ts b/plugins/main/server/controllers/wazuh-elastic.ts
index b10dda5459..5b462058f8 100644
--- a/plugins/main/server/controllers/wazuh-elastic.ts
+++ b/plugins/main/server/controllers/wazuh-elastic.ts
@@ -388,7 +388,7 @@ export class WazuhElasticCtrl {
const visState = JSON.parse(bulk_content.visualization.visState);
const title = visState.title;
- if (title.startsWith('Wazuh App Statistics')) {
+ if (title.startsWith('App Statistics')) {
const filter =
bulk_content.visualization.kibanaSavedObjectMeta.searchSourceJSON.replace(
'"filter":[]',
@@ -405,12 +405,12 @@ export class WazuhElasticCtrl {
if (visState.type && visState.type === 'timelion') {
let query = '';
- if (title === 'Wazuh App Cluster Overview') {
+ if (title === 'App Cluster Overview') {
for (const node of nodes) {
query += `.es(index=${pattern_name},q="cluster.name: ${name} AND cluster.node: ${node.name}").label("${node.name}"),`;
}
query = query.substring(0, query.length - 1);
- } else if (title === 'Wazuh App Cluster Overview Manager') {
+ } else if (title === 'App Cluster Overview Manager') {
query += `.es(index=${pattern_name},q="cluster.name: ${name}").label("${name} cluster")`;
}
diff --git a/plugins/main/server/integration-files/visualizations/cluster/monitoring.ts b/plugins/main/server/integration-files/visualizations/cluster/monitoring.ts
index 6b59c0178f..d6a0ad9cca 100644
--- a/plugins/main/server/integration-files/visualizations/cluster/monitoring.ts
+++ b/plugins/main/server/integration-files/visualizations/cluster/monitoring.ts
@@ -14,9 +14,9 @@ export default [
_id: 'Wazuh-App-Cluster-monitoring-Overview',
_type: 'visualization',
_source: {
- title: 'Wazuh App Cluster Overview',
+ title: 'App Cluster Overview',
visState: JSON.stringify({
- title: 'Wazuh App Cluster Overview',
+ title: 'App Cluster Overview',
type: 'timelion',
params: { expression: '.es(*)', interval: 'auto' },
aggs: [],
@@ -37,9 +37,9 @@ export default [
_id: 'Wazuh-App-Cluster-monitoring-Overview-Manager',
_type: 'visualization',
_source: {
- title: 'Wazuh App Cluster Overview Manager',
+ title: 'App Cluster Overview Manager',
visState: JSON.stringify({
- title: 'Wazuh App Cluster Overview Manager',
+ title: 'App Cluster Overview Manager',
type: 'timelion',
params: { expression: '.es(q=agent.id:000)', interval: 'auto' },
aggs: [],
@@ -59,9 +59,9 @@ export default [
{
_id: 'Wazuh-App-Cluster-monitoring-Overview-Node',
_source: {
- title: 'Wazuh App Cluster Overview Node',
+ title: 'App Cluster Overview Node',
visState: JSON.stringify({
- title: 'Wazuh App Cluster Overview Node',
+ title: 'App Cluster Overview Node',
type: 'histogram',
params: {
type: 'histogram',
@@ -145,9 +145,9 @@ export default [
_id: 'Wazuh-App-Cluster-monitoring-Overview-Node-Pie',
_type: 'visualization',
_source: {
- title: 'Wazuh App Cluster Overview Node Pie',
+ title: 'App Cluster Overview Node Pie',
visState: JSON.stringify({
- title: 'Wazuh App Cluster Overview Node Pie',
+ title: 'App Cluster Overview Node Pie',
type: 'pie',
params: {
type: 'pie',
diff --git a/plugins/main/server/integration-files/visualizations/cluster/statistics.ts b/plugins/main/server/integration-files/visualizations/cluster/statistics.ts
index a163611431..88fcfc492b 100644
--- a/plugins/main/server/integration-files/visualizations/cluster/statistics.ts
+++ b/plugins/main/server/integration-files/visualizations/cluster/statistics.ts
@@ -16,9 +16,9 @@ export default [
_id: 'Wazuh-App-Statistics-remoted-Recv-bytes',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics remoted Recv bytes',
+ title: 'App Statistics remoted Recv bytes',
visState: JSON.stringify({
- title: 'Wazuh App Statistics remoted Recv bytes',
+ title: 'App Statistics remoted Recv bytes',
type: 'line',
aggs: [
{
@@ -169,9 +169,9 @@ export default [
_id: 'Wazuh-App-Statistics-remoted-event-count',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics remoted event count',
+ title: 'App Statistics remoted event count',
visState: JSON.stringify({
- title: 'Wazuh App Statistics remoted event count',
+ title: 'App Statistics remoted event count',
type: 'line',
aggs: [
{
@@ -321,9 +321,9 @@ export default [
_id: 'Wazuh-App-Statistics-remoted-tcp-sessions',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics remoted tcp sessions',
+ title: 'App Statistics remoted tcp sessions',
visState: JSON.stringify({
- title: 'Wazuh App Statistics remoted tcp sessions',
+ title: 'App Statistics remoted tcp sessions',
type: 'line',
aggs: [
{
@@ -473,9 +473,9 @@ export default [
_id: 'Wazuh-App-Statistics-Analysisd-Overview-Events-Decoded',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics Overview events decoded',
+ title: 'App Statistics Overview events decoded',
visState: JSON.stringify({
- title: 'Wazuh App Statistics Overview events decoded',
+ title: 'App Statistics Overview events decoded',
type: 'line',
aggs: [
{
@@ -756,7 +756,7 @@ export default [
_id: 'Wazuh-App-Statistics-Analysisd-Syscheck',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics Syscheck',
+ title: 'App Statistics Syscheck',
visState: JSON.stringify({
title: 'syscheck',
type: 'line',
@@ -1071,9 +1071,9 @@ export default [
_id: 'Wazuh-App-Statistics-Analysisd-Syscollector',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics Syscollector',
+ title: 'App Statistics Syscollector',
visState: JSON.stringify({
- title: 'Wazuh App Statistics Syscollector',
+ title: 'App Statistics Syscollector',
type: 'line',
aggs: [
{
@@ -1380,9 +1380,9 @@ export default [
_id: 'Wazuh-App-Statistics-Analysisd-Rootcheck',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics Rootcheck',
+ title: 'App Statistics Rootcheck',
visState: JSON.stringify({
- title: 'Wazuh App Statistics Rootcheck',
+ title: 'App Statistics Rootcheck',
type: 'line',
aggs: [
{
@@ -1641,9 +1641,9 @@ export default [
_id: 'Wazuh-App-Statistics-Analysisd-SCA',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics SCA',
+ title: 'App Statistics SCA',
visState: JSON.stringify({
- title: 'Wazuh App Statistics SCA',
+ title: 'App Statistics SCA',
type: 'line',
aggs: [
{
@@ -1903,9 +1903,9 @@ export default [
_id: 'Wazuh-App-Statistics-Analysisd-HostInfo',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics HostInfo',
+ title: 'App Statistics HostInfo',
visState: JSON.stringify({
- title: 'Wazuh App Statistics HostInfo',
+ title: 'App Statistics HostInfo',
type: 'line',
aggs: [
{
@@ -2174,12 +2174,13 @@ export default [
},
},
{
+
_id: 'Wazuh-App-Statistics-Analysisd-Queues-Usage',
_type: 'visualization',
_source: {
- title: 'Wazuh App Statistics Queues Usage',
+ title: 'App Statistics Queues Usage',
visState: JSON.stringify({
- title: 'Wazuh App Statistics Queues Usage',
+ title: 'App Statistics Queues Usage',
type: 'line',
aggs: [
{
diff --git a/plugins/main/server/integration-files/visualizations/overview/overview-oscap.ts b/plugins/main/server/integration-files/visualizations/overview/overview-oscap.ts
index 67fbde89c1..015eb2d4d8 100644
--- a/plugins/main/server/integration-files/visualizations/overview/overview-oscap.ts
+++ b/plugins/main/server/integration-files/visualizations/overview/overview-oscap.ts
@@ -561,7 +561,7 @@ export default [
_source: {
title: 'Top 10 alerts',
visState: JSON.stringify({
- title: 'Wazuh App OSCAP Top 10 alerts',
+ title: 'App OSCAP Top 10 alerts',
type: 'pie',
params: {
type: 'pie',
@@ -626,7 +626,7 @@ export default [
_source: {
title: 'Top 10 high risk alerts',
visState: JSON.stringify({
- title: 'Wazuh App OSCAP Top 10 high risk alerts',
+ title: 'App OSCAP Top 10 high risk alerts',
type: 'pie',
params: {
type: 'pie',
diff --git a/plugins/main/server/lib/error-response.ts b/plugins/main/server/lib/error-response.ts
index f1a574950f..7118e3e209 100644
--- a/plugins/main/server/lib/error-response.ts
+++ b/plugins/main/server/lib/error-response.ts
@@ -33,7 +33,7 @@ export function ErrorResponse(message = null, code = null, statusCode = null, re
if (code) {
const isString = typeof message === 'string';
if (isString && message === 'socket hang up' && code === 3005) {
- filteredMessage = 'Wrong protocol being used to connect to the Wazuh API';
+ filteredMessage = 'Wrong protocol being used to connect to the API';
} else if (
isString &&
(message.includes('ENOTFOUND') ||
@@ -42,9 +42,9 @@ export function ErrorResponse(message = null, code = null, statusCode = null, re
message.includes('EAI_AGAIN')) &&
code === 3005
) {
- filteredMessage = 'Wazuh API is not reachable. Please check your url and port.';
+ filteredMessage = 'API is not reachable. Please check your url and port.';
} else if (isString && message.includes('ECONNREFUSED') && code === 3005) {
- filteredMessage = 'Wazuh API is not reachable. Please check your url and port.';
+ filteredMessage = 'API is not reachable. Please check your url and port.';
} else if (isString && message.toLowerCase().includes('not found') && code === 3002) {
filteredMessage = 'It seems the selected API was deleted.';
} else if (
diff --git a/plugins/main/server/start/initialize/index.test.ts b/plugins/main/server/start/initialize/index.test.ts
index c94577b1fa..595d28eb99 100644
--- a/plugins/main/server/start/initialize/index.test.ts
+++ b/plugins/main/server/start/initialize/index.test.ts
@@ -90,7 +90,7 @@ describe('[initialize] `wazuh-registry.json` not created', () => {
fs.readFileSync(WAZUH_DATA_CONFIG_REGISTRY_PATH, 'utf8'),
);
- expect(contentRegistry.name).toMatch('Wazuh dashboard');
+ expect(contentRegistry.name).toMatch('dashboard');
expect(contentRegistry['app-version']).toMatch(packageInfo.version);
expect(contentRegistry['revision']).toMatch(packageInfo.revision);
expect(typeof contentRegistry.installationDate).toBe('string');
@@ -104,7 +104,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
const contentRegistryFile = [
{
before: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': packageInfo.version,
revision: packageInfo.revision,
installationDate: '2022-07-25T13:55:04.363Z',
@@ -112,7 +112,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
hosts: {},
},
after: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': packageInfo.version,
revision: packageInfo.revision,
installationDate: '2022-07-25T13:55:04.363Z',
@@ -122,7 +122,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
},
{
before: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': '0.0.0',
revision: '0',
installationDate: '2022-07-25T13:55:04.363Z',
@@ -130,7 +130,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
hosts: {},
},
after: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': packageInfo.version,
revision: packageInfo.revision,
installationDate: '2022-07-25T13:55:04.363Z',
@@ -140,7 +140,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
},
{
before: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': '0.0.0',
revision: '0',
installationDate: '2022-07-25T13:55:04.363Z',
@@ -168,7 +168,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
},
},
after: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': packageInfo.version,
revision: packageInfo.revision,
installationDate: '2022-07-25T13:55:04.363Z',
@@ -180,7 +180,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
},
{
before: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': '0.0.0',
revision: '0',
installationDate: '2022-07-25T13:55:04.363Z',
@@ -248,7 +248,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
},
},
after: {
- name: 'Wazuh dashboard',
+ name: 'dashboard',
'app-version': packageInfo.version,
revision: packageInfo.revision,
installationDate: '2022-07-25T13:55:04.363Z',
@@ -297,7 +297,7 @@ describe('[initialize] `wazuh-registry.json` created', () => {
fs.readFileSync(WAZUH_DATA_CONFIG_REGISTRY_PATH, 'utf8'),
);
- expect(contentRegistryFile.name).toMatch('Wazuh dashboard');
+ expect(contentRegistryFile.name).toMatch('dashboard');
expect(contentRegistryFile['app-version']).toMatch(
contentRegistryExpected['app-version'],
);
diff --git a/plugins/main/test/cypress/cypress/integration/step-definitions/settings/The-wazuh-admin-user-is-logged.given.js b/plugins/main/test/cypress/cypress/integration/step-definitions/settings/The-wazuh-admin-user-is-logged.given.js
index 49c388d3af..7f94ba0c4c 100644
--- a/plugins/main/test/cypress/cypress/integration/step-definitions/settings/The-wazuh-admin-user-is-logged.given.js
+++ b/plugins/main/test/cypress/cypress/integration/step-definitions/settings/The-wazuh-admin-user-is-logged.given.js
@@ -13,7 +13,7 @@ let urlBodys = [
{ alertCount: 15000, index: 'wazuh-alerts-4.x-sample-threat-detection' },
];
-Given('The wazuh admin user is logged', () => {
+Given('The admin user is logged', () => {
if (Cypress.env('type') != 'wzd') {
navigate('app/wazuh');
} else {
diff --git a/plugins/wazuh-core/common/constants.ts b/plugins/wazuh-core/common/constants.ts
index 10e3e128ab..4ced41b340 100644
--- a/plugins/wazuh-core/common/constants.ts
+++ b/plugins/wazuh-core/common/constants.ts
@@ -273,7 +273,7 @@ export const REPORTS_PAGE_FOOTER_TEXT = 'Copyright © 2023 Wazuh, Inc.';
export const REPORTS_PAGE_HEADER_TEXT = 'info@wazuh.com\nhttps://wazuh.com';
// Plugin platform
-export const PLUGIN_PLATFORM_NAME = 'Wazuh dashboard';
+export const PLUGIN_PLATFORM_NAME = 'dashboard';
export const PLUGIN_PLATFORM_BASE_INSTALLATION_PATH =
'/usr/share/wazuh-dashboard/data/wazuh/';
export const PLUGIN_PLATFORM_INSTALLATION_USER = 'wazuh-dashboard';
@@ -293,7 +293,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 = {
@@ -367,7 +367,7 @@ export const DOCUMENTATION_WEB_BASE_URL = 'https://documentation.wazuh.com';
export const ELASTIC_NAME = 'elastic';
// Default Wazuh indexer name
-export const WAZUH_INDEXER_NAME = 'Wazuh indexer';
+export const WAZUH_INDEXER_NAME = 'indexer';
// Not timeFieldName on index pattern
export const NOT_TIME_FIELD_NAME_INDEX_PATTERN =
diff --git a/plugins/wazuh-core/common/csv-key-equivalence.ts b/plugins/wazuh-core/common/csv-key-equivalence.ts
index d014c5271e..a4923d8b29 100644
--- a/plugins/wazuh-core/common/csv-key-equivalence.ts
+++ b/plugins/wazuh-core/common/csv-key-equivalence.ts
@@ -120,5 +120,5 @@ export const KeyEquivalence: {[key: string]: string} = {
reason: 'Reason',
registerIP: 'Register IP',
hotfix: 'Update code',
- 'scan.time': 'Registered by Wazuh at'
+ 'scan.time': 'Registered at'
};
diff --git a/plugins/wazuh-core/server/services/cache-api-user-has-run-as.ts b/plugins/wazuh-core/server/services/cache-api-user-has-run-as.ts
index 0be1ebec71..2e365c3196 100644
--- a/plugins/wazuh-core/server/services/cache-api-user-has-run-as.ts
+++ b/plugins/wazuh-core/server/services/cache-api-user-has-run-as.ts
@@ -87,7 +87,7 @@ export class CacheAPIUserAllowRunAs {
excludePassword: true,
});
throw new Error(
- `API with host ID [${apiId}] misconfigured. The Wazuh API user [${api.username}] is not allowed to use [run_as]. Allow it in the user configuration or set [run_as] host setting with [false] value.`,
+ `API with host ID [${apiId}] misconfigured. The server API user [${api.username}] is not allowed to use [run_as]. Allow it in the user configuration or set [run_as] host setting with [false] value.`,
);
}
return ApiUserCanUseStatus;