Adjusting integrations - ruleset

This commit is contained in:
havidarou 2017-11-17 15:22:01 -05:00
parent c650e9698c
commit 40732ce4c0
10 changed files with 210 additions and 220 deletions

View File

@ -57,6 +57,19 @@ function ($scope, $q, $routeParams, $route, $location, $rootScope, appState, gen
} }
}; };
// Listen for changes
var updateSearchSource = $scope.$on('updateVis', function (event, query, filters) {
$scope.checkAlerts()
.then((data) => {
$scope.results = data;
$scope.loading = false;
})
.catch(() => {
$scope.results = false;
$scope.loading = false;
});
});
$scope.hideRing = (items) => { $scope.hideRing = (items) => {
return $(".vis-container").length >= items; return $(".vis-container").length >= items;
}; };

View File

@ -13,7 +13,6 @@
} }
.joinCardsRow { .joinCardsRow {
background-color: white;
margin: 8px; margin: 8px;
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 10px; margin-top: 10px;

View File

@ -1,11 +1,4 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <md-content ng-if="tab == 'preview'" ng-show="!loading" flex ng-controller="agentsPreviewController" class="agentsPreview" style="height: 90%;" layout="column" layout-align="start space-around">
<div ng-if="tab == 'preview'">
<md-content flex class="agentsPreview" ng-controller="agentsPreviewController" layout="column" style="height: 100%;" class="md-padding" layout-align="start space-around">
<div class='uil-ring-css' ng-show='loading'><div></div></div>
<div ng-show="!loading" style="padding: 0;">
<md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
<div flex layout="column" layout-align="space-between stretch">
<div layout="row" layout-align="space-between stretch"> <div layout="row" layout-align="space-between stretch">
<md-card flex class="cardHover" layout="column" style="margin-left: 0px;" ng-click="applyAgent(lastAgent)"> <md-card flex class="cardHover" layout="column" style="margin-left: 0px;" ng-click="applyAgent(lastAgent)">
<md-card-content style="text-align: center;" ng-click="applyAgent(lastAgent)"> <md-card-content style="text-align: center;" ng-click="applyAgent(lastAgent)">
@ -94,7 +87,6 @@
</div> </div>
</md-toolbar> </md-toolbar>
<div flex style="overflow: auto; height:400px;" layout-fill when-scrolled="agents.nextPage('')"> <div flex style="overflow: auto; height:400px;" layout-fill when-scrolled="agents.nextPage('')">
<md-list ng-repeat='agent in agents.items | orderBy : agents.sortValue : agents.sortDir' class="agents-preview-table"> <md-list ng-repeat='agent in agents.items | orderBy : agents.sortValue : agents.sortDir' class="agents-preview-table">
<md-list-item ng-click="applyAgent(agent)" class="list-no-hover md-subhead"> <md-list-item ng-click="applyAgent(agent)" class="list-no-hover md-subhead">
<span flex="5">{{agent.id || 'Unknown'}}</span> <span flex="5">{{agent.id || 'Unknown'}}</span>
@ -108,8 +100,5 @@
</md-list> </md-list>
</div> </div>
<md-divider></md-divider> <md-divider></md-divider>
</div>
</div>
<md-content><md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="agents.busy && !agents.end"></md-progress-linear></md-content> <md-content><md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="agents.busy && !agents.end"></md-progress-linear></md-content>
</md-content> </md-content>
</div>

View File

@ -6,7 +6,7 @@
<md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="loading"></md-progress-linear> <md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
<div flex layout="row" style="height: 100%; {{(tabView != 'discover') ? 'background-color: #e4e4e4' : ''}}" > <div flex layout="row" style="height: 100%; {{(tabView != 'discover') ? 'background-color: #e4e4e4' : ''}}" >
<md-content flex id="content" style="height: 100%;"> <md-content flex id="content">
<md-content layout="row" layout-align="space-between start" style="background-color: #f7f7f7"> <md-content layout="row" layout-align="space-between start" style="background-color: #f7f7f7">
<md-toolbar style="height: 50px;"> <md-toolbar style="height: 50px;">
<div class="md-toolbar-tools" layout="row" layout-align="space-between center"> <div class="md-toolbar-tools" layout="row" layout-align="space-between center">

View File

@ -1,4 +1,4 @@
<div flex ng-cloak layout="row" ng-controller="groupsPreviewController" layout-align="space-around" style="background-color: #e3e3e3;" <div flex ng-cloak layout="row" ng-controller="groupsPreviewController" layout-fill style="background-color: #e3e3e3;"
ng-if="groupsMenu == 'preview'"> ng-if="groupsMenu == 'preview'">
<div flex="25" layout="column" style="margin:10px;"> <div flex="25" layout="column" style="margin:10px;">

View File

@ -2,6 +2,6 @@ include ./manager.head
include ./manager-status.html include ./manager-status.html
include ./manager-configuration.html include ./manager-configuration.html
include ./manager-osseclog.html include ./manager-osseclog.html
include ./groups.jade
include ./ruleset.jade include ./ruleset.jade
include ./groups.jade
include ./footer.foot include ./footer.foot

View File

@ -1,17 +1,17 @@
<md-content layout="column" style="height: 100%;" flex layout-padding ng-if="!loading && globalsubmenuNavItem2 == 'decoders'" ng-controller="decodersController" layout-align="start space-around" class="app-container wazuh-column"> <md-content layout="column" style="height: 100%;" id="rulesContainer" flex layout-padding ng-if="!loading && globalsubmenuNavItem2 == 'decoders'" ng-controller="decodersController" layout-align="start space-around" class="app-container wazuh-column">
<div class='uil-ring-css' ng-show="loading"><div></div></div> <div class='uil-ring-css' ng-show="loading"><div></div></div>
<div ng-if="!loading" layout="row" layout-align="center start" style="padding: 0px; height: 250px; min-height: 250px; ">
<md-card flex style="margin: 0; height: 220px;" class="wazuh-row"> <div ng-show="!loading" layout="row" layout-align="center start" style="padding: 0px;">
<md-card-title><md-card-title-text> <md-card flex style="margin: 0; height: 220px;" class="wazuh-column">
<md-card-content class="wazuh-column">
<span class="md-headline-small">Top 24h - Decoder name</span> <span class="md-headline-small">Top 24h - Decoder name</span>
</md-card-title-text></md-card-title>
<md-card-content class="wazuh-row">
<kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Decoders-Top-24h-Decoder-name'" id="Wazuh-App-Manager-Ruleset-Decoders-Top-24h-Decoder-name"></kbn-vis> <kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Decoders-Top-24h-Decoder-name'" id="Wazuh-App-Manager-Ruleset-Decoders-Top-24h-Decoder-name"></kbn-vis>
</md-card-content> </md-card-content>
</md-card> </md-card>
</div> </div>
<div ng-show="!loading" style="padding: 0"> <div ng-show="!loading" flex style="padding: 0">
<div id="content" layout="row" layout-align="start start" style="padding-left: 0px; padding-right: 0px; min-height: 53px; height: 53px;padding-top: 5px; padding-bottom: 0px; "> <div id="content" layout="row" layout-align="start start" style="padding-left: 0px; padding-right: 0px; min-height: 53px; height: 53px;padding-top: 5px; padding-bottom: 0px; ">
<span layout="row" style="padding-left: 0px;margin-top: 6px;margin-right: 5px; " flex layout-align="space-between center"> <span layout="row" style="padding-left: 0px;margin-top: 6px;margin-right: 5px; " flex layout-align="space-between center">
<md-autocomplete flex md-select-on-match="true" md-no-cache="true" md-selected-item="filter" md-selected-item-change="decoders.addFilter(filter.type, filter.name)" md-search-text="searchTerm" md-items="decoder in autoComplete | filter : searchTerm" md-item-text="decoder.name" md-min-length="0" md-no-asterisk="false" md-menu-class="autocomplete-custom-agents-bar" md-search-text-change="analizeDecoders(searchTerm)" placeholder="Search file"> <md-autocomplete flex md-select-on-match="true" md-no-cache="true" md-selected-item="filter" md-selected-item-change="decoders.addFilter(filter.type, filter.name)" md-search-text="searchTerm" md-items="decoder in autoComplete | filter : searchTerm" md-item-text="decoder.name" md-min-length="0" md-no-asterisk="false" md-menu-class="autocomplete-custom-agents-bar" md-search-text-change="analizeDecoders(searchTerm)" placeholder="Search file">
@ -57,8 +57,8 @@
<span flex="40">Fields</span> <span flex="40">Fields</span>
<span flex="20" ng-click="decoders.sort('file')">File <i class="fa" ng-class="decoders.sortValue === 'file' ? (decoders.sortDir ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span> <span flex="20" ng-click="decoders.sort('file')">File <i class="fa" ng-class="decoders.sortValue === 'file' ? (decoders.sortDir ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span>
</md-toolbar> </md-toolbar>
<div flex style="overflow: auto; height:400px;" layout-fill when-scrolled="decoders.nextPage('')">
<div flex style="overflow: auto; height:400px;" when-scrolled="decoders.nextPage('')">
<md-list class="agents-preview-table" ng-class-odd="'odd'" ng-class-even="'even'" ng-repeat='decoder in decoders.items | orderBy : decoders.sortValue : decoders.sortDir' ng-class="showDetails[decoder.name] ? 'ruleset_rules_row_active' : ''"> <md-list class="agents-preview-table" ng-class-odd="'odd'" ng-class-even="'even'" ng-repeat='decoder in decoders.items | orderBy : decoders.sortValue : decoders.sortDir' ng-class="showDetails[decoder.name] ? 'ruleset_rules_row_active' : ''">
<md-list-item class="rules-item-list" ng-click="showDetails[decoder.name] = ! showDetails[decoder.name]" ng-class="showDetails[decoder.name] ? 'ruleset_rules_row_active' : ''"> <md-list-item class="rules-item-list" ng-click="showDetails[decoder.name] = ! showDetails[decoder.name]" ng-class="showDetails[decoder.name] ? 'ruleset_rules_row_active' : ''">
<span flex="20">{{decoder.name}}</span> <span flex="20">{{decoder.name}}</span>

View File

@ -1,39 +1,31 @@
<md-content style="height: 100%;" id="rulesContainer" layout="column" flex layout-padding ng-if="!loading && globalRuleSet == 'ruleset' && globalsubmenuNavItem2 == 'rules'" <md-content style="height: 100%;" id="rulesContainer" layout="column" flex layout-padding ng-if="!loading && globalRuleSet == 'ruleset' && globalsubmenuNavItem2 == 'rules'"
ng-controller="rulesController" layout-align="start space-around" class="app-container wazuh-column"> ng-controller="rulesController" layout-align="start space-around" class="app-container wazuh-column">
<div class='uil-ring-css' ng-show="loading"><div></div></div>
<div class='uil-ring-css' ng-show="loading">
<div></div>
</div>
<!--<div ng-if="!loading" layout="row" layout-align="center stretch">--> <!--<div ng-if="!loading" layout="row" layout-align="center stretch">-->
<div layout="row" layout-align="center stretch" style="height: 180px;" class="wazuh-row"> <div ng-show="!loading" layout="row" layout-align="center stretch" style="height: 180px;" class="wazuh-row">
<md-card flex class="wazuh-column">
<md-card flex="50" class="wazuh-row"> <md-card-content class="wazuh-column">
<md-card-content class="wazuh-row">
<span class="md-headline-small">Top 24h - Rule ID</span> <span class="md-headline-small">Top 24h - Rule ID</span>
<kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-Rule-ID'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-Rule-ID"></kbn-vis> <kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-Rule-ID'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-Rule-ID"></kbn-vis>
</md-card-content> </md-card-content>
</md-card> </md-card>
<md-card flex class="wazuh-column">
<md-card flex="50" class="wazuh-row"> <md-card-content class="wazuh-column">
<md-card-content class="wazuh-row">
<span class="md-headline-small">Top 24h - Groups</span> <span class="md-headline-small">Top 24h - Groups</span>
<kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-Groups'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-Groups"></kbn-vis> <kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-Groups'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-Groups"></kbn-vis>
</md-card-content> </md-card-content>
</md-card> </md-card>
</div> <md-card flex class="wazuh-column">
<div layout="row" layout-align="center stretch" class="wazuh-row" style="height: 180px;"> <md-card-content class="wazuh-column">
<md-card flex="50" class="wazuh-row">
<md-card-content>
<span class="md-headline-small">Top 24h - PCI DSS requirements</span> <span class="md-headline-small">Top 24h - PCI DSS requirements</span>
<kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-PCI-DSS-requirements'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-PCI-DSS-requirements"></kbn-vis> <kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-PCI-DSS-requirements'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-PCI-DSS-requirements"></kbn-vis>
</md-card-content> </md-card-content>
</md-card> </md-card>
<md-card flex class="wazuh-column">
<md-card flex="50" class="wazuh-row"> <md-card-content class="wazuh-column">
<md-card-content class="wazuh-row">
<span class="md-headline-small">Top 24h - Level</span> <span class="md-headline-small">Top 24h - Level</span>
<kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-Level'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-Level"></kbn-vis> <kbn-vis vis-id="'Wazuh-App-Manager-Ruleset-Rules-Top-24h-Level'" id="Wazuh-App-Manager-Ruleset-Rules-Top-24h-Level"></kbn-vis>
</md-card-content> </md-card-content>
@ -114,8 +106,8 @@
<i class="fa" ng-class="rules.sortValue === 'level' ? (rules.sortDir ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i> <i class="fa" ng-class="rules.sortValue === 'level' ? (rules.sortDir ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i>
</span> </span>
</md-toolbar> </md-toolbar>
<div flex style="overflow: auto; height:400px;" layout-fill when-scrolled="rules.nextPage('')">
<div flex style="overflow: auto; height:400px;" layout-fill when-scrolled="rules.nextPage('')">
<md-list ng-repeat='rule in rules.items | orderBy : rules.sortValue : rules.sortDir' ng-class-odd="'odd'" ng-class-even="'even'" <md-list ng-repeat='rule in rules.items | orderBy : rules.sortValue : rules.sortDir' ng-class-odd="'odd'" ng-class-even="'even'"
class="agents-preview-table" ng-class="showDetails[rule.id] ? 'ruleset_rules_row_active' : ''"> class="agents-preview-table" ng-class="showDetails[rule.id] ? 'ruleset_rules_row_active' : ''">
<md-list-item class="rules-item-list" ng-click="showDetails[rule.id] = !showDetails[rule.id]" ng-class="showDetails[rule.id] ? 'ruleset_rules_row_active' : ''"> <md-list-item class="rules-item-list" ng-click="showDetails[rule.id] = !showDetails[rule.id]" ng-class="showDetails[rule.id] ? 'ruleset_rules_row_active' : ''">

View File

@ -1,5 +1,2 @@
<div flex layout="column" ng-if="globalRuleSet == 'ruleset'" style="height: 100%"> <div flex layout="column" ng-if="globalRuleSet == 'ruleset'" style="height: 100%">
<div style="display: none;">
<kbn-searchbar></kbn-searchbar>
</div>
<md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="load"></md-progress-linear> <md-progress-linear class="md-accent" md-mode="indeterminate" ng-show="load"></md-progress-linear>

View File

@ -834,7 +834,7 @@
"_source": { "_source": {
"title": "Wazuh App Overview Audit Alerts over time", "title": "Wazuh App Overview Audit Alerts over time",
"visState": "{\"params\": {\"scale\": \"linear\", \"yAxis\": {}, \"smoothLines\": true, \"setYExtents\": false, \"legendPosition\": \"right\", \"addTimeMarker\": false, \"interpolate\": \"linear\", \"addLegend\": true, \"shareYAxis\": true, \"mode\": \"overlap\", \"defaultYExtents\": false, \"times\": [], \"addTooltip\": true}, \"listeners\": {}, \"type\": \"area\", \"aggs\": [{\"type\": \"count\", \"enabled\": true, \"id\": \"1\", \"params\": {}, \"schema\": \"metric\"}, {\"type\": \"date_histogram\", \"enabled\": true, \"id\": \"2\", \"params\": {\"customInterval\": \"2h\", \"field\": \"@timestamp\", \"interval\": \"auto\", \"extended_bounds\": {}, \"min_doc_count\": 1}, \"schema\": \"segment\"}, {\"type\": \"terms\", \"enabled\": true, \"id\": \"3\", \"params\": {\"orderBy\": \"1\", \"field\": \"rule.description\", \"order\": \"desc\", \"size\": 10}, \"schema\": \"group\"}], \"title\": \"Audit: Alerts over time\"}", "visState": "{\"params\": {\"scale\": \"linear\", \"yAxis\": {}, \"smoothLines\": true, \"setYExtents\": false, \"legendPosition\": \"right\", \"addTimeMarker\": false, \"interpolate\": \"linear\", \"addLegend\": true, \"shareYAxis\": true, \"mode\": \"overlap\", \"defaultYExtents\": false, \"times\": [], \"addTooltip\": true}, \"listeners\": {}, \"type\": \"area\", \"aggs\": [{\"type\": \"count\", \"enabled\": true, \"id\": \"1\", \"params\": {}, \"schema\": \"metric\"}, {\"type\": \"date_histogram\", \"enabled\": true, \"id\": \"2\", \"params\": {\"customInterval\": \"2h\", \"field\": \"@timestamp\", \"interval\": \"auto\", \"extended_bounds\": {}, \"min_doc_count\": 1}, \"schema\": \"segment\"}, {\"type\": \"terms\", \"enabled\": true, \"id\": \"3\", \"params\": {\"orderBy\": \"1\", \"field\": \"rule.description\", \"order\": \"desc\", \"size\": 10}, \"schema\": \"group\"}], \"title\": \"Audit: Alerts over time\"}",
"uiStateJSON": "{\"vis\":{\"legendOpen\":false}}", "uiStateJSON": "{}",
"description": "", "description": "",
"version": 1, "version": 1,
"kibanaSavedObjectMeta": { "kibanaSavedObjectMeta": {