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.

Sign up for GitHub

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

Remove total outdated agents statistic from Endpoint Summary #6737

Merged
merged 7 commits into from
Jun 5, 2024
Merged

Remove total outdated agents statistic from Endpoint Summary #6737

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e0a6f86
Remove total outdated agents statistic from Endpoint Summary
lucianogorza Jun 3, 2024
3a215ba
Change upgrade tasks panel color
lucianogorza Jun 3, 2024
bb35284
Update CHANGELOG
lucianogorza Jun 3, 2024
ac09de8
Improve Agent Welcome layout
lucianogorza Jun 3, 2024
43ecd48
Update Endpoint Summary statistic titles
lucianogorza Jun 4, 2024
e7f6084
Fix vulnerabilities data source
lucianogorza Jun 4, 2024
6b5b899
Synchronize total outdated agents and the rest filters
lucianogorza Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ All notable changes to the Wazuh app project will be documented in this file.
- Added AngularJS dependencies [#6145](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6145)
- Added a migration task to setup the configuration using a configuration file [#6337](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6337)
- Improve fleet management by adding 'Edit Agent Groups' and 'Upgrade Agents' actions, as well as a filter to show only outdated agents [#6250](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6250) [#6476](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6476) [#6274](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6274) [#6501](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6501) [#6529](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6529) [#6648](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6648)
- Added propagation of updates from the table to dashboard visualizations in Endpoints summary [#6460](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6460)
- Added propagation of updates from the table to dashboard visualizations in Endpoints summary [#6460](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6460) [#6737](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6737)
- Handle index pattern selector on new discover [#6499](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6499)
- Added macOS log collector tab [#6545](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6545)
- Add ability to disable the edition of configuration through API endpoints and UI [#6557](https://github.com/wazuh/wazuh-dashboard-plugins/issues/6557)
Expand Down
135 changes: 66 additions & 69 deletions plugins/main/public/components/common/welcome/agents-welcome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
EuiFlexGroup,
EuiSpacer,
EuiText,
EuiFlexGrid,
EuiButtonEmpty,
EuiPage,
EuiPopover,
Expand Down Expand Up @@ -82,11 +81,11 @@ export const AgentsWelcome = compose(
},
...(agent?.name
? [
{
text: `${agent.name}`,
truncate: true,
},
]
{
text: `${agent.name}`,
truncate: true,
},
]
: []),
];
}),
Expand Down Expand Up @@ -209,13 +208,13 @@ export const AgentsWelcome = compose(
)
? JSON.parse(window.localStorage.getItem('wz-menu-agent-apps-pinned'))
: [
// Default pinned applications
threatHunting.id,
fileIntegrityMonitoring.id,
configurationAssessment.id,
mitreAttack.id,
malwareDetection.id,
];
// Default pinned applications
threatHunting.id,
fileIntegrityMonitoring.id,
configurationAssessment.id,
mitreAttack.id,
malwareDetection.id,
];
}

// Ensure the pinned applications are supported
Expand Down Expand Up @@ -423,32 +422,30 @@ export const AgentsWelcome = compose(
renderMitrePanel() {
return (
<Fragment>
<EuiPanel paddingSize='s' height={{ height: 300 }}>
<EuiFlexItem>
<EuiFlexGroup>
<EuiFlexItem>
<h2 className='embPanel__title wz-headline-title'>
<EuiText size='xs'>
<h2>MITRE ATT&CK</h2>
</EuiText>
</h2>
</EuiFlexItem>
<EuiFlexItem grow={false} style={{ alignSelf: 'center' }}>
<EuiToolTip position='top' content='Open MITRE ATT&CK'>
<RedirectAppLinks application={getCore().application}>
<EuiButtonIcon
iconType='popout'
color='primary'
href={`${getCore().application.getUrlForApp(
mitreAttack.id,
)}`}
aria-label='Open MITRE ATT&CK'
/>
</RedirectAppLinks>
</EuiToolTip>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
<EuiPanel paddingSize='m' height={{ height: 300 }}>
<EuiFlexGroup gutterSize='s'>
<EuiFlexItem>
<h2 className='embPanel__title wz-headline-title'>
<EuiText size='xs'>
<h2>MITRE ATT&CK</h2>
</EuiText>
</h2>
</EuiFlexItem>
<EuiFlexItem grow={false} style={{ alignSelf: 'center' }}>
<EuiToolTip position='top' content='Open MITRE ATT&CK'>
<RedirectAppLinks application={getCore().application}>
<EuiButtonIcon
iconType='popout'
color='primary'
href={`${getCore().application.getUrlForApp(
mitreAttack.id,
)}`}
aria-label='Open MITRE ATT&CK'
/>
</RedirectAppLinks>
</EuiToolTip>
</EuiFlexItem>
</EuiFlexGroup>
<EuiSpacer size='m' />
<EuiFlexGroup>
<EuiFlexItem>
Expand Down Expand Up @@ -523,19 +520,19 @@ export const AgentsWelcome = compose(
>
{' '}
{/* TODO: Replace with SearchBar and replace implementation to get the time range in AgentView component*/}
<WzDatePicker condensed={true} onTimeChange={() => {}} />
<WzDatePicker condensed={true} onTimeChange={() => { }} />
</EuiFlexItem>
</EuiFlexGroup>
{(this.state.widthWindow < 1150 && (
<Fragment>
<EuiFlexGrid columns={2}>
<EuiFlexGroup wrap>
<EuiFlexItem
key={'Wazuh-App-Agents-Welcome-MITRE-Top-Tactics'}
>
{this.renderMitrePanel()}
</EuiFlexItem>
{this.renderCompliancePanel()}
</EuiFlexGrid>
</EuiFlexGroup>
<EuiSpacer size='m' />
<EuiFlexGroup>
<FimEventsTable agent={this.props.agent} />
Expand All @@ -556,33 +553,33 @@ export const AgentsWelcome = compose(
</EuiFlexGroup>
</Fragment>
)) || (
<Fragment>
<EuiFlexGrid columns={2}>
<EuiFlexItem>
<EuiFlexGroup>
<EuiFlexItem
key={'Wazuh-App-Agents-Welcome-MITRE-Top-Tactics'}
>
{this.renderMitrePanel()}
</EuiFlexItem>
{this.renderCompliancePanel()}
</EuiFlexGroup>
</EuiFlexItem>
<FimEventsTable agent={this.props.agent} />
</EuiFlexGrid>
<EuiSpacer size='l' />
<EuiFlexGroup>
<EuiFlexItem
key={'Wazuh-App-Agents-Welcome-Events-Evolution'}
>
{' '}
{/* Events count evolution */}
{this.renderEventCountVisualization()}
</EuiFlexItem>
<EuiFlexItem>{this.renderSCALastScan()}</EuiFlexItem>
</EuiFlexGroup>
</Fragment>
)}
<Fragment>
<EuiFlexGroup>
<EuiFlexItem>
<EuiFlexGroup>
<EuiFlexItem
key={'Wazuh-App-Agents-Welcome-MITRE-Top-Tactics'}
>
{this.renderMitrePanel()}
</EuiFlexItem>
{this.renderCompliancePanel()}
</EuiFlexGroup>
</EuiFlexItem>
<FimEventsTable agent={this.props.agent} />
</EuiFlexGroup>
<EuiSpacer size='l' />
<EuiFlexGroup>
<EuiFlexItem
key={'Wazuh-App-Agents-Welcome-Events-Evolution'}
>
{' '}
{/* Events count evolution */}
{this.renderEventCountVisualization()}
</EuiFlexItem>
<EuiFlexItem>{this.renderSCALastScan()}</EuiFlexItem>
</EuiFlexGroup>
</Fragment>
)}
</EuiPageBody>
</EuiPage>
</div>
Expand Down
59 changes: 27 additions & 32 deletions plugins/main/public/components/endpoints-summary/dashboard/endpoints-summary-dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,47 @@ import { getAgentsByGroup } from '../services/get-agents-by-group';
import { getAgentsByOs } from '../services/get-agents-by-os';
import { getSummaryAgentsStatus } from '../services/get-summary-agents-status';
import DonutCard from './components/donut-card';
import OutdatedAgentsCard from './components/outdated-agents-card';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';

interface EndpointsSummaryDashboardProps {
filterAgentByStatus: (data: any) => void;
filterAgentByOS: (data: any) => void;
filterAgentByGroup: (data: any) => void;
outdatedAgents: number;
isLoadingOutdatedAgents: boolean;
filterByOutdatedAgent: (data: any) => void;
reloadDashboard?: number;
}

export const EndpointsSummaryDashboard: FC<EndpointsSummaryDashboardProps> = ({
filterAgentByStatus,
filterAgentByOS,
filterAgentByGroup,
outdatedAgents,
isLoadingOutdatedAgents,
filterByOutdatedAgent,
reloadDashboard,
}) => {
return (
<div className='endpoints-summary-container-indicators'>
<DonutCard
betaBadgeLabel='Agents by Status'
onClickLabel={filterAgentByStatus}
getInfo={getSummaryAgentsStatus}
reload={reloadDashboard}
/>
<DonutCard
betaBadgeLabel='Top 5 agents by OS'
onClickLabel={filterAgentByOS}
getInfo={getAgentsByOs}
reload={reloadDashboard}
/>
<DonutCard
betaBadgeLabel='Top 5 agents by Group'
onClickLabel={filterAgentByGroup}
getInfo={getAgentsByGroup}
reload={reloadDashboard}
/>
<OutdatedAgentsCard
outdatedAgents={outdatedAgents}
isLoading={isLoadingOutdatedAgents}
filterByOutdatedAgent={filterByOutdatedAgent}
/>
</div>
<EuiFlexGroup gutterSize='m' responsive={false} wrap>
<EuiFlexItem>
<DonutCard
betaBadgeLabel='Agents by Status'
onClickLabel={filterAgentByStatus}
getInfo={getSummaryAgentsStatus}
reload={reloadDashboard}
/>
</EuiFlexItem>
<EuiFlexItem>
<DonutCard
betaBadgeLabel='Top 5 OS'
onClickLabel={filterAgentByOS}
getInfo={getAgentsByOs}
reload={reloadDashboard}
/>
</EuiFlexItem>
<EuiFlexItem>
<DonutCard
betaBadgeLabel='Top 5 groups'
onClickLabel={filterAgentByGroup}
getInfo={getAgentsByGroup}
reload={reloadDashboard}
/>
</EuiFlexItem>
</EuiFlexGroup>
);
};
18 changes: 0 additions & 18 deletions plugins/main/public/components/endpoints-summary/endpoints-summary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,3 @@
white-space: nowrap;
}
}

.endpoints-summary-container-indicators {
width: 100%;
display: grid;
grid-template-columns: 1fr;
gap: 16px;
min-height: 200px;

@media (min-width: 1024px) {
grid-template-columns: 1fr 1fr;
}

@media (min-width: 1440px) {
grid-template-columns:
minmax(375px, 1fr) minmax(375px, 1fr) minmax(375px, 1fr)
minmax(150px, 300px);
}
}
Loading
Loading