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

Add hostname board serial fields to agent inventory #6191

Merged
merged 6 commits into from
Dec 11, 2023
Merged

Add hostname board serial fields to agent inventory #6191

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
05efa2d
Add hostname and board_serial to agent inventory
JuanGarriuz Dec 5, 2023
ad5ac31
Remove Camelcase from Board Serial
JuanGarriuz Dec 5, 2023
e17474a
test snap fixed
JuanGarriuz Dec 5, 2023
4984cc4
Fix format
JuanGarriuz Dec 5, 2023
945202c
Added snaps and changelod
JuanGarriuz Dec 7, 2023
5bd02ac
Edit hostname to host name in dashboard and changelog
JuanGarriuz Dec 7, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ All notable changes to the Wazuh app project will be documented in this file.
### Added

- Support for Wazuh 4.7.2
- Added hostname and board serial to Agents > Inventory data [#6191](https://github.com/wazuh/wazuh-dashboard-plugins/pull/6191)

## Wazuh v4.7.1 - OpenSearch Dashboards 2.8.0 - Revision 01

Expand Down
78 changes: 75 additions & 3 deletions plugins/main/public/components/agents/syscollector/__snapshots__/inventory.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ exports[`Inventory component A Apple agent should be well rendered. 1`] = `
</div>
</div>
<div
class="euiFlexItem"
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium"
Expand All @@ -78,6 +78,30 @@ exports[`Inventory component A Apple agent should be well rendered. 1`] = `
/>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium"
>
Hostname:
<span
class="euiLoadingSpinner euiLoadingSpinner--small"
/>
</div>
</div>
<div
class="euiFlexItem"
>
<div
class="euiText euiText--medium"
>
Board serial:
<span
class="euiLoadingSpinner euiLoadingSpinner--small"
/>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
Expand Down Expand Up @@ -2096,7 +2120,7 @@ exports[`Inventory component A Linux agent should be well rendered. 1`] = `
</div>
</div>
<div
class="euiFlexItem"
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium"
Expand All @@ -2107,6 +2131,30 @@ exports[`Inventory component A Linux agent should be well rendered. 1`] = `
/>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium"
>
Hostname:
<span
class="euiLoadingSpinner euiLoadingSpinner--small"
/>
</div>
</div>
<div
class="euiFlexItem"
>
<div
class="euiText euiText--medium"
>
Board serial:
<span
class="euiLoadingSpinner euiLoadingSpinner--small"
/>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
Expand Down Expand Up @@ -4199,7 +4247,7 @@ exports[`Inventory component A Windows agent should be well rendered. 1`] = `
</div>
</div>
<div
class="euiFlexItem"
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium"
Expand All @@ -4210,6 +4258,30 @@ exports[`Inventory component A Windows agent should be well rendered. 1`] = `
/>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
<div
class="euiText euiText--medium"
>
Hostname:
<span
class="euiLoadingSpinner euiLoadingSpinner--small"
/>
</div>
</div>
<div
class="euiFlexItem"
>
<div
class="euiText euiText--medium"
>
Board serial:
<span
class="euiLoadingSpinner euiLoadingSpinner--small"
/>
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
>
Expand Down
26 changes: 25 additions & 1 deletion plugins/main/public/components/agents/syscollector/components/syscollector-metrics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function InventoryMetrics({ agent }) {
)}
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={true}>
<EuiFlexItem grow={false}>
<EuiText>
CPU:{' '}
{syscollector.isLoading ? (
Expand All @@ -105,6 +105,30 @@ export function InventoryMetrics({ agent }) {
)}
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText>
Hostname:{' '}
{syscollector.isLoading ? (
<EuiLoadingSpinner size='s' />
) : syscollector.data.os.hostname ? (
<strong>{syscollector.data.os.hostname}</strong>
) : (
<strong>-</strong>
)}
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={true}>
<EuiText>
Board serial:{' '}
{syscollector.isLoading ? (
<EuiLoadingSpinner size='s' />
) : syscollector.data.hardware.board_serial ? (
<strong>{syscollector.data.hardware.board_serial}</strong>
) : (
<strong>-</strong>
)}
</EuiText>
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiText>
Last scan:{' '}
Expand Down
Loading