Skip to content

Commit

Permalink
Merge branch '4.8.0' into change/remove-compilation-date-from-dashboa…
Browse files Browse the repository at this point in the history
…rd-6365
  • Loading branch information
asteriscos authored Jan 24, 2024
2 parents da15610 + c15c13e commit 9523e2d
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 25 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ All notable changes to the Wazuh app project will be documented in this file.
- Added the ability to check if there are available updates from the UI. [#6093](https:/wazuh/wazuh-dashboard-plugins/pull/6093) [#6256](https:/wazuh/wazuh-dashboard-plugins/pull/6256) [#6328](https:/wazuh/wazuh-dashboard-plugins/pull/6328)
- Added remember server address check [#5791](https:/wazuh/wazuh-dashboard-plugins/pull/5791)
- Added the ssl_agent_ca configuration to the SSL Settings form [#6083](https:/wazuh/wazuh-dashboard-plugins/pull/6083)
- Added global vulnerabilities dashboards [#5896](https:/wazuh/wazuh-dashboard-plugins/pull/5896) [#6179](https:/wazuh/wazuh-dashboard-plugins/pull/6179) [#6173](https:/wazuh/wazuh-dashboard-plugins/pull/6173) [#6147](https:/wazuh/wazuh-dashboard-plugins/pull/6147) [#6231](https:/wazuh/wazuh-dashboard-plugins/pull/6231) [#6246](https:/wazuh/wazuh-dashboard-plugins/pull/6246) [#6321](https:/wazuh/wazuh-dashboard-plugins/pull/6321) [#6338] (https:/wazuh/wazuh-dashboard-plugins/pull/6338)
- Added global vulnerabilities dashboards [#5896](https:/wazuh/wazuh-dashboard-plugins/pull/5896) [#6179](https:/wazuh/wazuh-dashboard-plugins/pull/6179) [#6173](https:/wazuh/wazuh-dashboard-plugins/pull/6173) [#6147](https:/wazuh/wazuh-dashboard-plugins/pull/6147) [#6231](https:/wazuh/wazuh-dashboard-plugins/pull/6231) [#6246](https:/wazuh/wazuh-dashboard-plugins/pull/6246) [#6321](https:/wazuh/wazuh-dashboard-plugins/pull/6321) [#6338] (https:/wazuh/wazuh-dashboard-plugins/pull/6338) [#6356](https:/wazuh/wazuh-dashboard-plugins/pull/6356)
- Added an agent selector to the IT Hygiene application [#5840](https:/wazuh/wazuh-dashboard-plugins/pull/5840)
- Added query results limit when the search exceed 10000 hits [#6106](https:/wazuh/wazuh-dashboard-plugins/pull/6106)
- Added a redirection button to Endpoint Summary from IT Hygiene application [6176](https:/wazuh/wazuh-dashboard-plugins/pull/6176)
- Added information icon with tooltip on the most active agent in the endpoint summary view [#6364](https:/wazuh/wazuh-dashboard-plugins/pull/6364)

### Changed

Expand Down Expand Up @@ -44,7 +45,8 @@ All notable changes to the Wazuh app project will be documented in this file.
- Removed the application menu in the IT Hygiene application [#6176](https:/wazuh/wazuh-dashboard-plugins/pull/6176)
- Removed the implicit filter of WQL language of the search bar UI [#6174](https:/wazuh/wazuh-dashboard-plugins/pull/6174)
- Removed notice of old Discover deprecation [#6341](https:/wazuh/wazuh-dashboard-plugins/pull/6341)
- Remove compilation date field from the app [#6366](https:/wazuh/wazuh-dashboard-plugins/pull/6366)
- Removed compilation date field from the app [#6366](https:/wazuh/wazuh-dashboard-plugins/pull/6366)
- Removed WAZUH_REGISTRATION_SERVER from Windows agent deployment command [#6361](https:/wazuh/wazuh-dashboard-plugins/pull/6361)

## Wazuh v4.7.2 - OpenSearch Dashboards 2.8.0 - Revision 02

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const getVisStateFilter = (
indexPatternId: string,
title: string,
label: string,
fieldName: string,
fieldName: string
) => {
return {
id,
Expand All @@ -21,6 +21,16 @@ const getVisStateFilter = (
showTotal: false,
totalFunc: 'sum',
},
uiState: {
vis: {
columnsWidth: [
{
colIndex: 1,
width: 75,
},
],
},
},
data: {
searchSource: {
query: {
Expand Down Expand Up @@ -69,11 +79,9 @@ const getVisStateFilter = (
};

export const getDashboardFilters = (
indexPatternId: string,
indexPatternId: string
): {
[panelId: string]: DashboardPanelState<
EmbeddableInput & { [k: string]: unknown }
>;
[panelId: string]: DashboardPanelState<EmbeddableInput & { [k: string]: unknown }>;
} => {
return {
topPackageSelector: {
Expand All @@ -91,8 +99,8 @@ export const getDashboardFilters = (
'topPackageSelector',
indexPatternId,
'Top packages vulnerabilities',
'Top 5 package names',
'package.name',
'Top 5 packages',
'package.name'
),
},
},
Expand All @@ -111,8 +119,8 @@ export const getDashboardFilters = (
'topOSVulnerabilities',
indexPatternId,
'Top operating system vulnerabilities',
'Top 5 operating systems',
'host.os.full',
'Top 5 OS',
'host.os.full'
),
},
},
Expand All @@ -132,7 +140,7 @@ export const getDashboardFilters = (
indexPatternId,
'Agent filter',
'Top 5 agents',
'agent.id',
'agent.id'
),
},
},
Expand All @@ -152,7 +160,7 @@ export const getDashboardFilters = (
indexPatternId,
'Top vulnerabilities',
'Top 5 vulnerabilities',
'vulnerability.id',
'vulnerability.id'
),
},
},
Expand Down
14 changes: 12 additions & 2 deletions plugins/main/public/controllers/agent/components/agents-preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
EuiLink,
EuiProgress,
EuiText,
EuiIconTip,
} from '@elastic/eui';
import { AgentsTable } from './agents-table';
import { WzRequest } from '../../../react-services/wz-request';
Expand Down Expand Up @@ -344,7 +345,7 @@ export const AgentsPreview = compose(
)
}
titleSize='s'
description='Last registered agent'
description='Last enrolled agent'
titleColor='primary'
/>
</EuiFlexItem>
Expand Down Expand Up @@ -384,7 +385,16 @@ export const AgentsPreview = compose(
)
}
titleSize='s'
description='Most active agent'
description={
<>
Most active agent{' '}
<EuiIconTip
type='iInCircle'
color='primary'
content='Agent with more alerts in the last 24 hours'
/>
</>
}
titleColor='primary'
/>
</EuiFlexItem>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@ export const getAllOptionals = (
'',
);

if (osName && osName.toLowerCase() === 'windows' && optionals.serverAddress) {
// when os is windows we must to add wazuh registration server with server address
paramsText =
paramsText +
`WAZUH_REGISTRATION_SERVER=${optionals.serverAddress.replace(
'WAZUH_MANAGER=',
'',
)} `;
}

return paramsText;
};

Expand Down

0 comments on commit 9523e2d

Please sign in to comment.