Refactored nodes list and many other Monitoring files

This commit is contained in:
Juanjo Jiménez 2018-06-18 10:00:10 +02:00
parent e2f1534902
commit 1fc83f4b1d
12 changed files with 104 additions and 67 deletions

View File

@ -1,48 +0,0 @@
<div layout="row" ng-show="showConfig" class="wz-timelions">
<md-card flex="30" class="wz-md-card">
<md-card-content class="wazuh-column">
<span class="wz-headline-title">Top 5 nodes</span>
<md-divider class="wz-margin-top-10"></md-divider>
<kbn-vis ng-show="rendered" vis-id="'Wazuh-App-Cluster-Overview-Node-Pie'" id="Wazuh-App-Cluster-Overview-Node-Pie"></kbn-vis>
<span class="wz-padding-top-10" ng-show="!rendered">No results for selected time interval</span>
</md-card-content>
</md-card>
<md-card flex class="wz-md-card">
<md-card-content>
<span class="wz-headline-title">Overview</span>
<md-divider class="wz-margin-top-10"></md-divider>
<div layout="row" class="wz-padding-top-10">
<span flex="15">Disabled</span>
<span flex class="color-grey">{{configuration.disabled}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="15">Hidden</span>
<span flex class="color-grey">{{configuration.hidden}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="15">Name</span>
<span flex class="color-grey">{{configuration.name}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="15">Node name</span>
<span flex class="color-grey">{{configuration.node_name}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="15">Node type</span>
<span flex class="color-grey">{{configuration.node_type}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="15">Bind address</span>
<span flex class="color-grey">{{configuration.bind_addr}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="15">IP</span>
<span flex class="color-grey">{{configuration.nodes[0] || 'Unknown'}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="15">Port</span>
<span flex class="color-grey">{{configuration.port}}</span>
</div>
</md-card-content>
</md-card>
</div>

View File

@ -0,0 +1,55 @@
<!-- Cards for overview monitoring section -->
<div layout="row" layout-align="start stretch" class="wz-timelions" ng-show="showConfig">
<!-- Overview visualization card -->
<md-card flex="30" class="wz-md-card">
<md-card-content class="wazuh-column">
<span class="wz-headline-title">Top 5 nodes</span>
<md-divider class="wz-margin-top-10"></md-divider>
<kbn-vis ng-show="rendered" vis-id="'Wazuh-App-Cluster-Overview-Node-Pie'" id="Wazuh-App-Cluster-Overview-Node-Pie"></kbn-vis>
<span class="wz-padding-top-10 wz-text-center" ng-show="!rendered">There are no results for selected time range. Try another one.</span>
</md-card-content>
</md-card>
<!-- Cluster configuration card -->
<md-card flex class="wz-md-card">
<md-card-content>
<i class="fa fa-fw fa-server" aria-hidden="true"></i> <span class="wz-headline-title">Cluster configuration</span>
<md-divider class="wz-margin-top-10"></md-divider>
<!-- Configuration options -->
<div layout="row" class="wz-padding-top-10">
<span flex="25">Disabled</span>
<span class="color-grey">{{configuration.disabled}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="25">Hidden</span>
<span class="color-grey">{{configuration.hidden}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="25">Name</span>
<span class="color-grey">{{configuration.name}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="25">Node name</span>
<span class="color-grey">{{configuration.node_name}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="25">Node type</span>
<span class="color-grey">{{configuration.node_type}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="25">Bind address</span>
<span class="color-grey">{{configuration.bind_addr}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="25">IP</span>
<span class="color-grey">{{configuration.nodes[0] || 'Unknown'}}</span>
</div>
<div layout="row" class="wz-padding-top-10">
<span flex="25">Port</span>
<span class="color-grey">{{configuration.port}}</span>
</div>
</md-card-content>
</md-card>
</div>
<!-- End cards for overview monitoring section -->

View File

@ -1,16 +1,8 @@
include ./monitoring-disabled.html
include ./disabled.html
include ./monitoring.head
include ./monitoring-main.html
include ./monitoring-main-timelions.html
<!-- Config -->
include ./config.html
<!-- Node list -->
include ./node-list.html
<!-- Node detail -->
include ./node-detail.html
<!-- Footer -->
include ./main.html
include ./main-timelions.html
include ./configuration.html
include ./nodes-list.html
include ./nodes-detail.html
include ../../footer.foot

View File

@ -1,3 +1,41 @@
<div layout="column" layout-align="start stretch" class="md-padding" ng-if="showNodes && !currentNode">
<!-- Monitoring nodes searchbar -->
<wz-search-bar data="nodes" term="nodeSearchTerm" placetext="'Search nodes...'"></wz-search-bar>
<!-- End monitoring nodes searchbar -->
<!-- Monitoring nodes table -->
<wz-table-header layout="row" data="nodes" keys="[
{name:'Name',size:25},
{name:'Version',size:25},
{name:'IP',size:25},
{name:'Type',size:25}
]">
</wz-table-header>
<wz-table layout="column" flex data="nodes" func="showNode(index)" keys="[
{col:'name',size:25},
{col:'version',size:25},
{col:'ip',size:25},
{col:'type',size:25}
]" class="no-lateral-padding">
</wz-table>
<!-- End monitoring nodes table -->
</div>
<!--
<div layout="column" flex ng-if="showNodes && !currentNode">
<md-card flex class="wz-md-card" ng-show="!currentNode">
<md-card-content>
@ -21,4 +59,4 @@
</wz-table>
</md-card-content>
</md-card>
</div>
</div> -->

View File

@ -160,7 +160,7 @@
</div>
<!-- Related decoders section -->
<div ng-show="(decodersRelated.items && decodersRelated.items.length > 0)" layout-padding>
<div ng-show="(decodersRelated.items && decodersRelated.items.length > 0)" class="md-padding">
<h1 class="md-headline wz-headline"><i class="fa fa-fw fa-link" aria-hidden="true"></i> Related decoders</h1>
<wz-table-header
class="wz-side-margin-8"

View File

@ -1,4 +1,4 @@
<div ng-show="!loading && !viewingDetail" flex layout="column" layout-padding>
<div ng-show="!loading && !viewingDetail" flex layout="column" class="md-padding">
<div id="content" layout="row" layout-align="start start">
<span flex layout="row" layout-align="space-between center">
<md-autocomplete flex id="Auto" class="wz-autocomplete wz-select-input wz-margin-right-16" md-input-id="autocomplete" md-select-on-match="true" md-no-cache="noCache" md-selected-item="filter"

View File

@ -201,7 +201,7 @@
</div>
<!-- Related rules section -->
<div ng-show="(rulesRelated.items && rulesRelated.items.length > 0)" layout-padding>
<div ng-show="(rulesRelated.items && rulesRelated.items.length > 0)" class="md-padding">
<h1 class="md-headline wz-headline"><i class="fa fa-fw fa-link" aria-hidden="true"></i> Related rules</h1>
<wz-table-header
class="wz-side-margin-8"

View File

@ -1,4 +1,4 @@
<div ng-show="!loading && !viewingDetail" flex layout="column" layout-padding>
<div ng-show="!loading && !viewingDetail" flex layout="column" class="md-padding">
<div id="content" layout="row" layout-align="start start">
<span layout="row" flex layout-align="space-between center">
<md-autocomplete flex class="wz-autocomplete wz-select-input wz-margin-right-8"