diff --git a/README.md b/README.md index 4da60ab..4874e54 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # Mapster - +![Kibana Tag Cloud](sec_screenv1.gif) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/893661b4aa2f45378d96c21768b7ea8b)](https://www.codacy.com/app/xarkes/mapster) Mapster is a real-time event map implemented as a [Kibana](https://github.com/elastic/kibana) [visualization](https://www.elastic.co/guide/en/kibana/current/visualize.html). - # How does it work Mapster is not truely in real-time. It fetches the events from ElasticSearch using Kibana and replays the events in real time with a lag corresponding to the Kibana refresh time. @@ -15,18 +14,22 @@ To draw the 2D map, Mapster uses [d3js](https://d3js.org/) and it uses [threejs] # Installation ## Requirements -- Kibana 4.5.0 (the only supported version for now) +- Kibana 5.2.2 ## Instructions Simply clone the repository into your Kibana plugins folder: -```sh -cd installedPlugins && git clone https://github.com/xarkes/mapster +``` + mkdir kibana && cd kibana + git clone https://github.com/elastickent/mapster + cd ../ + zip -r mapster.zip kibana + $KIBANA_HOME/bin/kibana-plugin install file:///`pwd`/mapster.zip ``` If you are using Kibana from git and starting it in `dev` mode, Kibana will automatically refresh its cache and the plugin will be successfully loaded. Otherwise you can force it by stopping kibana, deleting the cache and starting kibana again. -```sh +``` rm -r optimize/bundles ./bin/kibana ``` @@ -77,8 +80,3 @@ Then you can add any other aggregation if you need to filter your events using t | Explosion delay (in ms) | The duration in ms of the gif. | | Number of events in the logs | Number of lines in the event logs table. | | | | - - -# Screenshots -![Mapster](/docs/mapster.png?raw=true "Mapster map") -![Mapster](/docs/globe.png?raw=true "Mapster globe") diff --git a/package.json b/package.json index 1b6598a..fb729bc 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,4 @@ { "name": "mapster", - "version": "0.0.0" + "version": "5.5.1" } diff --git a/public/lib/mapster_controller.js b/public/lib/mapster_controller.js index 1e5b208..6639c7a 100644 --- a/public/lib/mapster_controller.js +++ b/public/lib/mapster_controller.js @@ -1,7 +1,7 @@ var _ = require('lodash'); var geohash = require('plugins/mapster/lib/latlon-geohash.js'); -import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify'; +import { AggResponseTabifyTabifyProvider } from 'ui/agg_response/tabify/tabify'; var module = require('ui/modules').get('mapster'); @@ -115,4 +115,3 @@ module.controller('MapsterController', function ($scope, Private) { }); }); - diff --git a/public/mapster.js b/public/mapster.js index 09922ec..51099e7 100644 --- a/public/mapster.js +++ b/public/mapster.js @@ -3,17 +3,24 @@ require('plugins/mapster/lib/mapster_controller.js'); require('plugins/mapster/lib/mapster_directive.js'); require('plugins/mapster/mapster_params_editor.js'); import 'ui/visualize/visualize_legend'; +import { VisTypesRegistryProvider } from 'ui/registry/vis_types'; +import { VisSchemasProvider } from 'ui/vis/schemas'; +import { TemplateVisTypeProvider } from 'ui/template_vis_type/template_vis_type'; +import MapsterTemplate from 'plugins/mapster/mapster.html'; +import MapsterParamsEditor from 'plugins/mapster/mapster_params_editor.html' function mapsterProvider(Private) { - var TemplateVisType = Private(require('ui/template_vis_type/TemplateVisType')); - var Schemas = Private(require('ui/Vis/Schemas')); + // var TemplateVisType = Private(require('ui/template_vis_type/template_vis_type')); + // var Schemas = Private(require('ui/vis/schemas')); + const TemplateVisType = Private(TemplateVisTypeProvider); + const Schemas = Private(VisSchemasProvider); return new TemplateVisType({ name: 'mapster', title: 'Mapster', description: 'MAPSTER MUCH PIEW MUCH WOW', icon: 'fa-globe', - template: require('plugins/mapster/mapster.html'), + template: MapsterTemplate, params: { defaults: { /* GENERAL */ @@ -40,7 +47,7 @@ function mapsterProvider(Private) { ExplosionDelay: 2700, maximumEvents: 10 }, - editor: require('plugins/mapster/mapster_params_editor.html') + editor: MapsterParamsEditor }, schemas: new Schemas([ { @@ -105,5 +112,5 @@ function mapsterProvider(Private) { }); } -require('ui/registry/vis_types').register(mapsterProvider); - +VisTypesRegistryProvider.register(mapsterProvider); +// require('ui/registry/vis_types').register(mapsterProvider); diff --git a/public/mapster.less b/public/mapster.less index b829541..ffb8a76 100644 --- a/public/mapster.less +++ b/public/mapster.less @@ -13,7 +13,6 @@ } mapster { - border: 1px solid black; width: 99%; height: 99%; } diff --git a/sec_screenv1.gif b/sec_screenv1.gif new file mode 100644 index 0000000..896f56d Binary files /dev/null and b/sec_screenv1.gif differ