valitydev/wazuh-kibana-app
14
0
Fork 0
mirror of https://github.com/valitydev/wazuh-kibana-app.git synced 2024-11-06 18:05:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1076 from wazuh/issue-1068

Browse Source 
Bug fixes
This commit is contained in:
Jesús Ángel 2018-12-11 15:10:33 +01:00 committed by GitHub
commit af2261ed36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/controllers/agent/agents.js
View File

@ -541,8 +541,10 @@ export class AgentsController {
if (this.$scope.agent.os) {
this.$scope.agentOS =
this.$scope.agent.os.name + ' ' + this.$scope.agent.os.version;
this.$scope.agent.isLinuxOS = this.$scope.agent.os.uname.includes('Linux');
} else {
this.$scope.agentOS = 'Unknown';
this.$scope.agent.isLinuxOS = false;
}
// Syscheck

BIN
public/img/icons/osquery.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

1
public/img/icons/osquery.svg Normal file
View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="256" height="255" preserveAspectRatio="xMidYMid" style=""><rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none"/><g class="currentLayer" style=""><title>Layer 1</title><path d="M255.215.258v63.736l-63.605 63.605v-63.87L255.215.259" fill="#00bfb3" id="svg_1" class="" fill-opacity="1"/><path d="M128.006.258v63.736l63.605 63.605v-63.87L128.006.259" id="svg_2" class="" fill-opacity="1" fill="#13a7df"/><path d="M255.346 254.804H191.61l-63.605-63.605h63.867l63.474 63.605" fill="#00bfb3" id="svg_3" class="" fill-opacity="1"/><path d="M255.346 127.595H191.61L128.005 191.2h63.867l63.474-63.605" id="svg_4" class="" fill="#13a7df" fill-opacity="1"/><path d="M.801 254.936V191.2l63.605-63.605v63.869L.801 254.936" fill="#00bfb3" id="svg_5" class="" fill-opacity="1"/><path d="M128.01 254.936V191.2l-63.605-63.605v63.869l63.604 63.473" id="svg_6" class="" fill-opacity="1" fill="#13a7df"/><path d="M.672.386h63.736l63.605 63.605H64.145L.672.386" fill="#00bfb3" id="svg_7" class="" fill-opacity="1"/><path d="M.672 127.594h63.736l63.605-63.605H64.145L.672 127.594" id="svg_8" class="" fill-opacity="1" fill="#13a7df"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

4
public/less/common.less
View File

@ -511,6 +511,10 @@ md-sidenav {
font-size: 20px !important;
}
.synopsisIcon{
max-width: 32px;
}
.legend-value-truncate {
overflow-y: hidden !important;
}

10
public/templates/agents/agents-welcome.html
View File

@ -31,10 +31,10 @@
</md-card-content>
</md-card>
</div>
<div layout="row" layout-padding class="wz-padding-top-0 wz-padding-bottom-0">
<div layout="row" layout-padding class="wz-padding-top-0 wz-padding-bottom-0" ng-if="agent.group">
<md-card flex class="wz-metric-color wz-md-card wz-no-padding">
<md-card-content layout="row" class="wz-padding-metric">
<div class="wz-word-break" flex ng-if="agent.group">
<div class="wz-word-break" flex >
Groups: <span ng-repeat="group in agent.group" class="wz-text-bold wz-text-link" ng-click="goGroups(agent,$index)">{{ group }}&nbsp;</span>
</div>
</md-card-content>
@ -108,12 +108,12 @@
description="TabDescription.pm.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.audit" class="euiFlexItem" logo="'icons/app_monitoring.svg'"
ng-if="extensions.audit && agent.isLinuxOS" class="euiFlexItem" logo="'icons/app_monitoring.svg'"
title="'System auditing'" switch-tab="switchTab('audit')" current-tab="'audit'"
description="TabDescription.audit.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.oscap" class="euiFlexItem" logo="'icons/app_discover.svg'"
ng-if="extensions.oscap && agent.isLinuxOS" class="euiFlexItem" logo="'icons/app_discover.svg'"
title="'OpenSCAP'" switch-tab="switchTab('oscap')" current-tab="'oscap'"
description="TabDescription.oscap.description"
></wz-welcome-card>
@ -147,7 +147,7 @@
description="TabDescription.virustotal.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="extensions.osquery" class="euiFlexItem" logo="'icons/osquery.png'"
ng-if="extensions.osquery" class="euiFlexItem" logo="'icons/osquery.svg'"
title="'Osquery'" switch-tab="switchTab('osquery')" current-tab="'osquery'"
description="TabDescription.osquery.description"
></wz-welcome-card>

4
public/templates/management/configuration/log-collection/localfile.html
View File

@ -39,7 +39,9 @@
<div flex="30" layout="column">
<md-list flex="auto" class="wz-item-list">
<md-list-item class="wz-text-link" ng-click="updateSelectedItem($index)" ng-repeat="item in currentConfig['logcollector-localfile'].localfile">{{ item.file || item.alias || item.command }}</md-list-item>
<md-list-item class="wz-text-link" ng-click="updateSelectedItem($index)" ng-repeat="item in currentConfig['logcollector-localfile'].localfile">
<span ng-if='item.file || item.alias || item.command'>{{ item.file || item.alias || item.command }}</span>
<span ng-if='!item.file && !item.alias && !item.command'>{{ item.logformat }} - {{ item.targetStr }}</span></md-list-item>
</md-list>
</div>

2
public/templates/overview/overview-welcome.html
View File

@ -100,7 +100,7 @@
description="octrl.TabDescription.virustotal.description"
></wz-welcome-card>
<wz-welcome-card
ng-if="octrl.extensions.osquery" class="euiFlexItem" logo="'icons/osquery.png'"
ng-if="octrl.extensions.osquery" class="euiFlexItem" logo="'icons/osquery.svg'"
title="'Osquery'" switch-tab="octrl.switchTab('osquery')" current-tab="'osquery'"
description="octrl.TabDescription.osquery.description"
></wz-welcome-card>

14
public/utils/config-handler.js
View File

@ -54,6 +54,20 @@ export class ConfigurationHandler {
} else {
$scope.integrations = {};
}
if ($scope.currentConfig['logcollector-localfile'] && $scope.currentConfig['logcollector-localfile'].localfile) {
$scope.currentConfig['logcollector-localfile'].localfile.forEach(function (file) {
if (file.target) {
file.targetStr = '';
file.target.forEach(function (target, idx) {
file.targetStr = file.targetStr.concat(target);
if (idx != file.target.length - 1) {
file.targetStr = file.targetStr.concat(', ');
}
});
}
});
}
$scope.load = false;
if (!$scope.$$phase) $scope.$digest();
} catch (error) {