"+e+"
",className:"marker-cluster"+i,iconSize:new L.Point(40,40)})},_bindEvents:function(){var t=null,e=this._map,i=this.options.spiderfyOnMaxZoom,n=this.options.showCoverageOnHover,r=this.options.zoomToBoundsOnClick;(i||r)&&this.on("clusterclick",function(t){e.getMaxZoom()===e.getZoom()?i&&t.layer.spiderfy():r&&t.layer.zoomToBounds()},this),n&&(this.on("clustermouseover",function(i){this._inZoomAnimation||(t&&e.removeLayer(t),i.layer.getChildCount()>2&&i.layer!==this._spiderfied&&(t=new L.Polygon(i.layer.getConvexHull(),this.options.polygonOptions),e.addLayer(t)))},this),this.on("clustermouseout",function(){t&&(e.removeLayer(t),t=null)},this),e.on("zoomend",function(){t&&(e.removeLayer(t),t=null)},this),e.on("layerremove",function(i){t&&i.layer===this&&(e.removeLayer(t),t=null)},this))},_unbindEvents:function(){var t=this.options.spiderfyOnMaxZoom,e=this.options.showCoverageOnHover,i=this.options.zoomToBoundsOnClick,n=this._map;(t||i)&&this.off("clusterclick",null,this),e&&(this.off("clustermouseover",null,this),this.off("clustermouseout",null,this),n.off("zoomend",null,this),n.off("layerremove",null,this))},_zoomEnd:function(){this._map&&(this._mergeSplitClusters(),this._zoom=this._map._zoom,this._currentShownBounds=this._getExpandedVisibleBounds())},_moveEnd:function(){if(!this._inZoomAnimation){var t=this._getExpandedVisibleBounds();this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds,this._zoom,t),this._topClusterLevel._recursivelyAddChildrenToMap(null,this._zoom,t),this._currentShownBounds=t}},_generateInitialClusters:function(){var t=this._map.getMaxZoom(),e=this.options.maxClusterRadius;this.options.disableClusteringAtZoom&&(t=this.options.disableClusteringAtZoom-1),this._maxZoom=t,this._gridClusters={},this._gridUnclustered={};for(var i=t;i>=0;i--)this._gridClusters[i]=new L.DistanceGrid(e),this._gridUnclustered[i]=new L.DistanceGrid(e);this._topClusterLevel=new L.MarkerCluster(this,-1)},_addLayer:function(t,e){var i,n,r=this._gridClusters,s=this._gridUnclustered;for(this.options.singleMarkerMode&&(t.options.icon=this.options.iconCreateFunction({getChildCount:function(){return 1},getAllChildMarkers:function(){return[t]}}));e>=0;e--){i=this._map.project(t.getLatLng(),e);var o=r[e].getNearObject(i);if(o)return o._addChild(t),t.__parent=o,void 0;if(o=s[e].getNearObject(i)){var a=o.__parent;a&&this._removeLayer(o,!1);var l=new L.MarkerCluster(this,e,o,t);r[e].addObject(l,this._map.project(l._cLatLng,e)),o.__parent=l,t.__parent=l;var _=l;for(n=e-1;n>a._zoom;n--)_=new L.MarkerCluster(this,n,_),r[n].addObject(_,this._map.project(o.getLatLng(),n));for(a._addChild(_),n=e;n>=0&&s[n].removeObject(o,this._map.project(o.getLatLng(),n));n--);return}s[e].addObject(t,i)}this._topClusterLevel._addChild(t),t.__parent=this._topClusterLevel},_mergeSplitClusters:function(){this._zoom
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/bettermap/module.js b/src/app/panels/bettermap/module.js
deleted file mode 100644
index d1cfd14450e..00000000000
--- a/src/app/panels/bettermap/module.js
+++ /dev/null
@@ -1,268 +0,0 @@
-/** @scratch /panels/5
- * include::panels/bettermap.asciidoc[]
- */
-
-/** @scratch /panels/bettermap/0
- * == Bettermap
- * Status: *Experimental*
- *
- * Bettermap is called bettermap for lack of a better name. Bettermap uses geographic coordinates to
- * create clusters of markers on map and shade them orange, yellow and green depending on the
- * density of the cluster.
- *
- * To drill down, click on a cluster. The map will be zoomed and the cluster broken into smaller cluster.
- * When it no longer makes visual sense to cluster, individual markers will be displayed. Hover over
- * a marker to see the tooltip value/
- *
- * IMPORTANT: bettermap requires an internet connection to download its map panels.
- */
-define([
- 'angular',
- 'app',
- 'underscore',
- './leaflet/leaflet-src',
- 'require',
-
- 'css!./module.css',
- 'css!./leaflet/leaflet.css',
- 'css!./leaflet/plugins.css'
-],
-function (angular, app, _, L, localRequire) {
- 'use strict';
-
- var module = angular.module('kibana.panels.bettermap', []);
- app.useModule(module);
-
- module.controller('bettermap', function($scope, querySrv, dashboard, filterSrv) {
- $scope.panelMeta = {
- editorTabs : [
- {
- title: 'Queries',
- src: 'app/partials/querySelect.html'
- }
- ],
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- status : "Experimental",
- description : "Displays geo points in clustered groups on a map. The cavaet for this panel is"+
- " that, for better or worse, it does NOT use the terms facet and it does query "+
- "sequentially. This however means that it transfers more data and is generally heavier to"+
- " compute, while showing less actual data. If you have a time filter, it will attempt to"+
- " show to most recent points in your search, up to your defined limit"
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/bettermap/3
- * === Parameters
- *
- * field:: The field that contains the coordinates, in geojson format. GeoJSON is
- * +[longitude,latitude]+ in an array. This is different from most implementations, which use
- * latitude, longitude.
- */
- field : null,
- /** @scratch /panels/bettermap/5
- * size:: The number of documents to use when drawing the map
- */
- size : 1000,
- /** @scratch /panels/bettermap/5
- * spyable:: Should the `inspect` icon be shown?
- */
- spyable : true,
- /** @scratch /panels/bettermap/5
- * tooltip:: Which field to use for the tooltip when hovering over a marker
- */
- tooltip : "_id",
- /** @scratch /panels/bettermap/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- };
-
- _.defaults($scope.panel,_d);
-
- // inorder to use relative paths in require calls, require needs a context to run. Without
- // setting this property the paths would be relative to the app not this context/file.
- $scope.requireContext = localRequire;
-
- $scope.init = function() {
- $scope.$on('refresh',function(){
- $scope.get_data();
- });
- $scope.get_data();
- };
-
- $scope.get_data = function(segment,query_id) {
- $scope.require(['./leaflet/plugins'], function () {
- $scope.panel.error = false;
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
-
- if(_.isUndefined($scope.panel.field)) {
- $scope.panel.error = "Please select a field that contains geo point in [lon,lat] format";
- return;
- }
-
- // Determine the field to sort on
- var timeField = _.uniq(_.pluck(filterSrv.getByType('time'),'field'));
- if(timeField.length > 1) {
- $scope.panel.error = "Time field must be consistent amongst time filters";
- } else if(timeField.length === 0) {
- timeField = null;
- } else {
- timeField = timeField[0];
- }
-
- var _segment = _.isUndefined(segment) ? 0 : segment;
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
- var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- var boolQuery = $scope.ejs.BoolQuery();
- _.each(queries,function(q) {
- boolQuery = boolQuery.should(querySrv.toEjsObj(q));
- });
-
- var request = $scope.ejs.Request().indices(dashboard.indices[_segment])
- .query($scope.ejs.FilteredQuery(
- boolQuery,
- filterSrv.getBoolFilter(filterSrv.ids).must($scope.ejs.ExistsFilter($scope.panel.field))
- ))
- .fields([$scope.panel.field,$scope.panel.tooltip])
- .size($scope.panel.size);
-
- if(!_.isNull(timeField)) {
- request = request.sort(timeField,'desc');
- }
-
- $scope.populate_modal(request);
-
- var results = request.doSearch();
-
- // Populate scope when we have results
- results.then(function(results) {
- $scope.panelMeta.loading = false;
-
- if(_segment === 0) {
- $scope.hits = 0;
- $scope.data = [];
- query_id = $scope.query_id = new Date().getTime();
- }
-
- // Check for error and abort if found
- if(!(_.isUndefined(results.error))) {
- $scope.panel.error = $scope.parse_error(results.error);
- return;
- }
-
- // Check that we're still on the same query, if not stop
- if($scope.query_id === query_id) {
-
- // Keep only what we need for the set
- $scope.data = $scope.data.slice(0,$scope.panel.size).concat(_.map(results.hits.hits, function(hit) {
- return {
- coordinates : new L.LatLng(hit.fields[$scope.panel.field][1],hit.fields[$scope.panel.field][0]),
- tooltip : hit.fields[$scope.panel.tooltip]
- };
- }));
-
- } else {
- return;
- }
-
- $scope.$emit('draw');
-
- // Get $size results then stop querying
- if($scope.data.length < $scope.panel.size && _segment+1 < dashboard.indices.length) {
- $scope.get_data(_segment+1,$scope.query_id);
- }
-
- });
- });
- };
-
- $scope.populate_modal = function(request) {
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
- };
-
- });
-
- module.directive('bettermap', function() {
- return {
- restrict: 'A',
- link: function(scope, elem, attrs) {
-
- elem.html('
-
\ No newline at end of file
diff --git a/src/app/panels/dashcontrol/load.html b/src/app/panels/dashcontrol/load.html
deleted file mode 100644
index 29afae124be..00000000000
--- a/src/app/panels/dashcontrol/load.html
+++ /dev/null
@@ -1,40 +0,0 @@
-Allow saving to
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Allow loading from
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Sharing
-
-
-
-
-
-
-
-
-
-
-
-
- ×
-
diff --git a/src/app/panels/dashcontrol/module.html b/src/app/panels/dashcontrol/module.html
deleted file mode 100644
index 6ea3aec639c..00000000000
--- a/src/app/panels/dashcontrol/module.html
+++ /dev/null
@@ -1,6 +0,0 @@
-Load
-
-
- Local File
- -
-
- Gist Enter a gist number or url
- -
-
-
-
-Elasticsearch
- -Elasticsearch stored dashboards
-No dashboards matching your query found
-| - | {{row._id}} | -- |
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/dashcontrol/module.js b/src/app/panels/dashcontrol/module.js
deleted file mode 100644
index fb10bbf5c7c..00000000000
--- a/src/app/panels/dashcontrol/module.js
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- ## Dashcontrol
-
- ### Parameters
- * save
- ** gist :: Allow saving to gist. Requires registering an oauth domain with Github
- ** elasticsearch :: Allow saving to a special Kibana index within Elasticsearch
- ** local :: Allow saving to local file
- * load
- ** gist :: Allow loading from gists
- ** elasticsearch :: Allow searching and loading of elasticsearch saved dashboards
- ** local :: Allow loading of dashboards from Elasticsearch
- * hide_control :: Upon save, hide this panel
- * elasticsearch_size :: show this many dashboards under the ES section in the load drop down
- * temp :: Allow saving of temp dashboards
- * ttl :: Enable setting ttl.
- * temp_ttl :: How long should temp dashboards persist
-*/
-define([
- 'angular',
- 'app',
- 'underscore'
-],
-function(angular, app, _) {
- 'use strict';
-
- var module = angular.module('kibana.panels.dashcontrol', []);
- app.useModule(module);
-
- module.controller('dashcontrol', function($scope, $http, timer, dashboard, alertSrv) {
- $scope.panelMeta = {
- status : "Deprecated",
- description : "This panel has been moved to the navigation bar. See the dashboard setting editor to configure it."
- };
-
- $scope.panel = $scope.panel || {};
- // Set and populate defaults
- var _d = {
- save : {
- gist: false,
- elasticsearch: true,
- local: true,
- 'default': true
- },
- load : {
- gist: true,
- elasticsearch: true,
- local: true
- },
- hide_control: false,
- elasticsearch_size: 20,
- temp: true,
- ttl_enable: true,
- temp_ttl: '30d'
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function() {
- $scope.gist_pattern = /(^\d{5,}$)|(^[a-z0-9]{10,}$)|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/;
- $scope.gist = {};
- $scope.elasticsearch = {};
- };
-
- $scope.set_default = function() {
- if(dashboard.set_default()) {
- alertSrv.set('Local Default Set',dashboard.current.title+' has been set as your local default','success',5000);
- } else {
- alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000);
- }
- };
-
- $scope.purge_default = function() {
- if(dashboard.purge_default()) {
- alertSrv.set('Local Default Clear','Your local default dashboard has been cleared','success',5000);
- } else {
- alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000);
- }
- };
-
- $scope.elasticsearch_save = function(type,ttl) {
- dashboard.elasticsearch_save(
- type,
- ($scope.elasticsearch.title || dashboard.current.title),
- ($scope.panel.ttl_enable ? ttl : false)
- ).then(
- function(result) {
- if(!_.isUndefined(result._id)) {
- alertSrv.set('Dashboard Saved','This dashboard has been saved to Elasticsearch as "' +
- result._id + '"','success',5000);
- if(type === 'temp') {
- $scope.share = dashboard.share_link(dashboard.current.title,'temp',result._id);
- }
- } else {
- alertSrv.set('Save failed','Dashboard could not be saved to Elasticsearch','error',5000);
- }
- });
- };
-
- $scope.elasticsearch_delete = function(id) {
- dashboard.elasticsearch_delete(id).then(
- function(result) {
- if(!_.isUndefined(result)) {
- if(result.found) {
- alertSrv.set('Dashboard Deleted',id+' has been deleted','success',5000);
- // Find the deleted dashboard in the cached list and remove it
- var toDelete = _.where($scope.elasticsearch.dashboards,{_id:id})[0];
- $scope.elasticsearch.dashboards = _.without($scope.elasticsearch.dashboards,toDelete);
- } else {
- alertSrv.set('Dashboard Not Found','Could not find '+id+' in Elasticsearch','warning',5000);
- }
- } else {
- alertSrv.set('Dashboard Not Deleted','An error occurred deleting the dashboard','error',5000);
- }
- }
- );
- };
-
- $scope.elasticsearch_dblist = function(query) {
- dashboard.elasticsearch_list(query,$scope.panel.elasticsearch_size).then(
- function(result) {
- if(!_.isUndefined(result.hits)) {
- $scope.panel.error = false;
- $scope.hits = result.hits.total;
- $scope.elasticsearch.dashboards = result.hits.hits;
- }
- });
- };
-
- $scope.save_gist = function() {
- dashboard.save_gist($scope.gist.title).then(
- function(link) {
- if(!_.isUndefined(link)) {
- $scope.gist.last = link;
- alertSrv.set('Gist saved','You will be able to access your exported dashboard file at '+
- ''+link+' in a moment','success');
- } else {
- alertSrv.set('Save failed','Gist could not be saved','error',5000);
- }
- });
- };
-
- $scope.gist_dblist = function(id) {
- dashboard.gist_list(id).then(
- function(files) {
- if(files && files.length > 0) {
- $scope.gist.files = files;
- } else {
- alertSrv.set('Gist Failed','Could not retrieve dashboard list from gist','error',5000);
- }
- });
- };
- });
-
- module.directive('dashUpload', function(timer, dashboard, alertSrv){
- return {
- restrict: 'A',
- link: function(scope) {
- function file_selected(evt) {
- var files = evt.target.files; // FileList object
-
- // unused.. var output = []; // files is a FileList of File objects. List some properties.
- var readerOnload = function() {
- return function(e) {
- dashboard.dash_load(JSON.parse(e.target.result));
- scope.$apply();
- };
- };
- for (var i = 0, f; f = files[i]; i++) {
- var reader = new FileReader();
- reader.onload = (readerOnload)(f);
- reader.readAsText(f);
- }
- }
-
- // Check for the various File API support.
- if (window.File && window.FileReader && window.FileList && window.Blob) {
- // Something
- document.getElementById('dashupload').addEventListener('change', file_selected, false);
- } else {
- alertSrv.set('Oops','Sorry, the HTML5 File APIs are not fully supported in this browser.','error');
- }
- }
- };
- });
-
- module.filter('gistid', function() {
- var gist_pattern = /(\d{5,})|([a-z0-9]{10,})|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/;
- return function(input) {
- //return input+"boners"
- if(!(_.isUndefined(input))) {
- var output = input.match(gist_pattern);
- if(!_.isNull(output) && !_.isUndefined(output)) {
- return output[0].replace(/.*\//, '');
- }
- }
- };
- });
-});
\ No newline at end of file
diff --git a/src/app/panels/dashcontrol/save.html b/src/app/panels/dashcontrol/save.html
deleted file mode 100644
index 2879c4a0999..00000000000
--- a/src/app/panels/dashcontrol/save.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/panels/dashcontrol/share.html b/src/app/panels/dashcontrol/share.html
deleted file mode 100644
index d542c2c1303..00000000000
--- a/src/app/panels/dashcontrol/share.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-{{share.title}} shareable link
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/derivequeries/editor.html b/src/app/panels/derivequeries/editor.html
deleted file mode 100644
index 281c6866c37..00000000000
--- a/src/app/panels/derivequeries/editor.html
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/panels/derivequeries/module.html b/src/app/panels/derivequeries/module.html
deleted file mode 100644
index 58e96a13b14..00000000000
--- a/src/app/panels/derivequeries/module.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/app/panels/derivequeries/module.js b/src/app/panels/derivequeries/module.js
deleted file mode 100644
index 50c338b3f29..00000000000
--- a/src/app/panels/derivequeries/module.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- ## Derivequeries
-
- ### Parameters
- * label :: The label to stick over the field
- * query :: A string to use as a filter for the terms facet
- * field :: the field to facet on
- * rest :: include a filter that matches all other terms,
- * size :: how many queries to generate
- * fields :: a list of fields known to us
- * query_mode :: how to create query
-
-*/
-define([
- 'angular',
- 'app',
- 'underscore'
-],
-function (angular, app, _) {
- 'use strict';
-
- var module = angular.module('kibana.panels.derivequeries', []);
- app.useModule(module);
-
- module.controller('derivequeries', function($scope) {
- $scope.panelMeta = {
- status : "Deprecated",
- description : "This panel has been replaced with the 'topN' mode in the query pull down."
- };
-
- // Set and populate defaults
- var _d = {
- loading : false,
- label : "Search",
- query : "*",
- ids : [],
- field : '_type',
- fields : [],
- spyable : true,
- rest : false,
- size : 5,
- mode : 'terms only',
- exclude : [],
- history : [],
- remember: 10 // max: 100, angular strap can't take a variable for items param
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function() {
- $scope.editing = false;
- };
- });
-});
\ No newline at end of file
diff --git a/src/app/panels/fields/editor.html b/src/app/panels/fields/editor.html
deleted file mode 100644
index 42ddee0315e..00000000000
--- a/src/app/panels/fields/editor.html
+++ /dev/null
@@ -1,10 +0,0 @@
- This panel has been removed and replaced with the new topN query type. Click the colored dot associated with a query to configure the, much improved, equivilent of a derived query.
-
-
-
-
diff --git a/src/app/panels/fields/micropanel.html b/src/app/panels/fields/micropanel.html
deleted file mode 100644
index 767c8fd359d..00000000000
--- a/src/app/panels/fields/micropanel.html
+++ /dev/null
@@ -1,25 +0,0 @@
-×
-
- Micro Analysis of {{micropanel.field}}
-
-
-
-
-
-
-{{field}} ({{Math.round((count / micropanel.count) * 100)}}%),
\ No newline at end of file
diff --git a/src/app/panels/fields/module.html b/src/app/panels/fields/module.html
deleted file mode 100644
index 79b6f4c08ce..00000000000
--- a/src/app/panels/fields/module.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
"+ - moment(hit.sort[1]).format('YYYY-MM-DD HH:mm:ss'), - score: hit.sort[0] - }; - })); - // Sort the data - $scope.annotations = _.sortBy($scope.annotations, function(v){ - // Sort in reverse - return v.score*($scope.panel.annotate.sort[1] === 'desc' ? -1 : 1); - }); - // And slice to the right size - $scope.annotations = $scope.annotations.slice(0,$scope.panel.annotate.size); - } - - // Tell the histogram directive to render. - $scope.$emit('render'); - - // If we still have segments left, get them - if(segment < dashboard.indices.length-1) { - $scope.get_data(segment+1,query_id); - } - } - }); - }; - - // function $scope.zoom - // factor :: Zoom factor, so 0.5 = cuts timespan in half, 2 doubles timespan - $scope.zoom = function(factor) { - var _range = filterSrv.timeRange('last'); - var _timespan = (_range.to.valueOf() - _range.from.valueOf()); - var _center = _range.to.valueOf() - _timespan/2; - - var _to = (_center + (_timespan*factor)/2); - var _from = (_center - (_timespan*factor)/2); - - // If we're not already looking into the future, don't. - if(_to > Date.now() && _range.to < Date.now()) { - var _offset = _to - Date.now(); - _from = _from - _offset; - _to = Date.now(); - } - - if(factor > 1) { - filterSrv.removeByType('time'); - } - filterSrv.set({ - type:'time', - from:moment.utc(_from).toDate(), - to:moment.utc(_to).toDate(), - field:$scope.panel.time_field - }); - }; - - // I really don't like this function, too much dom manip. Break out into directive? - $scope.populate_modal = function(request) { - $scope.inspector = angular.toJson(JSON.parse(request.toString()),true); - }; - - $scope.set_refresh = function (state) { - $scope.refresh = state; - }; - - $scope.close_edit = function() { - if($scope.refresh) { - $scope.get_data(); - } - $scope.refresh = false; - $scope.$emit('render'); - }; - - $scope.render = function() { - $scope.$emit('render'); - }; - - }); - - module.directive('histogramChart', function(dashboard, filterSrv) { - return { - restrict: 'A', - template: '', - link: function(scope, elem) { - - // Receive render events - scope.$on('render',function(){ - render_panel(); - }); - - // Re-render if the window is resized - angular.element(window).bind('resize', function(){ - render_panel(); - }); - - var scale = function(series,factor) { - return _.map(series,function(p) { - return [p[0],p[1]*factor]; - }); - }; - - var scaleSeconds = function(series,interval) { - return _.map(series,function(p) { - return [p[0],p[1]/kbn.interval_to_seconds(interval)]; - }); - }; - - var derivative = function(series) { - return _.map(series, function(p,i) { - var _v; - if(i === 0 || p[1] === null) { - _v = [p[0],null]; - } else { - _v = series[i-1][1] === null ? [p[0],null] : [p[0],p[1]-(series[i-1][1])]; - } - return _v; - }); - }; - - // Function for rendering panel - function render_panel() { - // IE doesn't work without this - elem.css({height:scope.panel.height || scope.row.height}); - - // Populate from the query service - try { - _.each(scope.data, function(series) { - series.label = series.info.alias; - series.color = series.info.color; - }); - } catch(e) {return;} - - // Set barwidth based on specified interval - var barwidth = kbn.interval_to_ms(scope.panel.interval); - - var stack = scope.panel.stack ? true : null; - - // Populate element - try { - var options = { - legend: { show: false }, - series: { - stackpercent: scope.panel.stack ? scope.panel.percentage : false, - stack: scope.panel.percentage ? null : stack, - lines: { - show: scope.panel.lines, - // Silly, but fixes bug in stacked percentages - fill: scope.panel.fill === 0 ? 0.001 : scope.panel.fill/10, - lineWidth: scope.panel.linewidth, - steps: false - }, - bars: { - show: scope.panel.bars, - fill: 1, - barWidth: barwidth/1.5, - zero: false, - lineWidth: 0 - }, - points: { - show: scope.panel.points, - fill: 1, - fillColor: false, - radius: scope.panel.pointradius - }, - shadowSize: 1 - }, - yaxis: { - show: scope.panel['y-axis'], - min: scope.panel.grid.min, - max: scope.panel.percentage && scope.panel.stack ? 100 : scope.panel.grid.max - }, - xaxis: { - timezone: scope.panel.timezone, - show: scope.panel['x-axis'], - mode: "time", - min: _.isUndefined(scope.range.from) ? null : scope.range.from.getTime(), - max: _.isUndefined(scope.range.to) ? null : scope.range.to.getTime(), - timeformat: time_format(scope.panel.interval), - label: "Datetime", - ticks: elem.width()/100 - }, - grid: { - backgroundColor: null, - borderWidth: 0, - hoverable: true, - color: '#c8c8c8' - } - }; - - if(scope.panel.y_format === 'bytes') { - options.yaxis.mode = "byte"; - } - - if(scope.panel.y_format === 'short') { - options.yaxis.tickFormatter = function(val) { - return kbn.shortFormat(val,0); - }; - } - - if(scope.panel.annotate.enable) { - options.events = { - levels: 1, - data: scope.annotations, - types: { - 'annotation': { - level: 1, - icon: { - icon: "icon-tag icon-flip-vertical", - size: 20, - color: "#222", - outline: "#bbb" - } - } - } - //xaxis: int // the x axis to attach events to - }; - } - - if(scope.panel.interactive) { - options.selection = { mode: "x", color: '#666' }; - } - - // when rendering stacked bars, we need to ensure each point that has data is zero-filled - // so that the stacking happens in the proper order - var required_times = []; - if (scope.data.length > 1) { - required_times = Array.prototype.concat.apply([], _.map(scope.data, function (query) { - return query.time_series.getOrderedTimes(); - })); - required_times = _.uniq(required_times.sort(function (a, b) { - // decending numeric sort - return a-b; - }), true); - } - - - for (var i = 0; i < scope.data.length; i++) { - var _d = scope.data[i].time_series.getFlotPairs(required_times); - if(scope.panel.derivative) { - _d = derivative(_d); - } - if(scope.panel.scale !== 1) { - _d = scale(_d,scope.panel.scale); - } - if(scope.panel.scaleSeconds) { - _d = scaleSeconds(_d,scope.panel.interval); - } - scope.data[i].data = _d; - } - - scope.plot = $.plot(elem, scope.data, options); - - } catch(e) { - // Nothing to do here - } - } - - function time_format(interval) { - var _int = kbn.interval_to_seconds(interval); - if(_int >= 2628000) { - return "%Y-%m"; - } - if(_int >= 86400) { - return "%Y-%m-%d"; - } - if(_int >= 60) { - return "%H:%M
%m-%d"; - } - - return "%H:%M:%S"; - } - - var $tooltip = $('
Popup Position
- -List Arrangement
- -Font Size
- -
- Micro Analysis of {{micropanel.field}}
-
-
-
{{micropanel.count}} events in the table set
-
-| {{micropanel.field}} | -Action | -In set | - - -
|---|---|---|
| {{{true: "__blank__",false:field[0]}[field[0] == ""]}} | -- - - | -{{field[1]}} | -
-
\ No newline at end of file
diff --git a/src/app/panels/fields/module.js b/src/app/panels/fields/module.js
deleted file mode 100644
index d2095cc8ac3..00000000000
--- a/src/app/panels/fields/module.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- ## Fields (DEPRECATED)
-*/
-define([
- 'angular',
- 'app',
- 'underscore'
-],
-function (angular, app, _) {
- 'use strict';
-
- var module = angular.module('kibana.panels.fields', []);
- app.useModule(module);
-
- module.controller('fields', function($scope) {
-
- $scope.panelMeta = {
- status : "Deprecated",
- description : "You should not use this table, it does not work anymore. The table panel now"+
- "integrates a field selector. This module will soon be removed."
- };
-
-
- // Set and populate defaults
- var _d = {
- style : {},
- arrange : 'vertical',
- micropanel_position : 'right',
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function() {
- // Place holder until I remove this
- };
-
- });
-});
\ No newline at end of file
diff --git a/src/app/panels/filtering/editor.html b/src/app/panels/filtering/editor.html
deleted file mode 100644
index 3100415c7f2..00000000000
--- a/src/app/panels/filtering/editor.html
+++ /dev/null
@@ -1,7 +0,0 @@
-The 'fields' panel is deprecated.
The table panel now integrates a field selector. -
-
\ No newline at end of file
diff --git a/src/app/panels/filtering/meta.html b/src/app/panels/filtering/meta.html
deleted file mode 100644
index 8af862ff5bf..00000000000
--- a/src/app/panels/filtering/meta.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- No options here
-
-
-
- ×
-
\ No newline at end of file
diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html
deleted file mode 100644
index a0a0a677a94..00000000000
--- a/src/app/panels/filtering/module.html
+++ /dev/null
@@ -1,90 +0,0 @@
-Query Alias
- -
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/filtering/module.js b/src/app/panels/filtering/module.js
deleted file mode 100644
index aaa2fc9c804..00000000000
--- a/src/app/panels/filtering/module.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
- ## filtering
-
-*/
-define([
- 'angular',
- 'app',
- 'underscore'
-],
-function (angular, app, _) {
- 'use strict';
-
- var module = angular.module('kibana.panels.filtering', []);
- app.useModule(module);
-
- module.controller('filtering', function($scope, filterSrv, $rootScope, dashboard) {
-
- $scope.panelMeta = {
- status : "Stable",
- description : "A controllable list of all filters currently applied to the dashboard. You "+
- "almost certainly want one of these on your dashboard somewhere."
- };
-
- // Set and populate defaults
- var _d = {
- };
- _.defaults($scope.panel,_d);
-
- $scope.$on('filter', function() {
- $scope.row.notice = true;
- });
-
- $scope.init = function() {
- $scope.filterSrv = filterSrv;
- };
-
- $scope.remove = function(id) {
- filterSrv.remove(id);
- };
-
- // This function should be moved to the service
- $scope.toggle = function(id) {
- filterSrv.list[id].active = !filterSrv.list[id].active;
- dashboard.refresh();
- };
-
- $scope.add = function(query) {
- query = query || '*';
- filterSrv.set({
- editing : true,
- type : 'querystring',
- query : query,
- mandate : 'must'
- },undefined,true);
- };
-
- $scope.refresh = function() {
- dashboard.refresh();
- };
-
- $scope.render = function() {
- $rootScope.$broadcast('render');
- };
-
- $scope.show_key = function(key) {
- return !_.contains(['type','id','alias','mandate','active','editing'],key);
- };
-
- $scope.isEditable = function(filter) {
- var uneditable = ['time'];
- if(_.contains(uneditable,filter.type)) {
- return false;
- } else {
- return true;
- }
- };
-
- });
-});
\ No newline at end of file
diff --git a/src/app/panels/graph/editor.html b/src/app/panels/graph/editor.html
new file mode 100644
index 00000000000..6e195172926
--- /dev/null
+++ b/src/app/panels/graph/editor.html
@@ -0,0 +1,11 @@
+
-
-
-No filters available
- -
-
-
-
- {{filterSrv.list[id].type}}
-
- {{filterSrv.list[id].mandate}}
-
-
- {{filterSrv.list[id].mandate}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- - {{key}} : {{value}} - -
+
\ No newline at end of file
diff --git a/src/app/panels/graph/module.html b/src/app/panels/graph/module.html
new file mode 100644
index 00000000000..74c795949be
--- /dev/null
+++ b/src/app/panels/graph/module.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/panels/graph/module.js b/src/app/panels/graph/module.js
new file mode 100644
index 00000000000..df4beaf17b0
--- /dev/null
+++ b/src/app/panels/graph/module.js
@@ -0,0 +1,43 @@
+/** @scratch /panels/5
+ * include::panels/text.asciidoc[]
+ */
+
+/** @scratch /panels/text/0
+ * == text
+ * Status: *Stable*
+ *
+ * The text panel is used for displaying static text formated as markdown, sanitized html or as plain
+ * text.
+ *
+ */
+define([
+ 'angular',
+ 'app',
+ 'underscore'
+],
+function (angular, app, _) {
+ 'use strict';
+
+ var module = angular.module('kibana.panels.graph', []);
+ app.useModule(module);
+
+ module.controller('graph', function($scope) {
+ $scope.panelMeta = {
+ status : "Unstable",
+ description : "A graphite graph module"
+ };
+
+ // Set and populate defaults
+ var _d = {
+ };
+
+ _.defaults($scope.panel,_d);
+
+ $scope.init = function() {
+ $scope.ready = false;
+ $scope.saySomething = "something!";
+ };
+
+ });
+
+});
\ No newline at end of file
diff --git a/src/app/panels/histogram/editor.html b/src/app/panels/histogram/editor.html
deleted file mode 100644
index 15490701bb4..00000000000
--- a/src/app/panels/histogram/editor.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{{saySomething}}
+ +-
+
- {{panel.graphiteUrl}} +
- {{panel.targets}} +
-
-
-
- Values
-
-
-
-
-
-
-
-
-
-
-Transform Series
-
-
-
-
-
-
-
-
-
-
- Time Options
-
-
\ No newline at end of file
diff --git a/src/app/panels/histogram/interval.js b/src/app/panels/histogram/interval.js
deleted file mode 100644
index 673371fcf4c..00000000000
--- a/src/app/panels/histogram/interval.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define([
- 'kbn'
-],
-function (kbn) {
- 'use strict';
-
- /**
- * manages the interval logic
- * @param {[type]} interval_string An interval string in the format '1m', '1y', etc
- */
- function Interval(interval_string) {
- this.string = interval_string;
-
- var info = kbn.describe_interval(interval_string);
- this.type = info.type;
- this.ms = info.sec * 1000 * info.count;
-
- // does the length of the interval change based on the current time?
- if (this.type === 'y' || this.type === 'M') {
- // we will just modify this time object rather that create a new one constantly
- this.get = this.get_complex;
- this.date = new Date(0);
- } else {
- this.get = this.get_simple;
- }
- }
-
- Interval.prototype = {
- toString: function () {
- return this.string;
- },
- after: function(current_ms) {
- return this.get(current_ms, 1);
- },
- before: function (current_ms) {
- return this.get(current_ms, -1);
- },
- get_complex: function (current, delta) {
- this.date.setTime(current);
- switch(this.type) {
- case 'M':
- this.date.setUTCMonth(this.date.getUTCMonth() + delta);
- break;
- case 'y':
- this.date.setUTCFullYear(this.date.getUTCFullYear() + delta);
- break;
- }
- return this.date.getTime();
- },
- get_simple: function (current, delta) {
- return current + (delta * this.ms);
- }
- };
-
- return Interval;
-
-});
\ No newline at end of file
diff --git a/src/app/panels/histogram/module.html b/src/app/panels/histogram/module.html
deleted file mode 100644
index 20ca4732d93..00000000000
--- a/src/app/panels/histogram/module.html
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/histogram/module.js b/src/app/panels/histogram/module.js
deleted file mode 100644
index 720ca36fb6f..00000000000
--- a/src/app/panels/histogram/module.js
+++ /dev/null
@@ -1,764 +0,0 @@
-/** @scratch /panels/5
- * include::panels/histogram.asciidoc[]
- */
-
-/** @scratch /panels/histogram/0
- * == Histogram
- * Status: *Stable*
- *
- * The histogram panel allow for the display of time charts. It includes several modes and tranformations
- * to display event counts, mean, min, max and total of numeric fields, and derivatives of counter
- * fields.
- *
- */
-define([
- 'angular',
- 'app',
- 'jquery',
- 'underscore',
- 'kbn',
- 'moment',
- './timeSeries',
- 'jquery.flot',
- 'jquery.flot.events',
- 'jquery.flot.selection',
- 'jquery.flot.time',
- 'jquery.flot.byte',
- 'jquery.flot.stack',
- 'jquery.flot.stackpercent'
-],
-function (angular, app, $, _, kbn, moment, timeSeries) {
-
- 'use strict';
-
- var module = angular.module('kibana.panels.histogram', []);
- app.useModule(module);
-
- module.controller('histogram', function($scope, querySrv, dashboard, filterSrv) {
- $scope.panelMeta = {
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- editorTabs : [
- {
- title:'Style',
- src:'app/panels/histogram/styleEditor.html'
- },
- {
- title:'Queries',
- src:'app/panels/histogram/queriesEditor.html'
- },
- ],
- status : "Stable",
- description : "A bucketed time series chart of the current query or queries. Uses the "+
- "Elasticsearch date_histogram facet. If using time stamped indices this panel will query"+
- " them sequentially to attempt to apply the lighest possible load to your Elasticsearch cluster"
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/histogram/3
- * === Parameters
- * ==== Axis options
- * mode:: Value to use for the y-axis. For all modes other than count, +value_field+ must be
- * defined. Possible values: count, mean, max, min, total.
- */
- mode : 'count',
- /** @scratch /panels/histogram/3
- * time_field:: x-axis field. This must be defined as a date type in Elasticsearch.
- */
- time_field : '@timestamp',
- /** @scratch /panels/histogram/3
- * value_field:: y-axis field if +mode+ is set to mean, max, min or total. Must be numeric.
- */
- value_field : null,
- /** @scratch /panels/histogram/3
- * x-axis:: Show the x-axis
- */
- 'x-axis' : true,
- /** @scratch /panels/histogram/3
- * y-axis:: Show the y-axis
- */
- 'y-axis' : true,
- /** @scratch /panels/histogram/3
- * scale:: Scale the y-axis by this factor
- */
- scale : 1,
- /** @scratch /panels/histogram/3
- * y_format:: 'none','bytes','short '
- */
- y_format : 'none',
- /** @scratch /panels/histogram/5
- * grid object:: Min and max y-axis values
- * grid.min::: Minimum y-axis value
- * grid.max::: Maximum y-axis value
- */
- grid : {
- max: null,
- min: 0
- },
- /** @scratch /panels/histogram/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- /** @scratch /panels/histogram/3
- * ==== Annotations
- * annotate object:: A query can be specified, the results of which will be displayed as markers on
- * the chart. For example, for noting code deploys.
- * annotate.enable::: Should annotations, aka markers, be shown?
- * annotate.query::: Lucene query_string syntax query to use for markers.
- * annotate.size::: Max number of markers to show
- * annotate.field::: Field from documents to show
- * annotate.sort::: Sort array in format [field,order], For example [`@timestamp',`desc']
- */
- annotate : {
- enable : false,
- query : "*",
- size : 20,
- field : '_type',
- sort : ['_score','desc']
- },
- /** @scratch /panels/histogram/3
- * ==== Interval options
- * auto_int:: Automatically scale intervals?
- */
- auto_int : true,
- /** @scratch /panels/histogram/3
- * resolution:: If auto_int is true, shoot for this many bars.
- */
- resolution : 100,
- /** @scratch /panels/histogram/3
- * interval:: If auto_int is set to false, use this as the interval.
- */
- interval : '5m',
- /** @scratch /panels/histogram/3
- * interval:: Array of possible intervals in the *View* selector. Example [`auto',`1s',`5m',`3h']
- */
- intervals : ['auto','1s','1m','5m','10m','30m','1h','3h','12h','1d','1w','1y'],
- /** @scratch /panels/histogram/3
- * ==== Drawing options
- * lines:: Show line chart
- */
- lines : false,
- /** @scratch /panels/histogram/3
- * fill:: Area fill factor for line charts, 1-10
- */
- fill : 0,
- /** @scratch /panels/histogram/3
- * linewidth:: Weight of lines in pixels
- */
- linewidth : 3,
- /** @scratch /panels/histogram/3
- * points:: Show points on chart
- */
- points : false,
- /** @scratch /panels/histogram/3
- * pointradius:: Size of points in pixels
- */
- pointradius : 5,
- /** @scratch /panels/histogram/3
- * bars:: Show bars on chart
- */
- bars : true,
- /** @scratch /panels/histogram/3
- * stack:: Stack multiple series
- */
- stack : true,
- /** @scratch /panels/histogram/3
- * spyable:: Show inspect icon
- */
- spyable : true,
- /** @scratch /panels/histogram/3
- * zoomlinks:: Show `Zoom Out' link
- */
- zoomlinks : true,
- /** @scratch /panels/histogram/3
- * options:: Show quick view options section
- */
- options : true,
- /** @scratch /panels/histogram/3
- * legend:: Display the legond
- */
- legend : true,
- /** @scratch /panels/histogram/3
- * show_query:: If no alias is set, should the query be displayed?
- */
- show_query : true,
- /** @scratch /panels/histogram/3
- * interactive:: Enable click-and-drag to zoom functionality
- */
- interactive : true,
- /** @scratch /panels/histogram/3
- * legend_counts:: Show counts in legend
- */
- legend_counts : true,
- /** @scratch /panels/histogram/3
- * ==== Transformations
- * timezone:: Correct for browser timezone?. Valid values: browser, utc
- */
- timezone : 'browser', // browser or utc
- /** @scratch /panels/histogram/3
- * percentage:: Show the y-axis as a percentage of the axis total. Only makes sense for multiple
- * queries
- */
- percentage : false,
- /** @scratch /panels/histogram/3
- * zerofill:: Improves the accuracy of line charts at a small performance cost.
- */
- zerofill : true,
- /** @scratch /panels/histogram/3
- * derivative:: Show each point on the x-axis as the change from the previous point
- */
- derivative : false,
- /** @scratch /panels/histogram/3
- * tooltip object::
- * tooltip.value_type::: Individual or cumulative controls how tooltips are display on stacked charts
- * tooltip.query_as_alias::: If no alias is set, should the query be displayed?
- */
- tooltip : {
- value_type: 'cumulative',
- query_as_alias: true
- }
- };
-
- _.defaults($scope.panel,_d);
- _.defaults($scope.panel.tooltip,_d.tooltip);
- _.defaults($scope.panel.annotate,_d.annotate);
- _.defaults($scope.panel.grid,_d.grid);
-
-
-
- $scope.init = function() {
- // Hide view options by default
- $scope.options = false;
- $scope.$on('refresh',function(){
- $scope.get_data();
- });
-
- // Always show the query if an alias isn't set. Users can set an alias if the query is too
- // long
- $scope.panel.tooltip.query_as_alias = true;
-
- $scope.get_data();
-
- };
-
- $scope.set_interval = function(interval) {
- if(interval !== 'auto') {
- $scope.panel.auto_int = false;
- $scope.panel.interval = interval;
- } else {
- $scope.panel.auto_int = true;
- }
- };
-
- $scope.interval_label = function(interval) {
- return $scope.panel.auto_int && interval === $scope.panel.interval ? interval+" (auto)" : interval;
- };
-
- /**
- * The time range effecting the panel
- * @return {[type]} [description]
- */
- $scope.get_time_range = function () {
- var range = $scope.range = filterSrv.timeRange('last');
- return range;
- };
-
- $scope.get_interval = function () {
- var interval = $scope.panel.interval,
- range;
- if ($scope.panel.auto_int) {
- range = $scope.get_time_range();
- if (range) {
- interval = kbn.secondsToHms(
- kbn.calculate_interval(range.from, range.to, $scope.panel.resolution, 0) / 1000
- );
- }
- }
- $scope.panel.interval = interval || '10m';
- return $scope.panel.interval;
- };
-
- /**
- * Fetch the data for a chunk of a queries results. Multiple segments occur when several indicies
- * need to be consulted (like timestamped logstash indicies)
- *
- * The results of this function are stored on the scope's data property. This property will be an
- * array of objects with the properties info, time_series, and hits. These objects are used in the
- * render_panel function to create the historgram.
- *
- * @param {number} segment The segment count, (0 based)
- * @param {number} query_id The id of the query, generated on the first run and passed back when
- * this call is made recursively for more segments
- */
- $scope.get_data = function(segment, query_id) {
- var
- _range,
- _interval,
- request,
- queries,
- results;
-
- if (_.isUndefined(segment)) {
- segment = 0;
- }
- delete $scope.panel.error;
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
- _range = $scope.get_time_range();
- _interval = $scope.get_interval(_range);
-
- if ($scope.panel.auto_int) {
- $scope.panel.interval = kbn.secondsToHms(
- kbn.calculate_interval(_range.from,_range.to,$scope.panel.resolution,0)/1000);
- }
-
- $scope.panelMeta.loading = true;
- request = $scope.ejs.Request().indices(dashboard.indices[segment]);
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
-
- queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- // Build the query
- _.each(queries, function(q) {
- var query = $scope.ejs.FilteredQuery(
- querySrv.toEjsObj(q),
- filterSrv.getBoolFilter(filterSrv.ids)
- );
-
- var facet = $scope.ejs.DateHistogramFacet(q.id);
-
- if($scope.panel.mode === 'count') {
- facet = facet.field($scope.panel.time_field).global(true);
- } else {
- if(_.isNull($scope.panel.value_field)) {
- $scope.panel.error = "In " + $scope.panel.mode + " mode a field must be specified";
- return;
- }
- facet = facet.keyField($scope.panel.time_field).valueField($scope.panel.value_field).global(true);
- }
- facet = facet.interval(_interval).facetFilter($scope.ejs.QueryFilter(query));
- request = request.facet(facet)
- .size($scope.panel.annotate.enable ? $scope.panel.annotate.size : 0);
- });
-
- if($scope.panel.annotate.enable) {
- var query = $scope.ejs.FilteredQuery(
- $scope.ejs.QueryStringQuery($scope.panel.annotate.query || '*'),
- filterSrv.getBoolFilter(filterSrv.idsByType('time'))
- );
- request = request.query(query);
-
- // This is a hack proposed by @boaz to work around the fact that we can't get
- // to field data values directly, and we need timestamps as normalized longs
- request = request.sort([
- $scope.ejs.Sort($scope.panel.annotate.sort[0]).order($scope.panel.annotate.sort[1]),
- $scope.ejs.Sort($scope.panel.time_field).desc()
- ]);
- }
-
- // Populate the inspector panel
- $scope.populate_modal(request);
-
- // Then run it
- results = request.doSearch();
-
- // Populate scope when we have results
- results.then(function(results) {
-
- $scope.panelMeta.loading = false;
- if(segment === 0) {
- $scope.hits = 0;
- $scope.data = [];
- $scope.annotations = [];
- query_id = $scope.query_id = new Date().getTime();
- }
-
- // Check for error and abort if found
- if(!(_.isUndefined(results.error))) {
- $scope.panel.error = $scope.parse_error(results.error);
- return;
- }
-
- // Make sure we're still on the same query/queries
- if($scope.query_id === query_id) {
-
- var i = 0,
- time_series,
- hits;
-
- _.each(queries, function(q) {
- var query_results = results.facets[q.id];
- // we need to initialize the data variable on the first run,
- // and when we are working on the first segment of the data.
- if(_.isUndefined($scope.data[i]) || segment === 0) {
- var tsOpts = {
- interval: _interval,
- start_date: _range && _range.from,
- end_date: _range && _range.to,
- fill_style: $scope.panel.derivative ? 'null' : 'minimal'
- };
- time_series = new timeSeries.ZeroFilled(tsOpts);
- hits = 0;
- } else {
- time_series = $scope.data[i].time_series;
- hits = $scope.data[i].hits;
- }
-
- // push each entry into the time series, while incrementing counters
- _.each(query_results.entries, function(entry) {
- time_series.addValue(entry.time, entry[$scope.panel.mode]);
- hits += entry.count; // The series level hits counter
- $scope.hits += entry.count; // Entire dataset level hits counter
- });
- $scope.data[i] = {
- info: q,
- time_series: time_series,
- hits: hits
- };
-
- i++;
- });
-
- if($scope.panel.annotate.enable) {
- $scope.annotations = $scope.annotations.concat(_.map(results.hits.hits, function(hit) {
- var _p = _.omit(hit,'_source','sort','_score');
- var _h = _.extend(kbn.flatten_json(hit._source),_p);
- return {
- min: hit.sort[1],
- max: hit.sort[1],
- eventType: "annotation",
- title: null,
- description: " "+
- _h[$scope.panel.annotate.field]+"
-
-
- View
- |
-
-
-
- Zoom Out |
-
-
-
-
- {{series.info.alias || series.info.query}}
- {{series.info.alias}}
- ({{series.hits}})
-
-
- change in {{panel.value_field}} {{panel.mode}} per {{panel.interval}}1s | ({{hits}} hits)
-
-
- "+ - moment(hit.sort[1]).format('YYYY-MM-DD HH:mm:ss'), - score: hit.sort[0] - }; - })); - // Sort the data - $scope.annotations = _.sortBy($scope.annotations, function(v){ - // Sort in reverse - return v.score*($scope.panel.annotate.sort[1] === 'desc' ? -1 : 1); - }); - // And slice to the right size - $scope.annotations = $scope.annotations.slice(0,$scope.panel.annotate.size); - } - - // Tell the histogram directive to render. - $scope.$emit('render'); - - // If we still have segments left, get them - if(segment < dashboard.indices.length-1) { - $scope.get_data(segment+1,query_id); - } - } - }); - }; - - // function $scope.zoom - // factor :: Zoom factor, so 0.5 = cuts timespan in half, 2 doubles timespan - $scope.zoom = function(factor) { - var _range = filterSrv.timeRange('last'); - var _timespan = (_range.to.valueOf() - _range.from.valueOf()); - var _center = _range.to.valueOf() - _timespan/2; - - var _to = (_center + (_timespan*factor)/2); - var _from = (_center - (_timespan*factor)/2); - - // If we're not already looking into the future, don't. - if(_to > Date.now() && _range.to < Date.now()) { - var _offset = _to - Date.now(); - _from = _from - _offset; - _to = Date.now(); - } - - if(factor > 1) { - filterSrv.removeByType('time'); - } - filterSrv.set({ - type:'time', - from:moment.utc(_from).toDate(), - to:moment.utc(_to).toDate(), - field:$scope.panel.time_field - }); - }; - - // I really don't like this function, too much dom manip. Break out into directive? - $scope.populate_modal = function(request) { - $scope.inspector = angular.toJson(JSON.parse(request.toString()),true); - }; - - $scope.set_refresh = function (state) { - $scope.refresh = state; - }; - - $scope.close_edit = function() { - if($scope.refresh) { - $scope.get_data(); - } - $scope.refresh = false; - $scope.$emit('render'); - }; - - $scope.render = function() { - $scope.$emit('render'); - }; - - }); - - module.directive('histogramChart', function(dashboard, filterSrv) { - return { - restrict: 'A', - template: '', - link: function(scope, elem) { - - // Receive render events - scope.$on('render',function(){ - render_panel(); - }); - - // Re-render if the window is resized - angular.element(window).bind('resize', function(){ - render_panel(); - }); - - var scale = function(series,factor) { - return _.map(series,function(p) { - return [p[0],p[1]*factor]; - }); - }; - - var scaleSeconds = function(series,interval) { - return _.map(series,function(p) { - return [p[0],p[1]/kbn.interval_to_seconds(interval)]; - }); - }; - - var derivative = function(series) { - return _.map(series, function(p,i) { - var _v; - if(i === 0 || p[1] === null) { - _v = [p[0],null]; - } else { - _v = series[i-1][1] === null ? [p[0],null] : [p[0],p[1]-(series[i-1][1])]; - } - return _v; - }); - }; - - // Function for rendering panel - function render_panel() { - // IE doesn't work without this - elem.css({height:scope.panel.height || scope.row.height}); - - // Populate from the query service - try { - _.each(scope.data, function(series) { - series.label = series.info.alias; - series.color = series.info.color; - }); - } catch(e) {return;} - - // Set barwidth based on specified interval - var barwidth = kbn.interval_to_ms(scope.panel.interval); - - var stack = scope.panel.stack ? true : null; - - // Populate element - try { - var options = { - legend: { show: false }, - series: { - stackpercent: scope.panel.stack ? scope.panel.percentage : false, - stack: scope.panel.percentage ? null : stack, - lines: { - show: scope.panel.lines, - // Silly, but fixes bug in stacked percentages - fill: scope.panel.fill === 0 ? 0.001 : scope.panel.fill/10, - lineWidth: scope.panel.linewidth, - steps: false - }, - bars: { - show: scope.panel.bars, - fill: 1, - barWidth: barwidth/1.5, - zero: false, - lineWidth: 0 - }, - points: { - show: scope.panel.points, - fill: 1, - fillColor: false, - radius: scope.panel.pointradius - }, - shadowSize: 1 - }, - yaxis: { - show: scope.panel['y-axis'], - min: scope.panel.grid.min, - max: scope.panel.percentage && scope.panel.stack ? 100 : scope.panel.grid.max - }, - xaxis: { - timezone: scope.panel.timezone, - show: scope.panel['x-axis'], - mode: "time", - min: _.isUndefined(scope.range.from) ? null : scope.range.from.getTime(), - max: _.isUndefined(scope.range.to) ? null : scope.range.to.getTime(), - timeformat: time_format(scope.panel.interval), - label: "Datetime", - ticks: elem.width()/100 - }, - grid: { - backgroundColor: null, - borderWidth: 0, - hoverable: true, - color: '#c8c8c8' - } - }; - - if(scope.panel.y_format === 'bytes') { - options.yaxis.mode = "byte"; - } - - if(scope.panel.y_format === 'short') { - options.yaxis.tickFormatter = function(val) { - return kbn.shortFormat(val,0); - }; - } - - if(scope.panel.annotate.enable) { - options.events = { - levels: 1, - data: scope.annotations, - types: { - 'annotation': { - level: 1, - icon: { - icon: "icon-tag icon-flip-vertical", - size: 20, - color: "#222", - outline: "#bbb" - } - } - } - //xaxis: int // the x axis to attach events to - }; - } - - if(scope.panel.interactive) { - options.selection = { mode: "x", color: '#666' }; - } - - // when rendering stacked bars, we need to ensure each point that has data is zero-filled - // so that the stacking happens in the proper order - var required_times = []; - if (scope.data.length > 1) { - required_times = Array.prototype.concat.apply([], _.map(scope.data, function (query) { - return query.time_series.getOrderedTimes(); - })); - required_times = _.uniq(required_times.sort(function (a, b) { - // decending numeric sort - return a-b; - }), true); - } - - - for (var i = 0; i < scope.data.length; i++) { - var _d = scope.data[i].time_series.getFlotPairs(required_times); - if(scope.panel.derivative) { - _d = derivative(_d); - } - if(scope.panel.scale !== 1) { - _d = scale(_d,scope.panel.scale); - } - if(scope.panel.scaleSeconds) { - _d = scaleSeconds(_d,scope.panel.interval); - } - scope.data[i].data = _d; - } - - scope.plot = $.plot(elem, scope.data, options); - - } catch(e) { - // Nothing to do here - } - } - - function time_format(interval) { - var _int = kbn.interval_to_seconds(interval); - if(_int >= 2628000) { - return "%Y-%m"; - } - if(_int >= 86400) { - return "%Y-%m-%d"; - } - if(_int >= 60) { - return "%H:%M
%m-%d"; - } - - return "%H:%M:%S"; - } - - var $tooltip = $('
');
- elem.bind("plothover", function (event, pos, item) {
- var group, value, timestamp;
- if (item) {
- if (item.series.info.alias || scope.panel.tooltip.query_as_alias) {
- group = '' +
- '' + ' ' +
- (item.series.info.alias || item.series.info.query)+
- '
'; - } else { - group = kbn.query_color_dot(item.series.color, 15) + ' '; - } - value = (scope.panel.stack && scope.panel.tooltip.value_type === 'individual') ? - item.datapoint[1] - item.datapoint[2] : - item.datapoint[1]; - if(scope.panel.y_format === 'bytes') { - value = kbn.byteFormat(value,2); - } - if(scope.panel.y_format === 'short') { - value = kbn.shortFormat(value,2); - } - timestamp = scope.panel.timezone === 'browser' ? - moment(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss') : - moment.utc(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss'); - $tooltip - .html( - group + value + " @ " + timestamp - ) - .place_tt(pos.pageX, pos.pageY); - } else { - $tooltip.detach(); - } - }); - - elem.bind("plotselected", function (event, ranges) { - filterSrv.set({ - type : 'time', - from : moment.utc(ranges.xaxis.from).toDate(), - to : moment.utc(ranges.xaxis.to).toDate(), - field : scope.panel.time_field - }); - }); - } - }; - }); - -}); diff --git a/src/app/panels/histogram/queriesEditor.html b/src/app/panels/histogram/queriesEditor.html deleted file mode 100644 index 414de272ef8..00000000000 --- a/src/app/panels/histogram/queriesEditor.html +++ /dev/null @@ -1,43 +0,0 @@ -
'; - } else { - group = kbn.query_color_dot(item.series.color, 15) + ' '; - } - value = (scope.panel.stack && scope.panel.tooltip.value_type === 'individual') ? - item.datapoint[1] - item.datapoint[2] : - item.datapoint[1]; - if(scope.panel.y_format === 'bytes') { - value = kbn.byteFormat(value,2); - } - if(scope.panel.y_format === 'short') { - value = kbn.shortFormat(value,2); - } - timestamp = scope.panel.timezone === 'browser' ? - moment(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss') : - moment.utc(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss'); - $tooltip - .html( - group + value + " @ " + timestamp - ) - .place_tt(pos.pageX, pos.pageY); - } else { - $tooltip.detach(); - } - }); - - elem.bind("plotselected", function (event, ranges) { - filterSrv.set({ - type : 'time', - from : moment.utc(ranges.xaxis.from).toDate(), - to : moment.utc(ranges.xaxis.to).toDate(), - field : scope.panel.time_field - }); - }); - } - }; - }); - -}); diff --git a/src/app/panels/histogram/queriesEditor.html b/src/app/panels/histogram/queriesEditor.html deleted file mode 100644 index 414de272ef8..00000000000 --- a/src/app/panels/histogram/queriesEditor.html +++ /dev/null @@ -1,43 +0,0 @@ -
Charted
- - -
-
diff --git a/src/app/panels/histogram/styleEditor.html b/src/app/panels/histogram/styleEditor.html
deleted file mode 100644
index 874a22640b5..00000000000
--- a/src/app/panels/histogram/styleEditor.html
+++ /dev/null
@@ -1,88 +0,0 @@
-Markers
- -
- Here you can specify a query to be plotted on your chart as a marker. Hovering over a marker will display the field you specify below. If more documents are found than the limit you set, they will be scored by Elasticsearch and events that best match your query will be displayed.
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Chart Options
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Multiple Series
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/panels/histogram/timeSeries.js b/src/app/panels/histogram/timeSeries.js
deleted file mode 100644
index 8885e734371..00000000000
--- a/src/app/panels/histogram/timeSeries.js
+++ /dev/null
@@ -1,216 +0,0 @@
-define([
- 'underscore',
- './interval'
-],
-function (_, Interval) {
- 'use strict';
-
- var ts = {};
-
- // map compatable parseInt
- function base10Int(val) {
- return parseInt(val, 10);
- }
-
- // trim the ms off of a time, but return it with empty ms.
- function getDatesTime(date) {
- return Math.floor(date.getTime() / 1000)*1000;
- }
-
- /**
- * Certain graphs require 0 entries to be specified for them to render
- * properly (like the line graph). So with this we will caluclate all of
- * the expected time measurements, and fill the missing ones in with 0
- * @param {object} opts An object specifying some/all of the options
- *
- * OPTIONS:
- * @opt {string} interval The interval notion describing the expected spacing between
- * each data point.
- * @opt {date} start_date (optional) The start point for the time series, setting this and the
- * end_date will ensure that the series streches to resemble the entire
- * expected result
- * @opt {date} end_date (optional) The end point for the time series, see start_date
- * @opt {string} fill_style Either "minimal", or "all" describing the strategy used to zero-fill
- * the series.
- */
- ts.ZeroFilled = function (opts) {
- opts = _.defaults(opts, {
- interval: '10m',
- start_date: null,
- end_date: null,
- fill_style: 'minimal'
- });
-
- // the expected differenece between readings.
- this.interval = new Interval(opts.interval);
-
- // will keep all values here, keyed by their time
- this._data = {};
- this.start_time = opts.start_date && getDatesTime(opts.start_date);
- this.end_time = opts.end_date && getDatesTime(opts.end_date);
- this.opts = opts;
- };
-
- /**
- * Add a row
- * @param {int} time The time for the value, in
- * @param {any} value The value at this time
- */
- ts.ZeroFilled.prototype.addValue = function (time, value) {
- if (time instanceof Date) {
- time = getDatesTime(time);
- } else {
- time = base10Int(time);
- }
- if (!isNaN(time)) {
- this._data[time] = (_.isUndefined(value) ? 0 : value);
- }
- this._cached_times = null;
- };
-
- /**
- * Get an array of the times that have been explicitly set in the series
- * @param {array} include (optional) list of timestamps to include in the response
- * @return {array} An array of integer times.
- */
- ts.ZeroFilled.prototype.getOrderedTimes = function (include) {
- var times = _.map(_.keys(this._data), base10Int);
- if (_.isArray(include)) {
- times = times.concat(include);
- }
- return _.uniq(times.sort(function (a, b) {
- // decending numeric sort
- return a - b;
- }), true);
- };
-
- /**
- * return the rows in the format:
- * [ [time, value], [time, value], ... ]
- *
- * Heavy lifting is done by _get(Min|Default|All)FlotPairs()
- * @param {array} required_times An array of timestamps that must be in the resulting pairs
- * @return {array}
- */
- ts.ZeroFilled.prototype.getFlotPairs = function (required_times) {
- var times = this.getOrderedTimes(required_times),
- strategy,
- pairs;
-
- if(this.opts.fill_style === 'all') {
- strategy = this._getAllFlotPairs;
- } else if(this.opts.fill_style === 'null') {
- strategy = this._getNullFlotPairs;
- } else {
- strategy = this._getMinFlotPairs;
- }
-
- pairs = _.reduce(
- times, // what
- strategy, // how
- [], // where
- this // context
- );
-
- // if the first or last pair is inside either the start or end time,
- // add those times to the series with null values so the graph will stretch to contain them.
- // Removing, flot 0.8.1's max/min params satisfy this
- /*
- if (this.start_time && (pairs.length === 0 || pairs[0][0] > this.start_time)) {
- pairs.unshift([this.start_time, null]);
- }
- if (this.end_time && (pairs.length === 0 || pairs[pairs.length - 1][0] < this.end_time)) {
- pairs.push([this.end_time, null]);
- }
- */
-
- return pairs;
- };
-
- /**
- * ** called as a reduce stragegy in getFlotPairs() **
- * Fill zero's on either side of the current time, unless there is already a measurement there or
- * we are looking at an edge.
- * @return {array} An array of points to plot with flot
- */
- ts.ZeroFilled.prototype._getMinFlotPairs = function (result, time, i, times) {
- var next, expected_next, prev, expected_prev;
-
- // check for previous measurement
- if (i > 0) {
- prev = times[i - 1];
- expected_prev = this.interval.before(time);
- if (prev < expected_prev) {
- result.push([expected_prev, 0]);
- }
- }
-
- // add the current time
- result.push([ time, this._data[time] || 0]);
-
- // check for next measurement
- if (times.length > i) {
- next = times[i + 1];
- expected_next = this.interval.after(time);
- if (next > expected_next) {
- result.push([expected_next, 0]);
- }
- }
-
- return result;
- };
-
- /**
- * ** called as a reduce stragegy in getFlotPairs() **
- * Fill zero's to the right of each time, until the next measurement is reached or we are at the
- * last measurement
- * @return {array} An array of points to plot with flot
- */
- ts.ZeroFilled.prototype._getAllFlotPairs = function (result, time, i, times) {
- var next, expected_next;
-
- result.push([ times[i], this._data[times[i]] || 0 ]);
- next = times[i + 1];
- expected_next = this.interval.after(time);
- for(; times.length > i && next > expected_next; expected_next = this.interval.after(expected_next)) {
- result.push([expected_next, 0]);
- }
-
- return result;
- };
-
- /**
- * ** called as a reduce stragegy in getFlotPairs() **
- * Same as min, but fills with nulls
- * @return {array} An array of points to plot with flot
- */
- ts.ZeroFilled.prototype._getNullFlotPairs = function (result, time, i, times) {
- var next, expected_next, prev, expected_prev;
-
- // check for previous measurement
- if (i > 0) {
- prev = times[i - 1];
- expected_prev = this.interval.before(time);
- if (prev < expected_prev) {
- result.push([expected_prev, null]);
- }
- }
-
- // add the current time
- result.push([ time, this._data[time] || null]);
-
- // check for next measurement
- if (times.length > i) {
- next = times[i + 1];
- expected_next = this.interval.after(time);
- if (next > expected_next) {
- result.push([expected_next, null]);
- }
- }
-
- return result;
- };
-
-
- return ts;
-});
\ No newline at end of file
diff --git a/src/app/panels/hits/editor.html b/src/app/panels/hits/editor.html
deleted file mode 100644
index 8e113bfaf04..00000000000
--- a/src/app/panels/hits/editor.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
- Header
- Header
-
-
-
-
-
-
-
-
-
-
-
-
-
- Legend
-
- Legend
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Grid
-
-Grid
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/panels/hits/module.html b/src/app/panels/hits/module.html
deleted file mode 100644
index 92283dbab8c..00000000000
--- a/src/app/panels/hits/module.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
\ No newline at end of file
diff --git a/src/app/panels/hits/module.js b/src/app/panels/hits/module.js
deleted file mode 100644
index 53e1fba8f6c..00000000000
--- a/src/app/panels/hits/module.js
+++ /dev/null
@@ -1,295 +0,0 @@
-/** @scratch /panels/5
- * include::panels/hits.asciidoc[]
- */
-
-/** @scratch /panels/hits/0
- * == Hits
- * Status: *Stable*
- *
- * The hits panel displays the number of hits for each of the queries on the dashboard in a
- * configurable format specified by the `chart' property.
- *
- */
-define([
- 'angular',
- 'app',
- 'underscore',
- 'jquery',
- 'kbn',
-
- 'jquery.flot',
- 'jquery.flot.pie'
-], function (angular, app, _, $, kbn) {
- 'use strict';
-
- var module = angular.module('kibana.panels.hits', []);
- app.useModule(module);
-
- module.controller('hits', function($scope, querySrv, dashboard, filterSrv) {
- $scope.panelMeta = {
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- editorTabs : [
- {title:'Queries', src:'app/partials/querySelect.html'}
- ],
- status : "Stable",
- description : "The total hits for a query or set of queries. Can be a pie chart, bar chart, "+
- "list, or absolute total of all queries combined"
- };
-
- // Set and populate defaults
- var _d = {
- style : { "font-size": '10pt'},
- /** @scratch /panels/hits/3
- * === Parameters
- *
- * arrangement:: The arrangement of the legend. horizontal or vertical
- */
- arrangement : 'horizontal',
- /** @scratch /panels/hits/3
- * chart:: bar, pie or none
- */
- chart : 'bar',
- /** @scratch /panels/hits/3
- * counter_pos:: The position of the legend, above or below
- */
- counter_pos : 'above',
- /** @scratch /panels/hits/3
- * donut:: If the chart is set to pie, setting donut to true will draw a hole in the midle of it
- */
- donut : false,
- /** @scratch /panels/hits/3
- * tilt:: If the chart is set to pie, setting tilt to true will tilt it back into an oval
- */
- tilt : false,
- /** @scratch /panels/hits/3
- * labels:: If the chart is set to pie, setting labels to true will draw labels in the slices
- */
- labels : true,
- /** @scratch /panels/hits/3
- * spyable:: Setting spyable to false disables the inspect icon.
- */
- spyable : true,
- /** @scratch /panels/hits/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function () {
- $scope.hits = 0;
-
- $scope.$on('refresh',function(){
- $scope.get_data();
- });
- $scope.get_data();
-
- };
-
- $scope.get_data = function(segment,query_id) {
- delete $scope.panel.error;
- $scope.panelMeta.loading = true;
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
-
- var _segment = _.isUndefined(segment) ? 0 : segment;
- var request = $scope.ejs.Request().indices(dashboard.indices[_segment]);
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
- var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- // Build the question part of the query
- _.each(queries, function(q) {
- var _q = $scope.ejs.FilteredQuery(
- querySrv.toEjsObj(q),
- filterSrv.getBoolFilter(filterSrv.ids));
-
- request = request
- .facet($scope.ejs.QueryFacet(q.id)
- .query(_q)
- ).size(0);
- });
-
- // Populate the inspector panel
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
-
- // Then run it
- var results = request.doSearch();
-
- // Populate scope when we have results
- results.then(function(results) {
- $scope.panelMeta.loading = false;
- if(_segment === 0) {
- $scope.hits = 0;
- $scope.data = [];
- query_id = $scope.query_id = new Date().getTime();
- }
-
- // Check for error and abort if found
- if(!(_.isUndefined(results.error))) {
- $scope.panel.error = $scope.parse_error(results.error);
- return;
- }
-
- // Make sure we're still on the same query/queries
- if($scope.query_id === query_id) {
- var i = 0;
- _.each(queries, function(q) {
- var v = results.facets[q.id];
- var hits = _.isUndefined($scope.data[i]) || _segment === 0 ?
- v.count : $scope.data[i].hits+v.count;
- $scope.hits += v.count;
-
- // Create series
- $scope.data[i] = {
- info: q,
- id: q.id,
- hits: hits,
- data: [[i,hits]]
- };
-
- i++;
- });
- $scope.$emit('render');
- if(_segment < dashboard.indices.length-1) {
- $scope.get_data(_segment+1,query_id);
- }
-
- }
- });
- };
-
- $scope.set_refresh = function (state) {
- $scope.refresh = state;
- };
-
- $scope.close_edit = function() {
- if($scope.refresh) {
- $scope.get_data();
- }
- $scope.refresh = false;
- $scope.$emit('render');
- };
- });
-
-
- module.directive('hitsChart', function(querySrv) {
- return {
- restrict: 'A',
- link: function(scope, elem) {
-
- // Receive render events
- scope.$on('render',function(){
- render_panel();
- });
-
- // Re-render if the window is resized
- angular.element(window).bind('resize', function(){
- render_panel();
- });
-
- // Function for rendering panel
- function render_panel() {
- // IE doesn't work without this
- elem.css({height:scope.panel.height||scope.row.height});
-
- try {
- _.each(scope.data,function(series) {
- series.label = series.info.alias;
- series.color = series.info.color;
- });
- } catch(e) {return;}
-
- // Populate element
- try {
- // Add plot to scope so we can build out own legend
- if(scope.panel.chart === 'bar') {
- scope.plot = $.plot(elem, scope.data, {
- legend: { show: false },
- series: {
- lines: { show: false, },
- bars: { show: true, fill: 1, barWidth: 0.8, horizontal: false },
- shadowSize: 1
- },
- yaxis: { show: true, min: 0, color: "#c8c8c8" },
- xaxis: { show: false },
- grid: {
- borderWidth: 0,
- borderColor: '#eee',
- color: "#eee",
- hoverable: true,
- },
- colors: querySrv.colors
- });
- }
- if(scope.panel.chart === 'pie') {
- scope.plot = $.plot(elem, scope.data, {
- legend: { show: false },
- series: {
- pie: {
- innerRadius: scope.panel.donut ? 0.4 : 0,
- tilt: scope.panel.tilt ? 0.45 : 1,
- radius: 1,
- show: true,
- combine: {
- color: '#999',
- label: 'The Rest'
- },
- stroke: {
- width: 0
- },
- label: {
- show: scope.panel.labels,
- radius: 2/3,
- formatter: function(label, series){
- return '
-
-
-
-
-
-
- -
-
-
-
-
-
- | {{query.info.alias}} | {{query.data[0][1]}} | -
- {{query.info.alias}} ({{query.data[0][1]}})
-
- -
-
-
-
-
-
-
- -
-
- | {{query.info.alias}} | {{query.data[0][1]}} | -
- {{query.info.alias}} ({{query.data[0][1]}})
-
- -
{{hits}}
- {{query.info.alias}} ({{query.hits}})
-
- - -
'+
- label+'
'+Math.round(series.percent)+'%
';
- },
- threshold: 0.1
- }
- }
- },
- //grid: { hoverable: true, clickable: true },
- grid: { hoverable: true, clickable: true },
- colors: querySrv.colors
- });
- }
- } catch(e) {
- elem.text(e);
- }
- }
-
- var $tooltip = $(''+Math.round(series.percent)+'%
');
- elem.bind("plothover", function (event, pos, item) {
- if (item) {
- var value = scope.panel.chart === 'bar' ?
- item.datapoint[1] : item.datapoint[1][0][1];
- $tooltip
- .html(kbn.query_color_dot(item.series.color, 20) + ' ' + value.toFixed(0))
- .place_tt(pos.pageX, pos.pageY);
- } else {
- $tooltip.remove();
- }
- });
-
- }
- };
- });
-});
\ No newline at end of file
diff --git a/src/app/panels/map/editor.html b/src/app/panels/map/editor.html
deleted file mode 100644
index 95f2912e33f..00000000000
--- a/src/app/panels/map/editor.html
+++ /dev/null
@@ -1,15 +0,0 @@
- t&&(t=e[n]);else for(n in e)e[n]>t&&(t=e[n]);return t},keys:function(e){var t=[],n;for(n in e)t.push(n);return t},values:function(e){var t=[],n,r;for(r=0;r')}}catch(e){jvm.VMLElement.prototype.createElement=function(e){return document.createElement("<"+e+' xmlns="urn:schemas-microsoft.com:vml" class="rvml">')}}document.createStyleSheet().addRule(".rvml","behavior:url(#default#VML)"),jvm.VMLElement.VMLInitialized=!0},jvm.VMLElement.prototype.getElementCtr=function(e){return jvm["VML"+e]},jvm.VMLElement.prototype.addClass=function(e){jvm.$(this.node).addClass(e)},jvm.VMLElement.prototype.applyAttr=function(e,t){this.node[e]=t},jvm.VMLElement.prototype.getBBox=function(){var e=jvm.$(this.node);return{x:e.position().left/this.canvas.scale,y:e.position().top/this.canvas.scale,width:e.width()/this.canvas.scale,height:e.height()/this.canvas.scale}},jvm.VMLGroupElement=function(){jvm.VMLGroupElement.parentClass.call(this,"group"),this.node.style.left="0px",this.node.style.top="0px",this.node.coordorigin="0 0"},jvm.inherits(jvm.VMLGroupElement,jvm.VMLElement),jvm.VMLGroupElement.prototype.add=function(e){this.node.appendChild(e.node)},jvm.VMLCanvasElement=function(e,t,n){this.classPrefix="VML",jvm.VMLCanvasElement.parentClass.call(this,"group"),jvm.AbstractCanvasElement.apply(this,arguments),this.node.style.position="absolute"},jvm.inherits(jvm.VMLCanvasElement,jvm.VMLElement),jvm.mixin(jvm.VMLCanvasElement,jvm.AbstractCanvasElement),jvm.VMLCanvasElement.prototype.setSize=function(e,t){var n,r,i,s;this.width=e,this.height=t,this.node.style.width=e+"px",this.node.style.height=t+"px",this.node.coordsize=e+" "+t,this.node.coordorigin="0 0";if(this.rootElement){n=this.rootElement.node.getElementsByTagName("shape");for(i=0,s=n.length;i=0)e-=t[i],i++;return i==this.scale.length-1?e=this.vectorToNum(this.scale[i]):e=this.vectorToNum(this.vectorAdd(this.scale[i],this.vectorMult(this.vectorSubtract(this.scale[i+1],this.scale[i]),e/t[i]))),e},vectorToNum:function(e){var t=0,n;for(n=0;nt&&(t=e[i]),r0?1:e<0?-1:e},mill:function(e,t,n){return{x:this.radius*(t-n)*this.radDeg,y:-this.radius*Math.log(Math.tan((45+.4*e)*this.radDeg))/.8}},mill_inv:function(e,t,n){return{lat:(2.5*Math.atan(Math.exp(.8*t/this.radius))-5*Math.PI/8)*this.degRad,lng:(n*this.radDeg+e/this.radius)*this.degRad}},merc:function(e,t,n){return{x:this.radius*(t-n)*this.radDeg,y:-this.radius*Math.log(Math.tan(Math.PI/4+e*Math.PI/360))}},merc_inv:function(e,t,n){return{lat:(2*Math.atan(Math.exp(t/this.radius))-Math.PI/2)*this.degRad,lng:(n*this.radDeg+e/this.radius)*this.degRad}},aea:function(e,t,n){var r=0,i=n*this.radDeg,s=29.5*this.radDeg,o=45.5*this.radDeg,u=e*this.radDeg,a=t*this.radDeg,f=(Math.sin(s)+Math.sin(o))/2,l=Math.cos(s)*Math.cos(s)+2*f*Math.sin(s),c=f*(a-i),h=Math.sqrt(l-2*f*Math.sin(u))/f,p=Math.sqrt(l-2*f*Math.sin(r))/f;return{x:h*Math.sin(c)*this.radius,y:-(p-h*Math.cos(c))*this.radius}},aea_inv:function(e,t,n){var r=e/this.radius,i=t/this.radius,s=0,o=n*this.radDeg,u=29.5*this.radDeg,a=45.5*this.radDeg,f=(Math.sin(u)+Math.sin(a))/2,l=Math.cos(u)*Math.cos(u)+2*f*Math.sin(u),c=Math.sqrt(l-2*f*Math.sin(s))/f,h=Math.sqrt(r*r+(c-i)*(c-i)),p=Math.atan(r/(c-i));return{lat:Math.asin((l-h*h*f*f)/(2*f))*this.degRad,lng:(o+p/f)*this.degRad}},lcc:function(e,t,n){var r=0,i=n*this.radDeg,s=t*this.radDeg,o=33*this.radDeg,u=45*this.radDeg,a=e*this.radDeg,f=Math.log(Math.cos(o)*(1/Math.cos(u)))/Math.log(Math.tan(Math.PI/4+u/2)*(1/Math.tan(Math.PI/4+o/2))),l=Math.cos(o)*Math.pow(Math.tan(Math.PI/4+o/2),f)/f,c=l*Math.pow(1/Math.tan(Math.PI/4+a/2),f),h=l*Math.pow(1/Math.tan(Math.PI/4+r/2),f);return{x:c*Math.sin(f*(s-i))*this.radius,y:-(h-c*Math.cos(f*(s-i)))*this.radius}},lcc_inv:function(e,t,n){var r=e/this.radius,i=t/this.radius,s=0,o=n*this.radDeg,u=33*this.radDeg,a=45*this.radDeg,f=Math.log(Math.cos(u)*(1/Math.cos(a)))/Math.log(Math.tan(Math.PI/4+a/2)*(1/Math.tan(Math.PI/4+u/2))),l=Math.cos(u)*Math.pow(Math.tan(Math.PI/4+u/2),f)/f,c=l*Math.pow(1/Math.tan(Math.PI/4+s/2),f),h=this.sgn(f)*Math.sqrt(r*r+(c-i)*(c-i)),p=Math.atan(r/(c-i));return{lat:(2*Math.atan(Math.pow(l/h,1/f))-Math.PI/2)*this.degRad,lng:(o+p/f)*this.degRad}}},jvm.WorldMap=function(e){var t=this,n;this.params=jvm.$.extend(!0,{},jvm.WorldMap.defaultParams,e);if(!jvm.WorldMap.maps[this.params.map])throw new Error("Attempt to use map which was not loaded: "+this.params.map);this.mapData=jvm.WorldMap.maps[this.params.map],this.markers={},this.regions={},this.regionsColors={},this.regionsData={},this.container=jvm.$("
-
-
diff --git a/src/app/panels/map/lib/jquery.jvectormap.min.js b/src/app/panels/map/lib/jquery.jvectormap.min.js
deleted file mode 100644
index ea54476f292..00000000000
--- a/src/app/panels/map/lib/jquery.jvectormap.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * jVectorMap version 1.2.2
- *
- * Copyright 2011-2013, Kirill Lebedev
- * Licensed under the MIT license.
- *
- */(function(e){var t={set:{colors:1,values:1,backgroundColor:1,scaleColors:1,normalizeFunction:1,focus:1},get:{selectedRegions:1,selectedMarkers:1,mapObject:1,regionName:1}};e.fn.vectorMap=function(e){var n,r,i,n=this.children(".jvectormap-container").data("mapObject");if(e==="addMap")jvm.WorldMap.maps[arguments[1]]=arguments[2];else{if(!(e!=="set"&&e!=="get"||!t[e][arguments[1]]))return r=arguments[1].charAt(0).toUpperCase()+arguments[1].substr(1),n[e+r].apply(n,Array.prototype.slice.call(arguments,2));e=e||{},e.container=this,n=new jvm.WorldMap(e)}return this}})(jQuery),function(e){function r(t){var n=t||window.event,r=[].slice.call(arguments,1),i=0,s=!0,o=0,u=0;return t=e.event.fix(n),t.type="mousewheel",n.wheelDelta&&(i=n.wheelDelta/120),n.detail&&(i=-n.detail/3),u=i,n.axis!==undefined&&n.axis===n.HORIZONTAL_AXIS&&(u=0,o=-1*i),n.wheelDeltaY!==undefined&&(u=n.wheelDeltaY/120),n.wheelDeltaX!==undefined&&(o=-1*n.wheelDeltaX/120),r.unshift(t,i,o,u),(e.event.dispatch||e.event.handle).apply(this,r)}var t=["DOMMouseScroll","mousewheel"];if(e.event.fixHooks)for(var n=t.length;n;)e.event.fixHooks[t[--n]]=e.event.mouseHooks;e.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],r,!1);else this.onmousewheel=r},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],r,!1);else this.onmousewheel=null}},e.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})}(jQuery);var jvm={inherits:function(e,t){function n(){}n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e,e.parentClass=t},mixin:function(e,t){var n;for(n in t.prototype)t.prototype.hasOwnProperty(n)&&(e.prototype[n]=t.prototype[n])},min:function(e){var t=Number.MAX_VALUE,n;if(e instanceof Array)for(n=0;n
-
-
-
- Max
-
-
- Max Maximum countries to plot
-
- Map
- -").css({width:"100%",height:"100%"}).addClass("jvectormap-container"),this.params.container.append(this.container),this.container.data("mapObject",this),this.container.css({position:"relative",overflow:"hidden"}),this.defaultWidth=this.mapData.width,this.defaultHeight=this.mapData.height,this.setBackgroundColor(this.params.backgroundColor),this.onResize=function(){t.setSize()},jvm.$(window).resize(this.onResize);for(n in jvm.WorldMap.apiEvents)this.params[n]&&this.container.bind(jvm.WorldMap.apiEvents[n]+".jvectormap",this.params[n]);this.canvas=new jvm.VectorCanvas(this.container[0],this.width,this.height),"ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch?this.params.bindTouchEvents&&this.bindContainerTouchEvents():this.bindContainerEvents(),this.bindElementEvents(),this.createLabel(),this.params.zoomButtons&&this.bindZoomButtons(),this.createRegions(),this.createMarkers(this.params.markers||{}),this.setSize(),this.params.focusOn&&(typeof this.params.focusOn=="object"?this.setFocus.call(this,this.params.focusOn.scale,this.params.focusOn.x,this.params.focusOn.y):this.setFocus.call(this,this.params.focusOn)),this.params.selectedRegions&&this.setSelectedRegions(this.params.selectedRegions),this.params.selectedMarkers&&this.setSelectedMarkers(this.params.selectedMarkers),this.params.series&&this.createSeries()},jvm.WorldMap.prototype={transX:0,transY:0,scale:1,baseTransX:0,baseTransY:0,baseScale:1,width:0,height:0,setBackgroundColor:function(e){this.container.css("background-color",e)},resize:function(){var e=this.baseScale;this.width/this.height>this.defaultWidth/this.defaultHeight?(this.baseScale=this.height/this.defaultHeight,this.baseTransX=Math.abs(this.width-this.defaultWidth*this.baseScale)/(2*this.baseScale)):(this.baseScale=this.width/this.defaultWidth,this.baseTransY=Math.abs(this.height-this.defaultHeight*this.baseScale)/(2*this.baseScale)),this.scale*=this.baseScale/e,this.transX*=this.baseScale/e,this.transY*=this.baseScale/e},setSize:function(){this.width=this.container.width(),this.height=this.container.height(),this.resize(),this.canvas.setSize(this.width,this.height),this.applyTransform()},reset:function(){var e,t;for(e in this.series)for(t=0;tt?this.transY=t:this.transYe?this.transX=e:this.transXf[1].pageX?s=f[1].pageX+(f[0].pageX-f[1].pageX)/2:s=f[0].pageX+(f[1].pageX-f[0].pageX)/2,f[0].pageY>f[1].pageY?o=f[1].pageY+(f[0].pageY-f[1].pageY)/2:o=f[0].pageY+(f[1].pageY-f[0].pageY)/2,s-=l.left,o-=l.top,e=n.scale,t=Math.sqrt(Math.pow(f[0].pageX-f[1].pageX,2)+Math.pow(f[0].pageY-f[1].pageY,2)))),u=f.length};jvm.$(this.container).bind("touchstart",a),jvm.$(this.container).bind("touchmove",a)},bindElementEvents:function(){var e=this,t;this.container.mousemove(function(){t=!0}),this.container.delegate("[class~='jvectormap-element']","mouseover mouseout",function(t){var n=this,r=jvm.$(this).attr("class").baseVal?jvm.$(this).attr("class").baseVal:jvm.$(this).attr("class"),i=r.indexOf("jvectormap-region")===-1?"marker":"region",s=i=="region"?jvm.$(this).attr("data-code"):jvm.$(this).attr("data-index"),o=i=="region"?e.regions[s].element:e.markers[s].element,u=i=="region"?e.mapData.paths[s].name:e.markers[s].config.name||"",a=jvm.$.Event(i+"LabelShow.jvectormap"),f=jvm.$.Event(i+"Over.jvectormap");t.type=="mouseover"?(e.container.trigger(f,[s]),f.isDefaultPrevented()||o.setHovered(!0),e.label.text(u),e.container.trigger(a,[e.label,s]),a.isDefaultPrevented()||(e.label.show(),e.labelWidth=e.label.width(),e.labelHeight=e.label.height())):(o.setHovered(!1),e.label.hide(),e.container.trigger(i+"Out.jvectormap",[s]))}),this.container.delegate("[class~='jvectormap-element']","mousedown",function(e){t=!1}),this.container.delegate("[class~='jvectormap-element']","mouseup",function(n){var r=this,i=jvm.$(this).attr("class").baseVal?jvm.$(this).attr("class").baseVal:jvm.$(this).attr("class"),s=i.indexOf("jvectormap-region")===-1?"marker":"region",o=s=="region"?jvm.$(this).attr("data-code"):jvm.$(this).attr("data-index"),u=jvm.$.Event(s+"Click.jvectormap"),a=s=="region"?e.regions[o].element:e.markers[o].element;if(!t){e.container.trigger(u,[o]);if(s==="region"&&e.params.regionsSelectable||s==="marker"&&e.params.markersSelectable)u.isDefaultPrevented()||(e.params[s+"sSelectableOne"]&&e.clearSelected(s+"s"),a.setSelected(!a.isSelected))}})},bindZoomButtons:function(){var e=this;jvm.$("").addClass("jvectormap-zoomin").text("+").appendTo(this.container),jvm.$("").addClass("jvectormap-zoomout").html("−").appendTo(this.container),this.container.find(".jvectormap-zoomin").click(function(){e.setScale(e.scale*e.params.zoomStep,e.width/2,e.height/2)}),this.container.find(".jvectormap-zoomout").click(function(){e.setScale(e.scale/e.params.zoomStep,e.width/2,e.height/2)})},createLabel:function(){var e=this;this.label=jvm.$("").addClass("jvectormap-label").appendTo(jvm.$("body")),this.container.mousemove(function(t){var n=t.pageX-15-e.labelWidth,r=t.pageY-15-e.labelHeight;n<5&&(n=t.pageX+15),r<5&&(r=t.pageY+15),e.label.is(":visible")&&e.label.css({left:n,top:r})})},setScale:function(e,t,n,r){var i,s=jvm.$.Event("zoom.jvectormap");e>this.params.zoomMax*this.baseScale?e=this.params.zoomMax*this.baseScale:eu[0].x&&au[0].y&&fi[0].x&&ei[0].y&&t
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/map/module.js b/src/app/panels/map/module.js
deleted file mode 100644
index 4bd58e5e83f..00000000000
--- a/src/app/panels/map/module.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/** @scratch /panels/5
- * include::panels/map.asciidoc[]
- */
-
-/** @scratch /panels/map/0
- * == Map
- * Status: *Stable*
- *
- * The map panel translates 2 letter country or state codes into shaded regions on a map. Currently
- * available maps are world, usa and europe.
- *
- */
-define([
- 'angular',
- 'app',
- 'underscore',
- 'jquery',
- 'config',
- './lib/jquery.jvectormap.min'
-],
-function (angular, app, _, $) {
- 'use strict';
-
- var module = angular.module('kibana.panels.map', []);
- app.useModule(module);
-
- module.controller('map', function($scope, $rootScope, querySrv, dashboard, filterSrv) {
- $scope.panelMeta = {
- editorTabs : [
- {title:'Queries', src:'app/partials/querySelect.html'}
- ],
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- status : "Stable",
- description : "Displays a map of shaded regions using a field containing a 2 letter country "+
- ", or US state, code. Regions with more hit are shaded darker. Node that this does use the"+
- " Elasticsearch terms facet, so it is important that you set it to the correct field."
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/map/3
- * === Parameters
- *
- * map:: Map to display. world, usa, europe
- */
- map : "world",
- /** @scratch /panels/map/3
- * colors:: An array of colors to use to shade the map. If 2 colors are specified, shades
- * between them will be used. For example [`#A0E2E2', `#265656']
- */
- colors : ['#A0E2E2', '#265656'],
- /** @scratch /panels/map/3
- * size:: Max number of regions to shade
- */
- size : 100,
- /** @scratch /panels/map/3
- * exclude:: exclude this array of regions. For example [`US',`BR',`IN']
- */
- exclude : [],
- /** @scratch /panels/map/3
- * spyable:: Setting spyable to false disables the inspect icon.
- */
- spyable : true,
- /** @scratch /panels/map/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- }
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function() {
- $scope.$on('refresh',function(){$scope.get_data();});
- $scope.get_data();
- };
-
- $scope.get_data = function() {
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
- $scope.panelMeta.loading = true;
-
-
- var request,
- boolQuery,
- queries;
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
- request = $scope.ejs.Request().indices(dashboard.indices);
- queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- boolQuery = $scope.ejs.BoolQuery();
- _.each(queries,function(q) {
- boolQuery = boolQuery.should(querySrv.toEjsObj(q));
- });
-
- // Then the insert into facet and make the request
- request = request
- .facet($scope.ejs.TermsFacet('map')
- .field($scope.panel.field)
- .size($scope.panel.size)
- .exclude($scope.panel.exclude)
- .facetFilter($scope.ejs.QueryFilter(
- $scope.ejs.FilteredQuery(
- boolQuery,
- filterSrv.getBoolFilter(filterSrv.ids)
- )))).size(0);
-
- $scope.populate_modal(request);
-
- var results = request.doSearch();
-
- // Populate scope when we have results
- results.then(function(results) {
- $scope.panelMeta.loading = false;
- $scope.hits = results.hits.total;
- $scope.data = {};
- _.each(results.facets.map.terms, function(v) {
- $scope.data[v.term.toUpperCase()] = v.count;
- });
- $scope.$emit('render');
- });
- };
-
- // I really don't like this function, too much dom manip. Break out into directive?
- $scope.populate_modal = function(request) {
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
- };
-
- $scope.build_search = function(field,value) {
- filterSrv.set({type:'querystring',mandate:'must',query:field+":"+value});
- };
-
- });
-
-
- module.directive('map', function() {
- return {
- restrict: 'A',
- link: function(scope, elem) {
-
- elem.html('
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/pie/module.html b/src/app/panels/pie/module.html
deleted file mode 100644
index 3ae47964c25..00000000000
--- a/src/app/panels/pie/module.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - - - -
\ No newline at end of file
diff --git a/src/app/panels/pie/module.js b/src/app/panels/pie/module.js
deleted file mode 100644
index d70009f1c49..00000000000
--- a/src/app/panels/pie/module.js
+++ /dev/null
@@ -1,334 +0,0 @@
-/** @scratch /panels/5
- * include::panels/pie.asciidoc[]
- */
-
-/** @scratch /panels/pie/0
- * == Pie
- * Status: *Deprecated*
- *
- * The pie panel has been largely replaced by the +terms+ panel. It exists for backwards compatibility
- * for now, but will be removed in a future release
- *
- */
-define([
- 'angular',
- 'app',
- 'underscore',
- 'jquery',
- 'kbn',
- 'config'
-], function (angular, app, _, $, kbn) {
- 'use strict';
-
- var module = angular.module('kibana.panels.pie', []);
- app.useModule(module);
-
- module.controller('pie', function($scope, $rootScope, querySrv, dashboard, filterSrv) {
-
- $scope.panelMeta = {
- editorTabs : [
- {title:'Queries', src:'app/partials/querySelect.html'}
- ],
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- status : "Deprecated",
- description : "Uses an Elasticsearch terms facet to create a pie chart. You should really only"+
- " point this at not_analyzed fields for that reason. This panel is going away soon, it has"+
- " been replaced by the terms panel. Please use that one instead."
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/pie/3
- * === Parameters
- *
- * mode:: terms or goal. Terms mode finds the top N most popular terms, Goal mode display
- * progress towards a fix goal in terms of documents matched
- */
- mode : "terms",
- /** @scratch /panels/pie/3
- * size:: The max number of results to display in +terms+ mode.
- */
- size : 10,
- /** @scratch /panels/pie/3
- * exclude:: Exclude these terms in terms mode
- */
- exclude : [],
- /** @scratch /panels/pie/3
- * donut:: Draw a hole in the middle of the pie, creating a tasty donut.
- */
- donut : false,
- /** @scratch /panels/pie/3
- * tilt:: Tilt the pie back into an oval shape
- */
- tilt : false,
- /** @scratch /panels/pie/3
- * legend:: The location of the legend, above, below or none
- */
- legend : "above",
- /** @scratch /panels/pie/3
- * labels:: Set to false to disable drawing labels inside the pie slices
- */
- labels : true,
- /** @scratch /panels/pie/3
- * spyable:: Set to false to disable the inspect function.
- */
- spyable : true,
- /** @scratch /panels/pie/3
- * ==== Query
- *
- * query object:: This confusingly named object has properties to set the terms mode field,
- * and the fixed goal for the goal mode
- * query.field::: the field to facet on in terms mode
- * query.goal::: the fixed goal for goal mode
- */
- query : { field:"_type", goal: 100},
- /** @scratch /panels/pie/5
- * ==== Queries
- *
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- default_field : '_type',
-
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function() {
- $scope.$on('refresh',function(){$scope.get_data();});
- $scope.get_data();
- };
-
- $scope.set_mode = function(mode) {
- switch(mode)
- {
- case 'terms':
- $scope.panel.query = {field:"_all"};
- break;
- case 'goal':
- $scope.panel.query = {goal:100};
- break;
- }
- };
-
- $scope.set_refresh = function (state) {
- $scope.refresh = state;
- };
-
- $scope.close_edit = function() {
- if($scope.refresh) {
- $scope.get_data();
- }
- $scope.refresh = false;
- $scope.$emit('render');
- };
-
- $scope.get_data = function() {
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
-
-
- $scope.panelMeta.loading = true;
- var request = $scope.ejs.Request().indices(dashboard.indices);
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
- var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- // This could probably be changed to a BoolFilter
- var boolQuery = $scope.ejs.BoolQuery();
- _.each(queries,function(q) {
- boolQuery = boolQuery.should(querySrv.toEjsObj(q));
- });
-
- var results;
-
- // Terms mode
- if ($scope.panel.mode === "terms") {
- request = request
- .facet($scope.ejs.TermsFacet('pie')
- .field($scope.panel.query.field || $scope.panel.default_field)
- .size($scope.panel.size)
- .exclude($scope.panel.exclude)
- .facetFilter($scope.ejs.QueryFilter(
- $scope.ejs.FilteredQuery(
- boolQuery,
- filterSrv.getBoolFilter(filterSrv.ids)
- )))).size(0);
-
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
-
- results = request.doSearch();
-
- // Populate scope when we have results
- results.then(function(results) {
- $scope.panelMeta.loading = false;
- $scope.hits = results.hits.total;
- $scope.data = [];
- var k = 0;
- _.each(results.facets.pie.terms, function(v) {
- var slice = { label : v.term, data : v.count };
- $scope.data.push();
- $scope.data.push(slice);
- k = k + 1;
- });
- $scope.$emit('render');
- });
- // Goal mode
- } else {
- request = request
- .query(boolQuery)
- .filter(filterSrv.getBoolFilter(filterSrv.ids))
- .size(0);
-
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
-
- results = request.doSearch();
-
- results.then(function(results) {
- $scope.panelMeta.loading = false;
- var complete = results.hits.total;
- var remaining = $scope.panel.query.goal - complete;
- $scope.data = [
- { label : 'Complete', data : complete, color: '#BF6730' },
- { data : remaining, color: '#e2d0c4' }
- ];
- $scope.$emit('render');
- });
- }
- };
-
- });
-
- module.directive('pie', function(querySrv, filterSrv) {
- return {
- restrict: 'A',
- link: function(scope, elem) {
-
- elem.html('
- {{query.label}} ({{query.data[0][1]}})
-
- - - - -
- {{query.label}} ({{query.data[0][1]}})
-
-'+
- Math.round(series.percent)+'%
';
- } else {
- return '';
- }
- },
- };
- } else {
- label = {
- show: scope.panel.labels,
- radius: 2/3,
- formatter: function(label, series){
- return ''+
- label+'
'+Math.round(series.percent)+'%
';
- },
- threshold: 0.1
- };
- }
-
- var pie = {
- series: {
- pie: {
- innerRadius: scope.panel.donut ? 0.45 : 0,
- tilt: scope.panel.tilt ? 0.45 : 1,
- radius: 1,
- show: true,
- combine: {
- color: '#999',
- label: 'The Rest'
- },
- label: label,
- stroke: {
- width: 0
- }
- }
- },
- //grid: { hoverable: true, clickable: true },
- grid: {
- backgroundColor: null,
- hoverable: true,
- clickable: true
- },
- legend: { show: false },
- colors: querySrv.colors
- };
-
- // Populate legend
- if(elem.is(":visible")){
- require(['jquery.flot.pie'], function(){
- scope.legend = $.plot(elem, scope.data, pie).getData();
- if(!scope.$$phase) {
- scope.$apply();
- }
- });
- }
-
- }
-
- elem.bind('plotclick', function (event, pos, object) {
- if (!object) {
- return;
- }
- if(scope.panel.mode === 'terms') {
- filterSrv.set({type:'terms',field:scope.panel.query.field,value:object.series.label});
- }
- });
-
- var $tooltip = $(''+Math.round(series.percent)+'%
');
- elem.bind('plothover', function (event, pos, item) {
- if (item) {
- $tooltip
- .html([
- kbn.query_color_dot(item.series.color, 15),
- (item.series.label || ''),
- parseFloat(item.series.percent).toFixed(1) + '%'
- ].join(' '))
- .place_tt(pos.pageX, pos.pageY, {
- offset: 10
- });
- } else {
- $tooltip.remove();
- }
- });
-
- }
- };
- });
-});
\ No newline at end of file
diff --git a/src/app/panels/query/editor.html b/src/app/panels/query/editor.html
deleted file mode 100644
index 3100415c7f2..00000000000
--- a/src/app/panels/query/editor.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/app/panels/query/editors/lucene.html b/src/app/panels/query/editors/lucene.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/app/panels/query/editors/regex.html b/src/app/panels/query/editors/regex.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/app/panels/query/editors/topN.html b/src/app/panels/query/editors/topN.html
deleted file mode 100644
index 71496541906..00000000000
--- a/src/app/panels/query/editors/topN.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/src/app/panels/query/help/lucene.html b/src/app/panels/query/help/lucene.html
deleted file mode 100644
index 9e860e97d47..00000000000
--- a/src/app/panels/query/help/lucene.html
+++ /dev/null
@@ -1,30 +0,0 @@
-The lucene query type uses LUCENE query string syntax to find matching documents or events within Elasticsearch.
-
-
-
-
- No options here
-
- Examples
--
-
-
statusfield containsactive-status:active
- -
titlefield containsquickorbrown-title:(quick brown)
- -
authorfield contains the exact phrase"john smith"-author:"John Smith"
-
Wildcard searches can be run on individual terms, using ? to replace
-a single character, and * to replace zero or more characters:
qu?ck bro*- -
-
-
- Numbers 1..5 -
count:[1 TO 5]
- - Tags between
alphaandomega, excludingalphaandomega: -tag:{alpha TO omega}
- - Numbers from 10 upwards -
count:[10 TO *]
-
A note on anchoring
-Lucene’s patterns are always anchored. The pattern provided must match the entire string. For string "abcde": -
-ab.* will match
-abcd will not match
-
diff --git a/src/app/panels/query/help/topN.html b/src/app/panels/query/help/topN.html
deleted file mode 100644
index 9fc7c3aa8e0..00000000000
--- a/src/app/panels/query/help/topN.html
+++ /dev/null
@@ -1,14 +0,0 @@
-The topN query uses an Elasticsearch terms facet to find the most common terms in a field and build queries from the result. The topN query uses LUCENE query string syntax
-
-
Parameters
--
-
- - Field / The field to facet on. Fields with a large number of unique terms will use more memory to calculate. - -
- - Count / How many queries to generate. The resulting queries will use brightness variations on the original query's color for their own. - -
-
- Union / The relation the generated queries have to the original. For example, if your field was set to 'extension', your original query was "user:B.Awesome" and your union was AND. Kibana might generate the following example query:
extension:"html" AND (user:B.Awesome)-
-
-
-
-About the {{help.type}} query
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/query/meta.html b/src/app/panels/query/meta.html
deleted file mode 100644
index a35d0022b00..00000000000
--- a/src/app/panels/query/meta.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
\ No newline at end of file
diff --git a/src/app/panels/query/module.html b/src/app/panels/query/module.html
deleted file mode 100644
index 3ae1d0c6bdb..00000000000
--- a/src/app/panels/query/module.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/app/panels/query/module.js b/src/app/panels/query/module.js
deleted file mode 100644
index b622ee6403a..00000000000
--- a/src/app/panels/query/module.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-
- ## query
-
- ### Parameters
- * query :: A string or an array of querys. String if multi is off, array if it is on
- This should be fixed, it should always be an array even if its only
- one element
-*/
-define([
- 'angular',
- 'app',
- 'underscore',
-
- 'css!./query.css'
-], function (angular, app, _) {
- 'use strict';
-
- var module = angular.module('kibana.panels.query', []);
- app.useModule(module);
-
- module.controller('query', function($scope, querySrv, $rootScope, dashboard, $q, $modal) {
- $scope.panelMeta = {
- status : "Stable",
- description : "Manage all of the queries on the dashboard. You almost certainly need one of "+
- "these somewhere. This panel allows you to add, remove, label, pin and color queries"
- };
-
- // Set and populate defaults
- var _d = {
- query : "*",
- pinned : true,
- history : [],
- remember: 10 // max: 100, angular strap can't take a variable for items param
- };
- _.defaults($scope.panel,_d);
-
- $scope.querySrv = querySrv;
-
- // A list of query types for the query config popover
- $scope.queryTypes = _.map(querySrv.queryTypes, function(v,k) {
- return {
- name:k,
- require:v.require
- };
- });
-
- var queryHelpModal = $modal({
- template: './app/panels/query/helpModal.html',
- persist: true,
- show: false,
- scope: $scope,
- });
-
- $scope.init = function() {
- };
-
- $scope.refresh = function() {
- update_history(_.pluck($scope.querySrv.list,'query'));
- dashboard.refresh();
- };
-
- $scope.render = function() {
- $rootScope.$broadcast('render');
- };
-
- $scope.toggle_pin = function(id) {
- querySrv.list[id].pin = querySrv.list[id].pin ? false : true;
- };
-
- $scope.queryIcon = function(type) {
- return querySrv.queryTypes[type].icon;
- };
-
- $scope.queryConfig = function(type) {
- return "./app/panels/query/editors/"+(type||'lucene')+".html";
- };
-
- $scope.queryHelpPath = function(type) {
- return "./app/panels/query/help/"+(type||'lucene')+".html";
- };
-
- $scope.queryHelp = function(type) {
- $scope.help = {
- type: type
- };
- $q.when(queryHelpModal).then(function(modalEl) {
- modalEl.modal('show');
- });
- };
-
- $scope.typeChange = function(q) {
- var _nq = {
- id : q.id,
- type : q.type,
- query: q.query,
- alias: q.alias,
- color: q.color
- };
- querySrv.list[_nq.id] = querySrv.defaults(_nq);
- };
-
- var update_history = function(query) {
- if($scope.panel.remember > 0) {
- $scope.panel.history = _.union(query.reverse(),$scope.panel.history);
- var _length = $scope.panel.history.length;
- if(_length > $scope.panel.remember) {
- $scope.panel.history = $scope.panel.history.slice(0,$scope.panel.remember);
- }
- }
- };
-
- $scope.init();
-
- });
-
-});
\ No newline at end of file
diff --git a/src/app/panels/query/query.css b/src/app/panels/query/query.css
deleted file mode 100644
index 1b0db0ca3a0..00000000000
--- a/src/app/panels/query/query.css
+++ /dev/null
@@ -1,47 +0,0 @@
-.short-query {
- display:inline-block;
- margin-right: 10px;
-}
-.short-query input.search-query {
- width: 280px;
-}
-.begin-query {
- position:absolute;
- left:13px;
- top:5px;
-}
-.end-query {
- position:absolute;
- right:15px;
- top:5px;
-}
-.panel-query {
- padding-left: 35px !important;
- height: 31px !important;
- -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
- -moz-box-sizing: border-box; /* Firefox, other Gecko */
- box-sizing: border-box; /* Opera/IE 8+ */
-}
-
-.query-disabled {
- opacity: 0.3;
-}
-
-.form-search:hover .has-remove {
- padding-left: 50px !important;
-}
-.remove-query {
- opacity: 0;
-}
-.last-query {
- padding-right: 45px !important;
-}
-.form-search:hover .remove-query {
- opacity: 1;
-}
-.query-panel .pins {
- text-decoration: underline;
-}
-.query-panel .pinned {
- margin-right: 5px;
-}
\ No newline at end of file
diff --git a/src/app/panels/sparklines/editor.html b/src/app/panels/sparklines/editor.html
deleted file mode 100644
index 65fc07eb7f5..00000000000
--- a/src/app/panels/sparklines/editor.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- Pinned
-
-
-
- {{querySrv.list[id].alias || querySrv.list[id].query}}
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/sparklines/interval.js b/src/app/panels/sparklines/interval.js
deleted file mode 100644
index 673371fcf4c..00000000000
--- a/src/app/panels/sparklines/interval.js
+++ /dev/null
@@ -1,57 +0,0 @@
-define([
- 'kbn'
-],
-function (kbn) {
- 'use strict';
-
- /**
- * manages the interval logic
- * @param {[type]} interval_string An interval string in the format '1m', '1y', etc
- */
- function Interval(interval_string) {
- this.string = interval_string;
-
- var info = kbn.describe_interval(interval_string);
- this.type = info.type;
- this.ms = info.sec * 1000 * info.count;
-
- // does the length of the interval change based on the current time?
- if (this.type === 'y' || this.type === 'M') {
- // we will just modify this time object rather that create a new one constantly
- this.get = this.get_complex;
- this.date = new Date(0);
- } else {
- this.get = this.get_simple;
- }
- }
-
- Interval.prototype = {
- toString: function () {
- return this.string;
- },
- after: function(current_ms) {
- return this.get(current_ms, 1);
- },
- before: function (current_ms) {
- return this.get(current_ms, -1);
- },
- get_complex: function (current, delta) {
- this.date.setTime(current);
- switch(this.type) {
- case 'M':
- this.date.setUTCMonth(this.date.getUTCMonth() + delta);
- break;
- case 'y':
- this.date.setUTCFullYear(this.date.getUTCFullYear() + delta);
- break;
- }
- return this.date.getTime();
- },
- get_simple: function (current, delta) {
- return current + (delta * this.ms);
- }
- };
-
- return Interval;
-
-});
\ No newline at end of file
diff --git a/src/app/panels/sparklines/module.html b/src/app/panels/sparklines/module.html
deleted file mode 100644
index e34701cabb8..00000000000
--- a/src/app/panels/sparklines/module.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- Values
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Transform Series
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/sparklines/module.js b/src/app/panels/sparklines/module.js
deleted file mode 100644
index d0fce1ee3e7..00000000000
--- a/src/app/panels/sparklines/module.js
+++ /dev/null
@@ -1,386 +0,0 @@
-/** @scratch /panels/5
- * include::panels/sparklines.asciidoc[]
- */
-
-/** @scratch /panels/sparklines/0
- * == Sparklines
- * Status: *Experimental*
- *
- * The sparklines panel shows tiny time charts. The purpose of these is not to give an exact value,
- * but rather to show the shape of the time series in a compact manner
- *
- */
-define([
- 'angular',
- 'app',
- 'jquery',
- 'underscore',
- 'kbn',
- 'moment',
- './timeSeries',
-
- 'jquery.flot',
- 'jquery.flot.time'
-],
-function (angular, app, $, _, kbn, moment, timeSeries) {
-
- 'use strict';
-
- var module = angular.module('kibana.panels.sparklines', []);
- app.useModule(module);
-
- module.controller('sparklines', function($scope, querySrv, dashboard, filterSrv) {
- $scope.panelMeta = {
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- editorTabs : [
- {
- title:'Queries',
- src:'app/partials/querySelect.html'
- }
- ],
- status : "Experimental",
- description : "Sparklines are tiny, simple, time series charts, shown seperately. Because "+
- "sparklines are unclutted by grids, axis markers and colors, they are perfect for spotting"+
- " change in a series"
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/sparklines/3
- * === Parameters
- * mode:: Value to use for the y-axis. For all modes other than count, +value_field+ must be
- * defined. Possible values: count, mean, max, min, total.
- */
- mode : 'count',
- /** @scratch /panels/sparklines/3
- * time_field:: x-axis field. This must be defined as a date type in Elasticsearch.
- */
- time_field : '@timestamp',
- /** @scratch /panels/sparklines/3
- * value_field:: y-axis field if +mode+ is set to mean, max, min or total. Must be numeric.
- */
- value_field : null,
- /** @scratch /panels/sparklines/3
- * interval:: Sparkline intervals are computed automatically as long as there is a time filter
- * present. In the absence of a time filter, use this interval.
- */
- interval : '5m',
- /** @scratch /panels/sparklines/3
- * spyable:: Show inspect icon
- */
- spyable : true,
- /** @scratch /panels/sparklines/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- };
-
- _.defaults($scope.panel,_d);
-
- $scope.init = function() {
-
- $scope.$on('refresh',function(){
- $scope.get_data();
- });
-
- $scope.get_data();
-
- };
-
- $scope.interval_label = function(interval) {
- return $scope.panel.auto_int && interval === $scope.panel.interval ? interval+" (auto)" : interval;
- };
-
- /**
- * The time range effecting the panel
- * @return {[type]} [description]
- */
- $scope.get_time_range = function () {
- var range = $scope.range = filterSrv.timeRange('last');
- return range;
- };
-
- $scope.get_interval = function () {
- var interval = $scope.panel.interval,
- range;
- range = $scope.get_time_range();
- if (range) {
- interval = kbn.secondsToHms(
- kbn.calculate_interval(range.from, range.to, 10, 0) / 1000
- );
- }
- $scope.panel.interval = interval || '10m';
- return $scope.panel.interval;
- };
-
- /**
- * Fetch the data for a chunk of a queries results. Multiple segments occur when several indicies
- * need to be consulted (like timestamped logstash indicies)
- *
- * The results of this function are stored on the scope's data property. This property will be an
- * array of objects with the properties info, time_series, and hits. These objects are used in the
- * render_panel function to create the historgram.
- *
- * @param {number} segment The segment count, (0 based)
- * @param {number} query_id The id of the query, generated on the first run and passed back when
- * this call is made recursively for more segments
- */
- $scope.get_data = function(segment, query_id) {
- var
- _range,
- _interval,
- request,
- queries,
- results;
-
- if (_.isUndefined(segment)) {
- segment = 0;
- }
- delete $scope.panel.error;
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
- _range = $scope.get_time_range();
- _interval = $scope.get_interval(_range);
-
- $scope.panelMeta.loading = true;
- request = $scope.ejs.Request().indices(dashboard.indices[segment]);
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
-
- queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- // Build the query
- _.each(queries, function(q) {
- var query = $scope.ejs.FilteredQuery(
- querySrv.toEjsObj(q),
- filterSrv.getBoolFilter(filterSrv.ids)
- );
-
- var facet = $scope.ejs.DateHistogramFacet(q.id);
-
- if($scope.panel.mode === 'count') {
- facet = facet.field($scope.panel.time_field).global(true);
- } else {
- if(_.isNull($scope.panel.value_field)) {
- $scope.panel.error = "In " + $scope.panel.mode + " mode a field must be specified";
- return;
- }
- facet = facet.keyField($scope.panel.time_field).valueField($scope.panel.value_field);
- }
- facet = facet.interval(_interval).facetFilter($scope.ejs.QueryFilter(query));
- request = request.facet(facet)
- .size(0);
- });
-
- // Populate the inspector panel
- $scope.populate_modal(request);
-
- // Then run it
- results = request.doSearch();
-
- // Populate scope when we have results
- results.then(function(results) {
-
- $scope.panelMeta.loading = false;
- if(segment === 0) {
- $scope.hits = 0;
- $scope.data = [];
- query_id = $scope.query_id = new Date().getTime();
- }
-
- // Check for error and abort if found
- if(!(_.isUndefined(results.error))) {
- $scope.panel.error = $scope.parse_error(results.error);
- return;
- }
-
- // Make sure we're still on the same query/queries
- if($scope.query_id === query_id) {
-
- var i = 0,
- time_series,
- hits;
-
- _.each(queries, function(q) {
- var query_results = results.facets[q.id];
- // we need to initialize the data variable on the first run,
- // and when we are working on the first segment of the data.
- if(_.isUndefined($scope.data[i]) || segment === 0) {
- var tsOpts = {
- interval: _interval,
- start_date: _range && _range.from,
- end_date: _range && _range.to,
- fill_style: 'minimal'
- };
- time_series = new timeSeries.ZeroFilled(tsOpts);
- hits = 0;
- } else {
- time_series = $scope.data[i].time_series;
- hits = $scope.data[i].hits;
- }
-
- // push each entry into the time series, while incrementing counters
- _.each(query_results.entries, function(entry) {
- time_series.addValue(entry.time, entry[$scope.panel.mode]);
- hits += entry.count; // The series level hits counter
- $scope.hits += entry.count; // Entire dataset level hits counter
- });
- $scope.data[i] = {
- info: q,
- range: $scope.range,
- time_series: time_series,
- hits: hits
- };
-
- i++;
- });
-
- // If we still have segments left, get them
- if(segment < dashboard.indices.length-1) {
- $scope.get_data(segment+1,query_id);
- }
- }
- });
- };
-
- // I really don't like this function, too much dom manip. Break out into directive?
- $scope.populate_modal = function(request) {
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
- };
-
- $scope.set_refresh = function (state) {
- $scope.refresh = state;
- };
-
- $scope.close_edit = function() {
- if($scope.refresh) {
- $scope.get_data();
- }
- $scope.refresh = false;
- };
-
- });
-
- module.directive('sparklinesChart', function() {
- return {
- restrict: 'A',
- scope: {
- series: '=',
- panel: '='
- },
- template: '',
- link: function(scope, elem) {
-
- // Receive render events
- scope.$watch('series',function(){
- render_panel();
- });
-
- // Re-render if the window is resized
- angular.element(window).bind('resize', function(){
- render_panel();
- });
-
- var derivative = function(series) {
- return _.map(series, function(p,i) {
- var _v;
- if(i === 0 || p[1] === null) {
- _v = [p[0],null];
- } else {
- _v = series[i-1][1] === null ? [p[0],null] : [p[0],p[1]-(series[i-1][1])];
- }
- return _v;
- });
- };
-
- // Function for rendering panel
- function render_panel() {
- // IE doesn't work without this
- elem.css({height:"30px",width:"100px"});
-
- // Populate element
- //try {
- var options = {
- legend: { show: false },
- series: {
- lines: {
- show: true,
- // Silly, but fixes bug in stacked percentages
- fill: 0,
- lineWidth: 2,
- steps: false
- },
- points: { radius:2 },
- shadowSize: 1
- },
- yaxis: {
- show: false
- },
- xaxis: {
- show: false,
- mode: "time",
- min: _.isUndefined(scope.series.range.from) ? null : scope.series.range.from.getTime(),
- max: _.isUndefined(scope.series.range.to) ? null : scope.series.range.to.getTime()
- },
- grid: {
- hoverable: false,
- show: false
- }
- };
- // when rendering stacked bars, we need to ensure each point that has data is zero-filled
- // so that the stacking happens in the proper order
- var required_times = [];
- required_times = scope.series.time_series.getOrderedTimes();
- required_times = _.uniq(required_times.sort(function (a, b) {
- // decending numeric sort
- return a-b;
- }), true);
-
- var _d = {
- data : scope.panel.derivative ?
- derivative(scope.series.time_series.getFlotPairs(required_times)) :
- scope.series.time_series.getFlotPairs(required_times),
- label : scope.series.info.alias,
- color : elem.css('color'),
- };
-
- $.plot(elem, [_d], options);
-
- //} catch(e) {
- // console.log(e);
- //}
- }
-
- var $tooltip = $('
- {{series.info.alias}}
- -
-
-- -
');
- elem.bind("plothover", function (event, pos, item) {
- if (item) {
- $tooltip
- .html(
- item.datapoint[1] + " @ " + moment(item.datapoint[0]).format('YYYY-MM-DD HH:mm:ss')
- )
- .place_tt(pos.pageX, pos.pageY);
- } else {
- $tooltip.detach();
- }
- });
- }
- };
- });
-
-});
diff --git a/src/app/panels/sparklines/timeSeries.js b/src/app/panels/sparklines/timeSeries.js
deleted file mode 100644
index 8885e734371..00000000000
--- a/src/app/panels/sparklines/timeSeries.js
+++ /dev/null
@@ -1,216 +0,0 @@
-define([
- 'underscore',
- './interval'
-],
-function (_, Interval) {
- 'use strict';
-
- var ts = {};
-
- // map compatable parseInt
- function base10Int(val) {
- return parseInt(val, 10);
- }
-
- // trim the ms off of a time, but return it with empty ms.
- function getDatesTime(date) {
- return Math.floor(date.getTime() / 1000)*1000;
- }
-
- /**
- * Certain graphs require 0 entries to be specified for them to render
- * properly (like the line graph). So with this we will caluclate all of
- * the expected time measurements, and fill the missing ones in with 0
- * @param {object} opts An object specifying some/all of the options
- *
- * OPTIONS:
- * @opt {string} interval The interval notion describing the expected spacing between
- * each data point.
- * @opt {date} start_date (optional) The start point for the time series, setting this and the
- * end_date will ensure that the series streches to resemble the entire
- * expected result
- * @opt {date} end_date (optional) The end point for the time series, see start_date
- * @opt {string} fill_style Either "minimal", or "all" describing the strategy used to zero-fill
- * the series.
- */
- ts.ZeroFilled = function (opts) {
- opts = _.defaults(opts, {
- interval: '10m',
- start_date: null,
- end_date: null,
- fill_style: 'minimal'
- });
-
- // the expected differenece between readings.
- this.interval = new Interval(opts.interval);
-
- // will keep all values here, keyed by their time
- this._data = {};
- this.start_time = opts.start_date && getDatesTime(opts.start_date);
- this.end_time = opts.end_date && getDatesTime(opts.end_date);
- this.opts = opts;
- };
-
- /**
- * Add a row
- * @param {int} time The time for the value, in
- * @param {any} value The value at this time
- */
- ts.ZeroFilled.prototype.addValue = function (time, value) {
- if (time instanceof Date) {
- time = getDatesTime(time);
- } else {
- time = base10Int(time);
- }
- if (!isNaN(time)) {
- this._data[time] = (_.isUndefined(value) ? 0 : value);
- }
- this._cached_times = null;
- };
-
- /**
- * Get an array of the times that have been explicitly set in the series
- * @param {array} include (optional) list of timestamps to include in the response
- * @return {array} An array of integer times.
- */
- ts.ZeroFilled.prototype.getOrderedTimes = function (include) {
- var times = _.map(_.keys(this._data), base10Int);
- if (_.isArray(include)) {
- times = times.concat(include);
- }
- return _.uniq(times.sort(function (a, b) {
- // decending numeric sort
- return a - b;
- }), true);
- };
-
- /**
- * return the rows in the format:
- * [ [time, value], [time, value], ... ]
- *
- * Heavy lifting is done by _get(Min|Default|All)FlotPairs()
- * @param {array} required_times An array of timestamps that must be in the resulting pairs
- * @return {array}
- */
- ts.ZeroFilled.prototype.getFlotPairs = function (required_times) {
- var times = this.getOrderedTimes(required_times),
- strategy,
- pairs;
-
- if(this.opts.fill_style === 'all') {
- strategy = this._getAllFlotPairs;
- } else if(this.opts.fill_style === 'null') {
- strategy = this._getNullFlotPairs;
- } else {
- strategy = this._getMinFlotPairs;
- }
-
- pairs = _.reduce(
- times, // what
- strategy, // how
- [], // where
- this // context
- );
-
- // if the first or last pair is inside either the start or end time,
- // add those times to the series with null values so the graph will stretch to contain them.
- // Removing, flot 0.8.1's max/min params satisfy this
- /*
- if (this.start_time && (pairs.length === 0 || pairs[0][0] > this.start_time)) {
- pairs.unshift([this.start_time, null]);
- }
- if (this.end_time && (pairs.length === 0 || pairs[pairs.length - 1][0] < this.end_time)) {
- pairs.push([this.end_time, null]);
- }
- */
-
- return pairs;
- };
-
- /**
- * ** called as a reduce stragegy in getFlotPairs() **
- * Fill zero's on either side of the current time, unless there is already a measurement there or
- * we are looking at an edge.
- * @return {array} An array of points to plot with flot
- */
- ts.ZeroFilled.prototype._getMinFlotPairs = function (result, time, i, times) {
- var next, expected_next, prev, expected_prev;
-
- // check for previous measurement
- if (i > 0) {
- prev = times[i - 1];
- expected_prev = this.interval.before(time);
- if (prev < expected_prev) {
- result.push([expected_prev, 0]);
- }
- }
-
- // add the current time
- result.push([ time, this._data[time] || 0]);
-
- // check for next measurement
- if (times.length > i) {
- next = times[i + 1];
- expected_next = this.interval.after(time);
- if (next > expected_next) {
- result.push([expected_next, 0]);
- }
- }
-
- return result;
- };
-
- /**
- * ** called as a reduce stragegy in getFlotPairs() **
- * Fill zero's to the right of each time, until the next measurement is reached or we are at the
- * last measurement
- * @return {array} An array of points to plot with flot
- */
- ts.ZeroFilled.prototype._getAllFlotPairs = function (result, time, i, times) {
- var next, expected_next;
-
- result.push([ times[i], this._data[times[i]] || 0 ]);
- next = times[i + 1];
- expected_next = this.interval.after(time);
- for(; times.length > i && next > expected_next; expected_next = this.interval.after(expected_next)) {
- result.push([expected_next, 0]);
- }
-
- return result;
- };
-
- /**
- * ** called as a reduce stragegy in getFlotPairs() **
- * Same as min, but fills with nulls
- * @return {array} An array of points to plot with flot
- */
- ts.ZeroFilled.prototype._getNullFlotPairs = function (result, time, i, times) {
- var next, expected_next, prev, expected_prev;
-
- // check for previous measurement
- if (i > 0) {
- prev = times[i - 1];
- expected_prev = this.interval.before(time);
- if (prev < expected_prev) {
- result.push([expected_prev, null]);
- }
- }
-
- // add the current time
- result.push([ time, this._data[time] || null]);
-
- // check for next measurement
- if (times.length > i) {
- next = times[i + 1];
- expected_next = this.interval.after(time);
- if (next > expected_next) {
- result.push([expected_next, null]);
- }
- }
-
- return result;
- };
-
-
- return ts;
-});
\ No newline at end of file
diff --git a/src/app/panels/table/editor.html b/src/app/panels/table/editor.html
deleted file mode 100644
index 9b5f26e7b3e..00000000000
--- a/src/app/panels/table/editor.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
- {{field}} -
- Columns
-- {{field}} -
-
- {{field}} -
- Hightlighted Fields
-- {{field}} -
-
\ No newline at end of file
diff --git a/src/app/panels/table/micropanel.html b/src/app/panels/table/micropanel.html
deleted file mode 100644
index bb256627591..00000000000
--- a/src/app/panels/table/micropanel.html
+++ /dev/null
@@ -1,62 +0,0 @@
-×
-
-
-
-
- Micro Analysis of {{micropanel.field}}
-
- as
- Groups /
- Singles
-
-
-
-
-
- Options
-
-
- Header
-
-
- Sorting
-
-
- Sort
- - -Font Size
- -
- Trim Factor
-
-
- Trim Factor Trim fields to this long divided by # of rows. Requires data refresh.
-
-
- Local Time
-
- Local Time Adjust time field to browser's local time
-
-
- Time Field
- -| {{micropanel.field}} | -Action | -Count / {{micropanel.count}} events | - - -
|---|---|---|
| {{{true: "__blank__", false:field[0] }[field[0] == '' || field[0] == undefined]|tableTruncate:panel.trimFactor:3}} | -- - - | -- - - {{field[1]}} - | -
-
-
-
- {{field.name}} ({{Math.round((field.count / micropanel.count) * 100)}}%),
- More
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/table/modal.html b/src/app/panels/table/modal.html
deleted file mode 100644
index 713d36175fe..00000000000
--- a/src/app/panels/table/modal.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
- Terms
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/table/module.html b/src/app/panels/table/module.html
deleted file mode 100644
index 9913c3f00c5..00000000000
--- a/src/app/panels/table/module.html
+++ /dev/null
@@ -1,124 +0,0 @@
-Top 10 terms in field {{modalField}}
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/table/module.js b/src/app/panels/table/module.js
deleted file mode 100644
index ed21487efb5..00000000000
--- a/src/app/panels/table/module.js
+++ /dev/null
@@ -1,493 +0,0 @@
-/** @scratch /panels/5
- * include::panels/table.asciidoc[]
- */
-
-/** @scratch /panels/table/0
- * == table
- * Status: *Stable*
- *
- * The table panel contains a sortable, pagable view of documents that. It can be arranged into
- * defined columns and offers several interactions, such as performing adhoc terms aggregations.
- *
- */
-define([
- 'angular',
- 'app',
- 'underscore',
- 'kbn',
- 'moment',
-],
-function (angular, app, _, kbn, moment) {
- 'use strict';
-
- var module = angular.module('kibana.panels.table', []);
- app.useModule(module);
-
- module.controller('table', function($rootScope, $scope, $modal, $q, $compile, fields, querySrv, dashboard, filterSrv) {
- $scope.panelMeta = {
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- editorTabs : [
- {
- title:'Paging',
- src: 'app/panels/table/pagination.html'
- },
- {
- title:'Queries',
- src: 'app/partials/querySelect.html'
- }
- ],
- status: "Stable",
- description: "A paginated table of records matching your query or queries. Click on a row to "+
- "expand it and review all of the fields associated with that document.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{panel.offset}} to {{panel.offset + data.slice(panel.offset,panel.offset+panel.size).length}}
- of {{data.length}} available for paging
-
-
-
-
- | _source (select columns from the list to the left) | -- - - - {{field}} - - - {{field}} - - | - - - -|||||
|---|---|---|---|---|---|---|
| - | - - - | -|||||
-
- View:
- Table /
- JSON /
- Raw
-
-
-
|
-
-
-
-
-
-
-
- {{panel.offset}} to {{panel.offset + data.slice(panel.offset,panel.offset+panel.size).length}}
- of {{data.length}} available for paging
-
-
-
-
- "
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/table/5
- * === Parameters
- *
- * size:: The number of hits to show per page
- */
- size : 100, // Per page
- /** @scratch /panels/table/5
- * pages:: The number of pages available
- */
- pages : 5, // Pages available
- /** @scratch /panels/table/5
- * offset:: The current page
- */
- offset : 0,
- /** @scratch /panels/table/5
- * sort:: An array describing the sort order of the table. For example [`@timestamp',`desc']
- */
- sort : ['_score','desc'],
- /** @scratch /panels/table/5
- * overflow:: The css overflow property. `min-height' (expand) or `auto' (scroll)
- */
- overflow: 'min-height',
- /** @scratch /panels/table/5
- * fields:: the fields used a columns of the table, in an array.
- */
- fields : [],
- /** @scratch /panels/table/5
- * highlight:: The fields on which to highlight, in an array
- */
- highlight : [],
- /** @scratch /panels/table/5
- * sortable:: Set sortable to false to disable sorting
- */
- sortable: true,
- /** @scratch /panels/table/5
- * header:: Set to false to hide the table column names
- */
- header : true,
- /** @scratch /panels/table/5
- * paging:: Set to false to hide the paging controls of the table
- */
- paging : true,
- /** @scratch /panels/table/5
- * field_list:: Set to false to hide the list of fields. The user will be able to expand it,
- * but it will be hidden by default
- */
- field_list: true,
- /** @scratch /panels/table/5
- * all_fields:: Set to true to show all fields in the mapping, not just the current fields in
- * the table.
- */
- all_fields: false,
- /** @scratch /panels/table/5
- * trimFactor:: The trim factor is the length at which to truncate fields takinging into
- * consideration the number of columns in the table. For example, a trimFactor of 100, with 5
- * columns in the table, would trim each column at 20 character. The entirety of the field is
- * still available in the expanded view of the event.
- */
- trimFactor: 300,
- /** @scratch /panels/table/5
- * localTime:: Set to true to adjust the timeField to the browser's local time
- */
- localTime: false,
- /** @scratch /panels/table/5
- * timeField:: If localTime is set to true, this field will be adjusted to the browsers local time
- */
- timeField: '@timestamp',
- /** @scratch /panels/table/5
- * spyable:: Set to false to disable the inspect icon
- */
- spyable : true,
- /** @scratch /panels/table/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- style : {'font-size': '9pt'},
- normTimes : true,
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function () {
- $scope.columns = {};
- _.each($scope.panel.fields,function(field) {
- $scope.columns[field] = true;
- });
-
- $scope.Math = Math;
- $scope.identity = angular.identity;
- $scope.$on('refresh',function(){$scope.get_data();});
-
- $scope.fields = fields;
- $scope.get_data();
- };
-
- // Create a percent function for the view
- $scope.percent = kbn.to_percent;
-
- $scope.termsModal = function(field,chart) {
- $scope.modalField = field;
- showModal(
- '{"height":"300px","chart":"'+chart+'","field":"'+field+'"}','terms');
- };
-
- $scope.statsModal = function(field) {
- $scope.modalField = field;
- showModal(
- '{"field":"'+field+'"}','statistics');
- };
-
- var showModal = function(panel,type) {
- $scope.facetPanel = panel;
- $scope.facetType = type;
-
- // create a new modal. Can't reuse one modal unforunately as the directive will not
- // re-render on show.
- var panelModal = $modal({
- template: './app/panels/table/modal.html',
- persist: true,
- show: false,
- scope: $scope,
- keyboard: false
- });
-
- // and show it
- $q.when(panelModal).then(function(modalEl) {
- modalEl.modal('show');
- });
- };
-
- $scope.toggle_micropanel = function(field,groups) {
- var docs = _.map($scope.data,function(_d){return _d.kibana._source;});
- var topFieldValues = kbn.top_field_values(docs,field,10,groups);
- $scope.micropanel = {
- field: field,
- grouped: groups,
- values : topFieldValues.counts,
- hasArrays : topFieldValues.hasArrays,
- related : kbn.get_related_fields(docs,field),
- limit: 10,
- count: _.countBy(docs,function(doc){return _.contains(_.keys(doc),field);})['true']
- };
- };
-
- $scope.micropanelColor = function(index) {
- var _c = ['bar-success','bar-warning','bar-danger','bar-info','bar-primary'];
- return index > _c.length ? '' : _c[index];
- };
-
- $scope.set_sort = function(field) {
- if($scope.panel.sort[0] === field) {
- $scope.panel.sort[1] = $scope.panel.sort[1] === 'asc' ? 'desc' : 'asc';
- } else {
- $scope.panel.sort[0] = field;
- }
- $scope.get_data();
- };
-
- $scope.toggle_field = function(field) {
- if (_.indexOf($scope.panel.fields,field) > -1) {
- $scope.panel.fields = _.without($scope.panel.fields,field);
- delete $scope.columns[field];
- } else {
- $scope.panel.fields.push(field);
- $scope.columns[field] = true;
- }
- };
-
- $scope.toggle_highlight = function(field) {
- if (_.indexOf($scope.panel.highlight,field) > -1) {
- $scope.panel.highlight = _.without($scope.panel.highlight,field);
- } else {
- $scope.panel.highlight.push(field);
- }
- };
-
- $scope.toggle_details = function(row) {
- row.kibana.details = row.kibana.details ? false : true;
- row.kibana.view = row.kibana.view || 'table';
- //row.kibana.details = !row.kibana.details ? $scope.without_kibana(row) : false;
- };
-
- $scope.page = function(page) {
- $scope.panel.offset = page*$scope.panel.size;
- $scope.get_data();
- };
-
- $scope.build_search = function(field,value,negate) {
- var query;
- // This needs to be abstracted somewhere
- if(_.isArray(value)) {
- query = "(" + _.map(value,function(v){return angular.toJson(v);}).join(" AND ") + ")";
- } else if (_.isUndefined(value)) {
- query = '*';
- negate = !negate;
- } else {
- query = angular.toJson(value);
- }
- $scope.panel.offset = 0;
- filterSrv.set({type:'field',field:field,query:query,mandate:(negate ? 'mustNot':'must')});
- };
-
- $scope.fieldExists = function(field,mandate) {
- filterSrv.set({type:'exists',field:field,mandate:mandate});
- };
-
- $scope.get_data = function(segment,query_id) {
- var
- _segment,
- request,
- boolQuery,
- queries,
- sort;
-
- $scope.panel.error = false;
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
-
- sort = [$scope.ejs.Sort($scope.panel.sort[0]).order($scope.panel.sort[1])];
- if($scope.panel.localTime) {
- sort.push($scope.ejs.Sort($scope.panel.timeField).order($scope.panel.sort[1]));
- }
-
-
- $scope.panelMeta.loading = true;
-
- _segment = _.isUndefined(segment) ? 0 : segment;
- $scope.segment = _segment;
-
- request = $scope.ejs.Request().indices(dashboard.indices[_segment]);
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
-
- queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- boolQuery = $scope.ejs.BoolQuery();
- _.each(queries,function(q) {
- boolQuery = boolQuery.should(querySrv.toEjsObj(q));
- });
-
- request = request.query(
- $scope.ejs.FilteredQuery(
- boolQuery,
- filterSrv.getBoolFilter(filterSrv.ids)
- ))
- .highlight(
- $scope.ejs.Highlight($scope.panel.highlight)
- .fragmentSize(2147483647) // Max size of a 32bit unsigned int
- .preTags('@start-highlight@')
- .postTags('@end-highlight@')
- )
- .size($scope.panel.size*$scope.panel.pages)
- .sort(sort);
-
- $scope.populate_modal(request);
-
- // Populate scope when we have results
- request.doSearch().then(function(results) {
- $scope.panelMeta.loading = false;
-
- if(_segment === 0) {
- $scope.hits = 0;
- $scope.data = [];
- $scope.current_fields = [];
- query_id = $scope.query_id = new Date().getTime();
- }
-
- // Check for error and abort if found
- if(!(_.isUndefined(results.error))) {
- $scope.panel.error = $scope.parse_error(results.error);
- return;
- }
-
- // Check that we're still on the same query, if not stop
- if($scope.query_id === query_id) {
-
- // This is exceptionally expensive, especially on events with a large number of fields
- $scope.data = $scope.data.concat(_.map(results.hits.hits, function(hit) {
- var
- _h = _.clone(hit),
- _p = _.omit(hit,'_source','sort','_score');
-
- // _source is kind of a lie here, never display it, only select values from it
- _h.kibana = {
- _source : _.extend(kbn.flatten_json(hit._source),_p),
- highlight : kbn.flatten_json(hit.highlight||{})
- };
-
- // Kind of cheating with the _.map here, but this is faster than kbn.get_all_fields
- $scope.current_fields = $scope.current_fields.concat(_.keys(_h.kibana._source));
-
- return _h;
- }));
-
- $scope.current_fields = _.uniq($scope.current_fields);
- $scope.hits += results.hits.total;
-
- // Sort the data
- $scope.data = _.sortBy($scope.data, function(v){
- if(!_.isUndefined(v.sort)) {
- return v.sort[0];
- } else {
- return 0;
- }
- });
-
- // Reverse if needed
- if($scope.panel.sort[1] === 'desc') {
- $scope.data.reverse();
- }
-
- // Keep only what we need for the set
- $scope.data = $scope.data.slice(0,$scope.panel.size * $scope.panel.pages);
-
- } else {
- return;
- }
-
- // If we're not sorting in reverse chrono order, query every index for
- // size*pages results
- // Otherwise, only get size*pages results then stop querying
- if (($scope.data.length < $scope.panel.size*$scope.panel.pages ||
- !((_.contains(filterSrv.timeField(),$scope.panel.sort[0])) && $scope.panel.sort[1] === 'desc')) &&
- _segment+1 < dashboard.indices.length) {
- $scope.get_data(_segment+1,$scope.query_id);
- }
-
- });
- };
-
- $scope.populate_modal = function(request) {
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
- };
-
- $scope.without_kibana = function (row) {
- var _c = _.clone(row);
- delete _c.kibana;
- return _c;
- };
-
- $scope.set_refresh = function (state) {
- $scope.refresh = state;
- };
-
- $scope.close_edit = function() {
- if($scope.refresh) {
- $scope.get_data();
- }
- $scope.refresh = false;
- };
-
- $scope.locate = function(obj, path) {
- path = path.split('.');
- var arrayPattern = /(.+)\[(\d+)\]/;
- for (var i = 0; i < path.length; i++) {
- var match = arrayPattern.exec(path[i]);
- if (match) {
- obj = obj[match[1]][parseInt(match[2],10)];
- } else {
- obj = obj[path[i]];
- }
- }
- return obj;
- };
-
-
- });
-
- // This also escapes some xml sequences
- module.filter('tableHighlight', function() {
- return function(text) {
- if (!_.isUndefined(text) && !_.isNull(text) && text.toString().length > 0) {
- return text.toString().
- replace(/&/g, '&').
- replace(//g, '>').
- replace(/\r?\n/g, '
').
- replace(/@start-highlight@/g, '').
- replace(/@end-highlight@/g, '');
- }
- return '';
- };
- });
-
- module.filter('tableTruncate', function() {
- return function(text,length,factor) {
- if (!_.isUndefined(text) && !_.isNull(text) && text.toString().length > 0) {
- return text.length > length/factor ? text.substr(0,length/factor)+'...' : text;
- }
- return '';
- };
- });
-
-
-
- module.filter('tableJson', function() {
- var json;
- return function(text,prettyLevel) {
- if (!_.isUndefined(text) && !_.isNull(text) && text.toString().length > 0) {
- json = angular.toJson(text,prettyLevel > 0 ? true : false);
- json = json.replace(/&/g, '&').replace(//g, '>');
- if(prettyLevel > 1) {
- /* jshint maxlen: false */
- json = json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
- var cls = 'number';
- if (/^"/.test(match)) {
- if (/:$/.test(match)) {
- cls = 'key strong';
- } else {
- cls = '';
- }
- } else if (/true|false/.test(match)) {
- cls = 'boolean';
- } else if (/null/.test(match)) {
- cls = 'null';
- }
- return '' + match + '';
- });
- }
- return json;
- }
- return '';
- };
- });
-
- // WIP
- module.filter('tableLocalTime', function(){
- return function(text,event) {
- return moment(event.sort[1]).format("YYYY-MM-DDTHH:mm:ss.SSSZ");
- };
- });
-
-});
\ No newline at end of file
diff --git a/src/app/panels/table/pagination.html b/src/app/panels/table/pagination.html
deleted file mode 100644
index 0a119710dd5..00000000000
--- a/src/app/panels/table/pagination.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- Show Controls
-
-
- Overflow
- -
-
diff --git a/src/app/panels/terms/editor.html b/src/app/panels/terms/editor.html
deleted file mode 100644
index e573d6c591e..00000000000
--- a/src/app/panels/terms/editor.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
- Per Page
- -
-
-
- -
-
- Page limit
- -
-
- Pageable
- = {{panel.size * panel.pages}} -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/panels/terms/module.html b/src/app/panels/terms/module.html
deleted file mode 100644
index 4e65077b586..00000000000
--- a/src/app/panels/terms/module.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/terms/module.js b/src/app/panels/terms/module.js
deleted file mode 100644
index fe767360f22..00000000000
--- a/src/app/panels/terms/module.js
+++ /dev/null
@@ -1,358 +0,0 @@
-/** @scratch /panels/5
- * include::panels/terms.asciidoc[]
- */
-
-/** @scratch /panels/terms/0
- * == terms
- * Status: *Stable*
- *
- * A table, bar chart or pie chart based on the results of an Elasticsearch terms facet.
- *
- */
-define([
- 'angular',
- 'app',
- 'underscore',
- 'jquery',
- 'kbn'
-],
-function (angular, app, _, $, kbn) {
- 'use strict';
-
- var module = angular.module('kibana.panels.terms', []);
- app.useModule(module);
-
- module.controller('terms', function($scope, querySrv, dashboard, filterSrv) {
- $scope.panelMeta = {
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- editorTabs : [
- {title:'Queries', src:'app/partials/querySelect.html'}
- ],
- status : "Stable",
- description : "Displays the results of an elasticsearch facet as a pie chart, bar chart, or a "+
- "table"
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/terms/5
- * === Parameters
- *
- * field:: The field on which to computer the facet
- */
- field : '_type',
- /** @scratch /panels/terms/5
- * exclude:: terms to exclude from the results
- */
- exclude : [],
- /** @scratch /panels/terms/5
- * missing:: Set to false to disable the display of a counter showing how much results are
- * missing the field
- */
- missing : true,
- /** @scratch /panels/terms/5
- * other:: Set to false to disable the display of a counter representing the aggregate of all
- * values outside of the scope of your +size+ property
- */
- other : true,
- /** @scratch /panels/terms/5
- * size:: Show this many terms
- */
- size : 10,
- /** @scratch /panels/terms/5
- * order:: count, term, reverse_count or reverse_term
- */
- order : 'count',
- style : { "font-size": '10pt'},
- /** @scratch /panels/terms/5
- * donut:: In pie chart mode, draw a hole in the middle of the pie to make a tasty donut.
- */
- donut : false,
- /** @scratch /panels/terms/5
- * tilt:: In pie chart mode, tilt the chart back to appear as more of an oval shape
- */
- tilt : false,
- /** @scratch /panels/terms/5
- * lables:: In pie chart mode, draw labels in the pie slices
- */
- labels : true,
- /** @scratch /panels/terms/5
- * arrangement:: In bar or pie mode, arrangement of the legend. horizontal or vertical
- */
- arrangement : 'horizontal',
- /** @scratch /panels/terms/5
- * chart:: table, bar or pie
- */
- chart : 'bar',
- /** @scratch /panels/terms/5
- * counter_pos:: The location of the legend in respect to the chart, above or below.
- */
- counter_pos : 'above',
- /** @scratch /panels/terms/5
- * spyable:: Set spyable to false to disable the inspect button
- */
- spyable : true,
- /** @scratch /panels/terms/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function () {
- $scope.hits = 0;
-
- $scope.$on('refresh',function(){
- $scope.get_data();
- });
- $scope.get_data();
-
- };
-
- $scope.get_data = function() {
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- }
-
- $scope.panelMeta.loading = true;
- var request,
- results,
- boolQuery,
- queries;
-
- request = $scope.ejs.Request().indices(dashboard.indices);
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
- queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- // This could probably be changed to a BoolFilter
- boolQuery = $scope.ejs.BoolQuery();
- _.each(queries,function(q) {
- boolQuery = boolQuery.should(querySrv.toEjsObj(q));
- });
-
-
- // Terms mode
- request = request
- .facet($scope.ejs.TermsFacet('terms')
- .field($scope.panel.field)
- .size($scope.panel.size)
- .order($scope.panel.order)
- .exclude($scope.panel.exclude)
- .facetFilter($scope.ejs.QueryFilter(
- $scope.ejs.FilteredQuery(
- boolQuery,
- filterSrv.getBoolFilter(filterSrv.ids)
- )))).size(0);
-
- // Populate the inspector panel
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
-
- results = request.doSearch();
-
- // Populate scope when we have results
- results.then(function(results) {
- var k = 0;
- $scope.panelMeta.loading = false;
- $scope.hits = results.hits.total;
- $scope.data = [];
- _.each(results.facets.terms.terms, function(v) {
- var slice = { label : v.term, data : [[k,v.count]], actions: true};
- $scope.data.push(slice);
- k = k + 1;
- });
-
- $scope.data.push({label:'Missing field',
- data:[[k,results.facets.terms.missing]],meta:"missing",color:'#aaa',opacity:0});
- $scope.data.push({label:'Other values',
- data:[[k+1,results.facets.terms.other]],meta:"other",color:'#444'});
-
- $scope.$emit('render');
- });
- };
-
- $scope.build_search = function(term,negate) {
- if(_.isUndefined(term.meta)) {
- filterSrv.set({type:'terms',field:$scope.panel.field,value:term.label,
- mandate:(negate ? 'mustNot':'must')});
- } else if(term.meta === 'missing') {
- filterSrv.set({type:'exists',field:$scope.panel.field,
- mandate:(negate ? 'must':'mustNot')});
- } else {
- return;
- }
- };
-
- $scope.set_refresh = function (state) {
- $scope.refresh = state;
- };
-
- $scope.close_edit = function() {
- if($scope.refresh) {
- $scope.get_data();
- }
- $scope.refresh = false;
- $scope.$emit('render');
- };
-
- $scope.showMeta = function(term) {
- if(_.isUndefined(term.meta)) {
- return true;
- }
- if(term.meta === 'other' && !$scope.panel.other) {
- return false;
- }
- if(term.meta === 'missing' && !$scope.panel.missing) {
- return false;
- }
- return true;
- };
-
- });
-
- module.directive('termsChart', function(querySrv) {
- return {
- restrict: 'A',
- link: function(scope, elem) {
-
- // Receive render events
- scope.$on('render',function(){
- render_panel();
- });
-
- // Re-render if the window is resized
- angular.element(window).bind('resize', function(){
- render_panel();
- });
-
- // Function for rendering panel
- function render_panel() {
- var plot, chartData;
-
- // IE doesn't work without this
- elem.css({height:scope.panel.height||scope.row.height});
-
- // Make a clone we can operate on.
- chartData = _.clone(scope.data);
- chartData = scope.panel.missing ? chartData :
- _.without(chartData,_.findWhere(chartData,{meta:'missing'}));
- chartData = scope.panel.other ? chartData :
- _.without(chartData,_.findWhere(chartData,{meta:'other'}));
-
- // Populate element.
- require(['jquery.flot.pie'], function(){
- // Populate element
- try {
- // Add plot to scope so we can build out own legend
- if(scope.panel.chart === 'bar') {
- plot = $.plot(elem, chartData, {
- legend: { show: false },
- series: {
- lines: { show: false, },
- bars: { show: true, fill: 1, barWidth: 0.8, horizontal: false },
- shadowSize: 1
- },
- yaxis: { show: true, min: 0, color: "#c8c8c8" },
- xaxis: { show: false },
- grid: {
- borderWidth: 0,
- borderColor: '#eee',
- color: "#eee",
- hoverable: true,
- clickable: true
- },
- colors: querySrv.colors
- });
- }
- if(scope.panel.chart === 'pie') {
- var labelFormat = function(label, series){
- return '
-
-
-
-
-
-
- -
-
-
-
-
-
-
- | {{term.label}} | {{term.data[0][1]}} | -
- {{term.label}} ({{term.data[0][1]}})
-
- -
-
-
-
-
-
-
- -
-
-
- | {{term.label}} | {{term.data[0][1]}} | -
- {{term.label}} ({{term.data[0][1]}})
-
- -
| Term | Count | Action | - -
|---|---|---|
| {{term.label}} | -{{term.data[0][1]}} | -- - - - - | -
'+
- label+'
'+Math.round(series.percent)+'%
';
- };
-
- plot = $.plot(elem, chartData, {
- legend: { show: false },
- series: {
- pie: {
- innerRadius: scope.panel.donut ? 0.4 : 0,
- tilt: scope.panel.tilt ? 0.45 : 1,
- radius: 1,
- show: true,
- combine: {
- color: '#999',
- label: 'The Rest'
- },
- stroke: {
- width: 0
- },
- label: {
- show: scope.panel.labels,
- radius: 2/3,
- formatter: labelFormat,
- threshold: 0.1
- }
- }
- },
- //grid: { hoverable: true, clickable: true },
- grid: { hoverable: true, clickable: true },
- colors: querySrv.colors
- });
- }
-
- // Populate legend
- if(elem.is(":visible")){
- setTimeout(function(){
- scope.legend = plot.getData();
- if(!scope.$$phase) {
- scope.$apply();
- }
- });
- }
-
- } catch(e) {
- elem.text(e);
- }
- });
- }
-
- elem.bind("plotclick", function (event, pos, object) {
- if(object) {
- scope.build_search(scope.data[object.seriesIndex]);
- }
- });
-
- var $tooltip = $(''+Math.round(series.percent)+'%
');
- elem.bind("plothover", function (event, pos, item) {
- if (item) {
- var value = scope.panel.chart === 'bar' ? item.datapoint[1] : item.datapoint[1][0][1];
- $tooltip
- .html(
- kbn.query_color_dot(item.series.color, 20) + ' ' +
- item.series.label + " (" + value.toFixed(0)+")"
- )
- .place_tt(pos.pageX, pos.pageY);
- } else {
- $tooltip.remove();
- }
- });
-
- }
- };
- });
-
-});
\ No newline at end of file
diff --git a/src/app/panels/trends/editor.html b/src/app/panels/trends/editor.html
deleted file mode 100644
index 85f6517f8fb..00000000000
--- a/src/app/panels/trends/editor.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
diff --git a/src/app/panels/trends/module.html b/src/app/panels/trends/module.html
deleted file mode 100644
index 8b2fe384ca9..00000000000
--- a/src/app/panels/trends/module.html
+++ /dev/null
@@ -1,17 +0,0 @@
-Settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/panels/trends/module.js b/src/app/panels/trends/module.js
deleted file mode 100644
index 5efe02fb911..00000000000
--- a/src/app/panels/trends/module.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/** @scratch /panels/5
- * include::panels/trends.asciidoc[]
- */
-
-/** @scratch /panels/trends/0
- * == trends
- * Status: *Beta*
- *
- * A stock-ticker style representation of how queries are moving over time. For example, if the
- * time is 1:10pm, your time picker was set to "Last 10m", and the "Time Ago" parameter was set to
- * "1h", the panel would show how much the query results have changed since 12:00-12:10pm
- *
- */
-define([
- 'angular',
- 'app',
- 'underscore',
- 'kbn'
-],
-function (angular, app, _, kbn) {
- 'use strict';
-
- var module = angular.module('kibana.panels.trends', []);
- app.useModule(module);
-
- module.controller('trends', function($scope, kbnIndex, querySrv, dashboard, filterSrv) {
-
- $scope.panelMeta = {
- modals : [
- {
- description: "Inspect",
- icon: "icon-info-sign",
- partial: "app/partials/inspector.html",
- show: $scope.panel.spyable
- }
- ],
- editorTabs : [
- {title:'Queries', src:'app/partials/querySelect.html'}
- ],
- status : "Beta",
- description : "A stock-ticker style representation of how queries are moving over time. "+
- "For example, if the time is 1:10pm, your time picker was set to \"Last 10m\", and the \"Time "+
- "Ago\" parameter was set to '1h', the panel would show how much the query results have changed"+
- " since 12:00-12:10pm"
- };
-
- // Set and populate defaults
- var _d = {
- /** @scratch /panels/trends/5
- * === Parameters
- *
- * ago:: A date math formatted string describing the relative time period to compare the
- * queries to.
- */
- ago : '1d',
- /** @scratch /panels/trends/5
- * arrangement:: `horizontal' or `vertical'
- */
- arrangement : 'vertical',
- /** @scratch /panels/trends/5
- * spyable:: Set to false to disable the inspect icon
- */
- spyable: true,
- /** @scratch /panels/trends/5
- * ==== Queries
- * queries object:: This object describes the queries to use on this panel.
- * queries.mode::: Of the queries available, which to use. Options: +all, pinned, unpinned, selected+
- * queries.ids::: In +selected+ mode, which query ids are selected.
- */
- queries : {
- mode : 'all',
- ids : []
- },
- style : { "font-size": '14pt'},
- };
- _.defaults($scope.panel,_d);
-
- $scope.init = function () {
- $scope.hits = 0;
-
- $scope.$on('refresh', function(){$scope.get_data();});
-
- $scope.get_data();
- };
-
- $scope.get_data = function(segment,query_id) {
- delete $scope.panel.error;
- $scope.panelMeta.loading = true;
-
- // Make sure we have everything for the request to complete
- if(dashboard.indices.length === 0) {
- return;
- } else {
- $scope.index = segment > 0 ? $scope.index : dashboard.indices;
- }
-
- // Determine a time field
- var timeField = _.uniq(_.pluck(filterSrv.getByType('time'),'field'));
- if(timeField.length > 1) {
- $scope.panel.error = "Time field must be consistent amongst time filters";
- return;
- } else if(timeField.length === 0) {
- $scope.panel.error = "A time filter must exist for this panel to function";
- return;
- } else {
- timeField = timeField[0];
- }
-
- // This logic can be simplifie greatly with the new kbn.parseDate
- $scope.time = filterSrv.timeRange('last');
- $scope.old_time = {
- from : new Date($scope.time.from.getTime() - kbn.interval_to_ms($scope.panel.ago)),
- to : new Date($scope.time.to.getTime() - kbn.interval_to_ms($scope.panel.ago))
- };
-
- var _segment = _.isUndefined(segment) ? 0 : segment;
- var request = $scope.ejs.Request();
- var _ids_without_time = _.difference(filterSrv.ids,filterSrv.idsByType('time'));
-
- $scope.panel.queries.ids = querySrv.idsByMode($scope.panel.queries);
- var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- // Build the question part of the query
- _.each(queries, function(query) {
- var q = $scope.ejs.FilteredQuery(
- querySrv.toEjsObj(query),
- filterSrv.getBoolFilter(_ids_without_time).must(
- $scope.ejs.RangeFilter(timeField)
- .from($scope.time.from)
- .to($scope.time.to)
- ));
-
- request = request
- .facet($scope.ejs.QueryFacet(query.id)
- .query(q)
- ).size(0);
- });
-
-
- // And again for the old time period
- _.each(queries, function(query) {
- var q = $scope.ejs.FilteredQuery(
- querySrv.toEjsObj(query),
- filterSrv.getBoolFilter(_ids_without_time).must(
- $scope.ejs.RangeFilter(timeField)
- .from($scope.old_time.from)
- .to($scope.old_time.to)
- ));
- request = request
- .facet($scope.ejs.QueryFacet("old_"+query.id)
- .query(q)
- ).size(0);
- });
-
-
- // Populate the inspector panel
- $scope.inspector = angular.toJson(JSON.parse(request.toString()),true);
-
- // If we're on the first segment we need to get our indices
- if (_segment === 0) {
- kbnIndex.indices(
- $scope.old_time.from,
- $scope.old_time.to,
- dashboard.current.index.pattern,
- dashboard.current.index.interval
- ).then(function (p) {
- $scope.index = _.union(p,$scope.index);
- request = request.indices($scope.index[_segment]);
- process_results(request.doSearch(),_segment,query_id);
- });
- } else {
- process_results(request.indices($scope.index[_segment]).doSearch(),_segment,query_id);
- }
-
- };
-
- // Populate scope when we have results
- var process_results = function(results,_segment,query_id) {
- results.then(function(results) {
- $scope.panelMeta.loading = false;
- if(_segment === 0) {
- $scope.hits = {};
- $scope.data = [];
- query_id = $scope.query_id = new Date().getTime();
- }
-
- // Check for error and abort if found
- if(!(_.isUndefined(results.error))) {
- $scope.panel.error = $scope.parse_error(results.error);
- return;
- }
-
- // Make sure we're still on the same query/queries
- if($scope.query_id === query_id) {
- var i = 0;
- var queries = querySrv.getQueryObjs($scope.panel.queries.ids);
-
- _.each(queries, function(query) {
- var n = results.facets[query.id].count;
- var o = results.facets['old_'+query.id].count;
-
- var hits = {
- new : _.isUndefined($scope.data[i]) || _segment === 0 ? n : $scope.data[i].hits.new+n,
- old : _.isUndefined($scope.data[i]) || _segment === 0 ? o : $scope.data[i].hits.old+o
- };
-
- $scope.hits.new += n;
- $scope.hits.old += o;
-
- var percent = percentage(hits.old,hits.new) == null ?
- '?' : Math.round(percentage(hits.old,hits.new)*100)/100;
- // Create series
- $scope.data[i] = {
- info: query,
- hits: {
- new : hits.new,
- old : hits.old
- },
- percent: percent
- };
-
- i++;
- });
- $scope.$emit('render');
- if(_segment < $scope.index.length-1) {
- $scope.get_data(_segment+1,query_id);
- } else {
- $scope.trends = $scope.data;
- }
- }
- });
- };
-
- function percentage(x,y) {
- return x === 0 ? null : 100*(y-x)/x;
- }
-
- $scope.set_refresh = function (state) {
- $scope.refresh = state;
- };
-
- $scope.close_edit = function() {
- if($scope.refresh) {
- $scope.get_data();
- }
- $scope.refresh = false;
- $scope.$emit('render');
- };
-
- });
-});
\ No newline at end of file
diff --git a/tasks/default_task.js b/tasks/default_task.js
index 86bef62326a..c81cf9ba610 100644
--- a/tasks/default_task.js
+++ b/tasks/default_task.js
@@ -1,4 +1,4 @@
// Lint and build CSS
module.exports = function(grunt) {
- grunt.registerTask('default', ['jshint:source', 'less:src', 'docs']);
+ grunt.registerTask('default', ['jshint:source', 'less:src']);
};
\ No newline at end of file
diff --git a/tasks/docs_task.js b/tasks/docs_task.js
deleted file mode 100644
index 2ff68b885dc..00000000000
--- a/tasks/docs_task.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Lint and build CSS
-module.exports = function(grunt) {
- grunt.registerTask('docs', ['clean:docs', 'scratchy:docs']);
-};
\ No newline at end of file
diff --git a/tasks/options/s3.js b/tasks/options/s3.js
deleted file mode 100644
index d41ed57a2e5..00000000000
--- a/tasks/options/s3.js
+++ /dev/null
@@ -1,34 +0,0 @@
-module.exports = function(config) {
- return {
- dist: {
- bucket: 'download.elasticsearch.org',
- access: 'private',
- // debug: true, // uncommment to prevent actual upload
- upload: [
- {
- src: '<%= tempDir %>/<%= pkg.name %>-latest.zip',
- dest: 'kibana/kibana/<%= pkg.name %>-latest.zip',
- },
- {
- src: '<%= tempDir %>/<%= pkg.name %>-latest.tar.gz',
- dest: 'kibana/kibana/<%= pkg.name %>-latest.tar.gz',
- }
- ]
- },
- release: {
- bucket: 'download.elasticsearch.org',
- access: 'private',
- // debug: true, // uncommment to prevent actual upload
- upload: [
- {
- src: '<%= tempDir %>/<%= pkg.name %>-<%= pkg.version %>.zip',
- dest: 'kibana/kibana/<%= pkg.name %>-<%= pkg.version %>.zip',
- },
- {
- src: '<%= tempDir %>/<%= pkg.name %>-<%= pkg.version %>.tar.gz',
- dest: 'kibana/kibana/<%= pkg.name %>-<%= pkg.version %>.tar.gz',
- }
- ]
- }
- };
-};
\ No newline at end of file
diff --git a/tasks/options/scratchy.js b/tasks/options/scratchy.js
deleted file mode 100644
index a7f7ad2a486..00000000000
--- a/tasks/options/scratchy.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = function(config) {
- return {
- docs: {
- src: ['src/app/**/*.js','src/config.js'],
- dest: config.docsDir+"/kibana",
- options: {
- unslash: true,
- extension: '.asciidoc',
- annotate: '// '
- }
- }
- }
-};
\ No newline at end of file
-
-
- {{query.percent}}%
-
- ({{query.info.alias}})
-
-