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

Jump to bottom

Feature added node name of agent #3039

Merged
merged 8 commits into from
Mar 16, 2021
Merged

Feature added node name of agent #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9cf3dd
Added node name of agent on Agent list table and info.
gabiwassan Mar 2, 2021
c9845af
Fixed validation.
gabiwassan Mar 2, 2021
b1df029
Updated CHANGELOG
gabiwassan Mar 9, 2021
1928f14
Merge branch '4.1-7.10' into feature/cluster-node-agent
gabiwassan Mar 9, 2021
96b9967
Changed label by node name.
gabiwassan Mar 16, 2021
9014d81
Changed label by Cluster node.
gabiwassan Mar 16, 2021
779e383
Update changelog
frankeros Mar 16, 2021
d71e04f
Merge branch '4.1-7.10' into feature/cluster-node-agent
frankeros Mar 16, 2021
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
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ All notable changes to the Wazuh app project will be documented in this file.
### Added

- Creation of index pattern after the default one is changes in Settings [#2985](https://github.com/wazuh/wazuh-kibana-app/pull/2985)
- Added node name of agent list and detail [#3039](https://github.com/wazuh/wazuh-kibana-app/pull/3039)

### Fixed

- Improved validation and prevention for caching bundles in client side [#3063](https://github.com/wazuh/wazuh-kibana-app/pull/3063)

## Wazuh v4.1.2 - Kibana 7.10.0 , 7.10.2 - Revision 4103

### Added
## Wazuh v4.1.1 - Kibana 7.10.0 , 7.10.2 - Revision 4103

- Refactor of some prompts [#3015](https://github.com/wazuh/wazuh-kibana-app/pull/3015)
- Add `run_as` setting to example host configuration in Add new API view [#3021](https://github.com/wazuh/wazuh-kibana-app/pull/3021)
- Refactor of some prompts [#3015](https://github.com/wazuh/wazuh-kibana-app/pull/3015)

### Fixed

Expand Down
22 changes: 12 additions & 10 deletions public/components/common/welcome/agents-info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,8 @@ export class AgentInfo extends Component {

render() {
const { agent } = this.props;

let arrayStats;



if (this.props.isCondensed) {
arrayStats = [
{ title: agent.id, description: 'ID', style: { maxWidth: 100 } },
Expand All @@ -196,14 +193,19 @@ export class AgentInfo extends Component {
description: 'Operating system',
style: {}
},
{
title: this.parseDateTime(agent.dateAdd),
description: 'Registration date',
{
title: agent.node_name && agent.node_name !== 'unknown' ? agent.node_name : '-',
description: 'Cluster node',
style: { maxWidth: 150 }
},
{
title: this.parseDateTime(agent.dateAdd),
description: 'Registration date',
style: { maxWidth: 150 } },
{
title: this.parseDateTime(agent.lastKeepAlive),
description: 'Last keep alive',
style: { maxWidth: 150 }
{
title: this.parseDateTime(agent.lastKeepAlive),
description: 'Last keep alive',
style: { maxWidth: 150 }
},
];
}
Expand Down
12 changes: 11 additions & 1 deletion public/controllers/agent/components/agents-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ export class AgentsTable extends Component {
const agentVersion =
agent.version !== undefined ? agent.version.split(' ')[1] : '-';
const { timeService } = this.props;
const node_name = agent.node_name && agent.node_name !== 'unknown' ? agent.node_name : '-';

return {
id: agent.id,
name: agent.name,
Expand All @@ -245,6 +247,7 @@ export class AgentsTable extends Component {
group: checkField(agent.group),
os_name: agent,
version: agentVersion,
node_name: node_name,
dateAdd: timeService(agent.dateAdd),
lastKeepAlive: lastKeepAlive(agent.lastKeepAlive, timeService),
actions: agent,
Expand Down Expand Up @@ -748,6 +751,13 @@ export class AgentsTable extends Component {
truncateText: true,
render: this.addIconPlatformRender
},
{
field: 'node_name',
name: 'Cluster node',
width: '10%',
truncateText: true,
sortable: true
},
{
field: 'version',
name: 'Version',
Expand Down Expand Up @@ -858,7 +868,7 @@ export class AgentsTable extends Component {

const getCellProps = (item, column) => {
if(column.field=="actions"){
return
return
}
return {
onMouseDown: (ev) => {
Expand Down