Several visualizations working :D

This commit is contained in:
Pedro S 2016-08-05 17:13:21 -07:00
parent f9972b70c7
commit 20f855b845
2 changed files with 46 additions and 32 deletions

View File

@ -79,11 +79,11 @@ var app = require('ui/modules').get('app/wazuh', [])
require('ui/modules').get('app/wazuh', [])
.controller('VisEditorW', function ($scope, $route, timefilter, AppState, $location, kbnUrl, $timeout, courier, Private, Promise, savedVisualizations) {
console.log("-2");
console.log($route);
$route.current.params._a = "(filters:!(),linked:!f,query:'*',uiState:(),vis:(aggs:!((enabled:!t,id:'1',params:(),schema:metric,type:count),(enabled:!t,id:'2',params:(field:AgentName,order:desc,orderBy:'1',size:5),schema:segment,type:terms)),listeners:(),params:(addLegend:!t,addTooltip:!t,isDonut:!f,shareYAxis:!t),title:'New Visualization',type:pie))";
$route.updateParams({ '_a' : $route.current.params._a});
console.log(kbnUrl);
//console.log("-2");
//console.log($route);
$route.current.params._a = $scope.visA;
$route.updateParams({ '_a' : $scope.visA});
//console.log(kbnUrl);
$scope.chrome = {};
$scope.chrome.getVisible = function () {
return true;
@ -112,8 +112,8 @@ require('ui/modules').get('app/wazuh', [])
const savedVis = _sVis;
console.log("-1");
console.log(_sVis);
//console.log("-1");
//console.log(_sVis);
const vis = savedVis.vis;
const editableVis = vis.createEditableVis();
@ -138,10 +138,13 @@ require('ui/modules').get('app/wazuh', [])
let $state = $scope.$state = (function initState() {
const savedVisState = "(aggs:!((enabled:!t,id:'1',params:(),schema:metric,type:count),(enabled:!t,id:'2',params:(field:AgentIP,order:desc,orderBy:'1',size:5),schema:segment,type:terms)),listeners:(),params:(addLegend:!t,addTooltip:!t,isDonut:!f,shareYAxis:!t),title:'New%20Visualization',type:pie)";
//vis.setState(savedVisState);
console.log("1");
console.log(savedVisState);
console.log("2");
console.log(vis);
$route.current.params._a = $scope.visA;
$route.updateParams({ '_a' : $scope.visA});
console.log($scope.visA);
//console.log("1");
//console.log(savedVisState);
//console.log("2");
//console.log(vis);
const stateDefaults = {
uiState: {},
linked: false,
@ -152,8 +155,8 @@ require('ui/modules').get('app/wazuh', [])
$state = new AppState(stateDefaults);
// query:(query_string:(analyze_wildcard:!t,query:'*'))
console.log("3");
console.log($state);
//console.log("3");
//console.log($state);
if ($scope.visFilter) {
$state.query = $scope.visFilter;
@ -166,21 +169,21 @@ require('ui/modules').get('app/wazuh', [])
function init() {
// export some objects
$scope.savedVis = savedVis;
console.log("4");
console.log(savedVis);
//console.log("4");
//console.log(savedVis);
$scope.searchSource = searchSource;
$scope.vis = vis;
console.log("5");
console.log(vis);
//console.log("5");
//console.log(vis);
$scope.indexPattern = vis.indexPattern;
$scope.editableVis = editableVis;
$scope.state = $state;
$scope.uiState = $state.makeStateful('uiState');
console.log("6");
console.log(vis);
//console.log("6");
//console.log(vis);
vis.setUiState($scope.uiState);
console.log("7");
console.log(vis);
//console.log("7");
//console.log(vis);
$scope.timefilter = timefilter;
$scope.opts = _.pick($scope, 'doSave', 'savedVis', 'shareData', 'timefilter');
@ -231,21 +234,23 @@ require('ui/modules').get('app/wazuh', [])
$scope.$listen($state, 'fetch_with_changes', function (keys) {
console.log("8");
//console.log("8");
if (_.contains(keys, 'linked') && $state.linked === true) {
return;
}
console.log("Aqui el estado fuera");
console.log($state.vis);
//console.log("Aqui el estado fuera");
//console.log($state.vis);
//if (_.contains(keys, 'vis')) {
console.log("9");
//console.log("9");
$state.vis.listeners = _.defaults($state.vis.listeners || {}, vis.listeners);
// only update when we need to, otherwise colors change and we
// risk loosing an in-progress result
console.log("Aqui el estado dentro");
console.log($state.vis);
//console.log("Aqui el estado dentro");
//console.log($state.vis);
vis.setState($state.vis);
editableVis.setState($state.vis);
//}
@ -253,7 +258,7 @@ require('ui/modules').get('app/wazuh', [])
// we use state to track query, must write before we fetch
if ($state.query && !$state.linked) {
//REALLY UPDATE THE QUERY OVER THE DEFAULT STATE
console.log("10");
//console.log("10");
searchSource.set('query', $state.query);
} else {
searchSource.set('query', null);
@ -273,7 +278,7 @@ require('ui/modules').get('app/wazuh', [])
$scope.$listen(timefilter, 'fetch', _.bindKey($scope, 'fetch'));
$scope.$on('ready:vis', function () {
console.log("11");
//console.log("11");
$scope.$emit('application.load');
$state.emit('fetch_with_changes');
});
@ -351,7 +356,7 @@ require('ui/modules').get('app/wazuh', [])
function transferVisState(fromVis, toVis, stage) {
return function () {
console.log("12");
//console.log("12");
const view = fromVis.getEnabledState();
const full = fromVis.getState();
toVis.setState(view);

View File

@ -41,15 +41,24 @@
</md-autocomplete>
</form>
</md-content>
<md-content layout-padding layout="row">
<!-- kbn vis-->
<div flex>
<kbn-vis vis-height="600px;" vis-type="pie" vis-index-pattern="ossec-*"
vis-a="(filters:!(),linked:!f,query:(query_string:(analyze_wildcard:!t,query:'*')),uiState:(),vis:(aggs:!((enabled:!t,id:'1',params:(),schema:metric,type:count),(enabled:!t,id:'2',params:(field:AgentID,order:desc,orderBy:'1',size:5),schema:segment,type:terms)),listeners:(),params:(addLegend:!t,addTooltip:!t,isDonut:!f,shareYAxis:!t),title:'New%20Visualization',type:pie))"
vis-a="(filters:!(),linked:!f,query:'*',uiState:(),vis:(aggs:!((enabled:!t,id:'1',params:(),schema:metric,type:count),(enabled:!t,id:'2',params:(field:AgentIP,order:desc,orderBy:'1',size:5),schema:segment,type:terms)),listeners:(),params:(addLegend:!t,addTooltip:!t,isDonut:!f,shareYAxis:!t),title:'New Visualization',type:pie))"
vis-g="(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-5y,mode:quick,to:now))" vis-filter="*" vis-searchable="true">
</kbn-vis>
</div>
<div flex>
<kbn-vis vis-height="600px;" vis-type="pie" vis-index-pattern="ossec-*"
vis-a="(filters:!(),linked:!f,query:'*',uiState:(),vis:(aggs:!((enabled:!t,id:'1',params:(),schema:metric,type:count),(enabled:!t,id:'2',params:(field:AgentName,order:desc,orderBy:'1',size:5),schema:segment,type:terms)),listeners:(),params:(addLegend:!t,addTooltip:!t,isDonut:!f,shareYAxis:!t),title:'New Visualization',type:pie))"
vis-g="(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-5y,mode:quick,to:now))" vis-filter="*" vis-searchable="true">
</kbn-vis>
</div>
</md-content>
<!--<kbn-vis vis-height="600px;" vis-type="histogram" vis-index-pattern="ossec-*"
vis-a="(filters:!(),linked:!f,query:(query_string:(analyze_wildcard:!t,query:'*')),uiState:(vis:(params:(sort:(columnIndex:!n,direction:!n)))),vis:(aggs:!((enabled:!t,id:'1',params:(),schema:metric,type:count),(enabled:!t,id:'2',params:(field:rule.sidid,order:desc,orderBy:'1',size:5),schema:bucket,type:terms)),listeners:(),params:(perPage:10,showMeticsAtAllLevels:!f,showPartialRows:!f,showTotal:!f,sort:(columnIndex:!n,direction:!n),totalFunc:sum),title:'New%20Visualization',type:table))"
vis-g="(refreshInterval:(display:Off,pause:!f,value:0),time:(from:now-5y,mode:quick,to:now))" vis-filter="syscheck" vis-searchable="true">