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

3.8 New network addresses syscollector table #452

Merged
merged 2 commits into from
Jan 10, 2019
Merged

3.8 New network addresses syscollector table #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d12735e
Added table for netaddr
manuasir Jan 10, 2019
23f5a58
Added new table
manuasir Jan 10, 2019
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
5 changes: 4 additions & 1 deletion SplunkAppForWazuh/appserver/static/js/config/routes/agents-states.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ define(['../module'], function(module) {
limit: 1,
select: 'scan_time'
}),
$requestService.apiReq(`/agents/${id}`)
$requestService.apiReq(`/agents/${id}`),
$requestService.apiReq(`/syscollector/${id}/netaddr`, {
limit: 1
}),
])
return results
} catch (err) {
Expand Down
20 changes: 20 additions & 0 deletions SplunkAppForWazuh/appserver/static/js/controllers/agents/inventory/inventory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,26 @@
</div>


<div layout="row" class="layout-padding wz-padding-bottom-0" ng-if="!agent.error && syscollector">
<md-card flex class="wz-md-card">
<md-card-content class="wz-text-center wz-margin-bottom-40-inv" ng-if="syscollector.netaddr && !syscollector.netaddr.items.length">
<i class="fa fa-fw fa-info-circle" aria-hidden="true"></i> <span class="wz-headline-title">No network addresses
scan available</span>
<md-divider class="wz-margin-top-10"></md-divider>
<div layout="column" class="wz-padding-top-10">
<p>The network addresses scan is disabled or not ready yet. Wait a little bit and try refreshing the page.</p>
</div>
</md-card-content>
<md-card-content class="wz-margin-bottom-40-inv" ng-if="syscollector.netaddr && syscollector.netaddr.items.length">
<span class="wz-headline-title"><i class="fa fa-fw fa-exchange"></i> Network addresses</span>
<md-divider class="wz-margin-top-10"></md-divider>
<wazuh-table flex path="'/syscollector/' + agent.id + '/netaddr'" row-sizes="[4]" keys="['address', 'netmask', 'proto', 'broadcast']">
</wazuh-table>
</md-card-content>
</md-card>
</div>


<div layout="row" class="layout-padding wz-padding-top-0" ng-if="!agent.error && syscollector">
<md-card flex class="wz-md-card">
<md-card-content>
Expand Down
24 changes: 15 additions & 9 deletions SplunkAppForWazuh/appserver/static/js/controllers/agents/inventory/inventoryCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Find more information about this on the LICENSE file.
*/

define(['../../module'], function(module) {
define(['../../module'], function (module) {
'use strict'
class Inventory {
/**
Expand Down Expand Up @@ -48,15 +48,16 @@ define(['../../module'], function(module) {
* On controller loads
*/
$onInit() {
this.scope.agent =
this.data.length &&
this.data.length > 4 &&
typeof this.data[5] === 'object' &&
this.data[5].data &&
this.data[5].data.data
? this.data[5].data.data
: { error: true }
try {
this.scope.agent =
this.data.length &&
this.data.length > 4 &&
typeof this.data[5] === 'object' &&
this.data[5].data &&
this.data[5].data.data
? this.data[5].data.data
: { error: true }

this.scope.search = (term, specificPath) => {
this.search(term, specificPath)
}
Expand Down Expand Up @@ -84,17 +85,22 @@ define(['../../module'], function(module) {
const netiface = {}
const ports = {}
const packagesDate = {}
const netaddrResponse = {}

if (this.data[2] && this.data[2].data && this.data[2].data.data)
Object.assign(netiface, this.data[2].data.data)
if (this.data[3] && this.data[3].data && this.data[3].data.data)
Object.assign(ports, this.data[3].data.data)
if (this.data[4] && this.data[4].data && this.data[4].data.data)
Object.assign(packagesDate, this.data[4].data.data)
if (this.data[6] && this.data[6].data && this.data[6].data.data)
Object.assign(netaddrResponse, this.data[6].data.data)
this.scope.syscollector = {
hardware: this.data[0].data.data,
os: this.data[1].data.data,
netiface: netiface,
ports: ports,
netaddr: netaddrResponse ? { ...netaddrResponse } : false,
packagesDate:
packagesDate && packagesDate.items && packagesDate.items.length
? packagesDate.items[0].scan_time
Expand Down
1 change: 1 addition & 0 deletions SplunkAppForWazuh/appserver/static/js/services/key-equivalence/keyEquivalenceService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ define(['../module'], function(module) {
iface: 'Interface',
broadcast: 'Broadcast',
proto: 'Protocol',
netmask: 'Netmask',
address: 'Address',
protocol: 'Protocol',
'local.ip': 'Local IP',
Expand Down