Merge branch '3.2-dev-clean' of https://github.com/wazuh/wazuh-kibana-app into 3.2-dev-clean

This commit is contained in:
Juanjo Jiménez 2018-03-08 11:12:36 +01:00
commit daa2e1c07b
13 changed files with 49 additions and 45 deletions

View File

@ -26,13 +26,13 @@
<div ng-show="activeitem !== item.id" ng-repeat="key in keys" flex="{{key.size || ''}}">
<span>{{parseItem(item,key) || '---'}}</span>
</div>
<div layout="column" flex ng-if="activeitem === item.id">
<div layout="row" class="wz-table-ruleset-card-info wz-table-size">
<div flex ng-show="activeitem === item.id" class="wz-table-height-fixed">
<div layout="row" class="wz-table-size">
<div ng-repeat="key in keys" flex="{{key.size || ''}}">
<span>{{parseItem(item,key) || '---'}}</span>
</div>
</div>
<div layout="row" class="wz-table-ruleset-card-info wz-padding-right-14 wz-padding-bottom-14 ">
<div layout="row" class="wz-padding-right-14 wz-padding-bottom-14 ">
<md-card flex class="wz-cursor-default wz-md-card">
<md-card-content>
<h1 class="wz-table-color-link wz-table-font">Overview</h1>
@ -46,11 +46,11 @@
</div>
<div layout="row" class="wz-table-padding-top-10">
<span flex>Level</span>
<span flex class="text-right listHover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('level', item.level); $event.stopPropagation();">{{item.level}}</span>
<span flex class="text-right wz-table-hover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('level', item.level); $event.stopPropagation();">{{item.level}}</span>
</div>
<div layout="File" class="wz-table-padding-top-10">
<span flex>File</span>
<span flex class="text-right listHover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('file', item.file); $event.stopPropagation();">{{item.file}}</span>
<span flex class="text-right wz-table-hover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('file', item.file); $event.stopPropagation();">{{item.file}}</span>
</div>
</md-card-content>
</md-card>
@ -61,7 +61,7 @@
<h1 class="wz-table-color-link wz-table-font">Groups</h1>
<md-divider class="wz-margin-top-10"></md-divider>
<div layout="row" class="wz-table-padding-top-10" ng-repeat="group in item.groups">
<span flex class="listHover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('group', group)">{{group}}</span>
<span flex class="wz-table-hover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('group', group)">{{group}}</span>
</div>
</div>
@ -71,7 +71,7 @@
<h1 class="wz-table-color-link wz-table-font">PCI DSS</h1>
<md-divider class="wz-margin-top-10"></md-divider>
<div layout="row" class="wz-table-padding-top-10" ng-repeat="pci in item.pci">
<span flex class="listHover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('pci', pci)">{{pci}}</span>
<span flex class="wz-table-hover wz-table-cursor-pointer wz-table-color-link" ng-click="data.addFilter('pci', pci)">{{pci}}</span>
</div>
</div>
</div>
@ -101,13 +101,13 @@
<div ng-show="activeitem !== decoder.name+decoder.file+decoder.position" class="wz-word-wrap" ng-repeat="key in keys" flex="{{key.size || ''}}">
<span>{{parseItem(decoder,key) || '---'}}</span>
</div>
<div layout="column" flex ng-show="activeitem === decoder.name+decoder.file+decoder.position">
<div layout="row" class="wz-table-ruleset-card-info wz-table-size">
<div flex ng-show="activeitem === decoder.name+decoder.file+decoder.position" class="wz-table-height-fixed">
<div layout="row" class="wz-table-size">
<div ng-repeat="key in keys" flex="{{key.size || ''}}" class="wz-word-wrap">
<span>{{parseItem(decoder,key) || '---'}}</span>
</div>
</div>
<div layout="row" class="wz-table-ruleset-card-info wz-padding-right-14 wz-padding-bottom-14">
<div layout="row" class="wz-padding-right-14 wz-padding-bottom-14">
<md-card flex class="wz-cursor-default wz-md-card">
<md-card-content>
<h1 class="wz-table-color-link wz-table-font">Overview</h1>

View File

@ -88,18 +88,17 @@
padding-right: 0px !important;
}
// Style for text who applies filters when hovering
.listHover {
&:hover {
font-weight: bold;
}
.wz-table-height-fixed {
height: 220px;
overflow: hidden;
}
md-list,
md-list-item,
wz-table {
&.active {
background-color: rgb(0,121,165);
color: white !important;
}
// Style for text who applies filters when hovering
.wz-table-hover:hover {
font-weight: bold;
}
.wz-table-card-active {
background-color: rgb(0,121,165);
color: white !important;
}

View File

@ -370,6 +370,11 @@ visualization {
padding-top: 10px;
}
.wz-padding-metric {
padding-top: 10px;
padding-bottom: 10px;
}
.wz-margin-top-10 {
margin-top: 10px;
}

View File

@ -3,8 +3,8 @@
<!-- View: Panels -->
<div ng-if="resultState === 'ready' && tabView === 'panels'">
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex>New files: <span class="wz-font-weight-bold">{{auditNewFiles}}</span></div>
<div flex>Read files: <span class="wz-font-weight-bold">{{auditReadFiles}}</span></div>
<div flex>Modified files: <span class="wz-font-weight-bold">{{auditModifiedFiles}}</span></div>

View File

@ -3,8 +3,8 @@
<div ng-if="resultState === 'ready' && tabView === 'panels'">
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex="25">Name: <span class="wz-font-weight-bold">{{agent.name}}</span></div>
<div flex="25">IP: <span class="wz-font-weight-bold">{{agent.ip}}</span></div>
<div flex ng-if="agent.version">Version:<span class="wz-font-weight-bold"> {{ agent.version | limitTo: 12 }}{{agent.version.length > 12 ? '...' : ''}}</span></div>
@ -15,8 +15,8 @@
</div>
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex="25">Last keep alive:<span class="wz-font-weight-bold"> {{agent.lastKeepAlive || 'Unknown' }}</span></div>
<div flex="25">Registration date:<span class="wz-font-weight-bold"> {{agent.dateAdd}}</span></div>
<div flex="25" ng-if="agent.syscheck.inProgress">Last syscheck scan:<span class="wz-font-weight-bold"> Scan in progress</span></div>

View File

@ -4,8 +4,8 @@
<div ng-if="resultState === 'ready' && tabView === 'panels'">
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex>Critical severity alerts: <span class="wz-font-weight-bold">{{vulnCritical}}</span></div>
<div flex>High severity alerts: <span class="wz-font-weight-bold">{{vulnHigh}}</span></div>
<div flex>Medium severity alerts: <span class="wz-font-weight-bold">{{vulnMedium}}</span></div>

View File

@ -10,15 +10,15 @@
<md-card-content class="text-center">
<center>
<p ng-class="getDaemonStatusClass(v)" class="round"></p>
<p>{{k}}</p>
<p class="wz-padding-top-10">{{k}}</p>
</center>
</md-card-content>
</md-card>
</div>
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex>Total agents:
<span class="wz-font-weight-bold">{{agentsCountTotal}}</span>
</div>

View File

@ -37,11 +37,11 @@
</md-autocomplete>
</span>
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'rules') ? 'active' : ''" ng-click="setRulesTab('rules')"
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'rules') ? 'wz-table-card-active' : ''" ng-click="setRulesTab('rules')"
class="wazuh-button md-raised md-primary manager-ruleset-decoders-btn" aria-label="Ruleset rules button">
Rules
</md-button>
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'decoders') ? 'active' : ''" ng-click="setRulesTab('decoders')"
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'decoders') ? 'wz-table-card-active' : ''" ng-click="setRulesTab('decoders')"
class="wazuh-button md-raised md-primary manager-ruleset-decoders-btn" aria-label="Ruleset decoders button">
Decoders
</md-button>

View File

@ -72,11 +72,11 @@
</md-autocomplete>
</span>
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'rules') ? 'active' : ''"
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'rules') ? 'wz-table-card-active' : ''"
ng-click="setRulesTab('rules')" class="wazuh-button md-raised md-primary manager-ruleset-rules-rulbtn" aria-label="Ruleset rules button">
Rules
</md-button>
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'decoders') ? 'active' : ''"
<md-button flex="10" ng-class="(globalsubmenuNavItem2 == 'decoders') ? 'wz-table-card-active' : ''"
ng-click="setRulesTab('decoders')" class="wazuh-button md-raised md-primary manager-ruleset-rules-decbtn" aria-label="Ruleset decoders button">
Decoders
</md-button>

View File

@ -3,8 +3,8 @@
<!-- View: Panels -->
<div ng-if="resultState === 'ready' && tabView === 'panels'">
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<span flex>New files: <b>{{auditNewFiles}}</b></span>
<span flex>Read files: <b>{{auditReadFiles}}</b></span>
<span flex>Modified files: <b>{{auditModifiedFiles}}</b></span>

View File

@ -4,8 +4,8 @@
<div ng-if="resultState === 'ready' && tabView === 'panels'">
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex>Files added: <span class="wz-font-weight-bold">{{fimAdded}}</span></div>
<div flex>Files modified: <span class="wz-font-weight-bold">{{fimModified}}</span></div>
<div flex>Files deleted: <span class="wz-font-weight-bold">{{fimDeleted}}</span></div>

View File

@ -4,8 +4,8 @@
<div ng-if="resultState === 'ready' && tabView === 'panels'">
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex>Alerts: <span class="wz-font-weight-bold">{{totalAlerts}}</span></div>
<div flex>Level 12 or above alerts: <span class="wz-font-weight-bold">{{level12}}</span></div>
<div flex>Authentication failure: <span class="wz-font-weight-bold">{{authFailure}}</span></div>

View File

@ -4,8 +4,8 @@
<div ng-if="resultState === 'ready' && tabView === 'panels'">
<div layout="row">
<md-card flex class="height-30 wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-top-5">
<md-card flex class="wz-metric-color wz-md-card">
<md-card-content layout="row" class="wz-padding-metric">
<div flex>Critical severity alerts: <span class="wz-font-weight-bold">{{vulnCritical}}</span></div>
<div flex>High severity alerts: <span class="wz-font-weight-bold">{{vulnHigh}}</span></div>
<div flex>Medium severity alerts: <span class="wz-font-weight-bold">{{vulnMedium}}</span></div>