-
Notifications
You must be signed in to change notification settings - Fork 236
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* develop: (23 commits) Made the Guided Dashboard the default and moved syslog to syslog.json Added Release Notes for Banana 1.2 Default setting to hide the collection drop-down from dashboard UI. Add sorting by time field to bettermap module. Remove df params from queries used in default.json and guided.json. Change the way we include ./leaflet/plugins back to the old Kibana way. Somehow we cannot move the lib to the top of the file. It will cause undefined error. Fix bugs SILK-4 and SILK-29 (timepicker issue when using absolute mode or since mode, the date will skip back one day). Fix Dashboard Settings Controls tab. Now all controls should work properly. So we can show or hide dashboard menus and sub-menus (e.g. collections picker, load, save, and etc.) from a user. Add collections drop-down box to the dashboard. Added hits panel and export data to file in table panel Major cleanup Cleanup bettermap module. Added lat,lon field to bettermap and enabled filter queries to use filter service Modify silklogo image. Fix SOL-76: Add Smooth Line mode for histogram module. Move UI Settings of query module to dashboard UI setting for "Global Query Parameters" (e.g. defType and df params). Added bettermap support and replaced ejs with sjs Fix bug in map module. Fix bug in map module not refreshing when query gives no result. Remove all hard coded df from the panel modules. Add defType and df settings to query panel. Optimize code by moving some functions to querySrv. Fix bugs when getting time field from filterSrv. Fix filtering bugs in map, table, terms, and histogram modules. Optimize code by moving functions to filterSrv. Remove some hard coded. ... Conflicts: src/app/dashboards/default.json src/app/dashboards/guided.json src/app/dashboards/syslog.json src/app/services/dashboard.js src/app/services/kbnIndex.js
- Loading branch information
Showing
34 changed files
with
981 additions
and
621 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| { | ||
| "title": "Better Map Demo", | ||
| "services": { | ||
| "query": { | ||
| "idQueue": [ | ||
| 1 | ||
| ], | ||
| "list": { | ||
| "0": { | ||
| "query": "*:*", | ||
| "alias": "", | ||
| "color": "#7EB26D", | ||
| "id": 0, | ||
| "pin": false, | ||
| "type": "lucene" | ||
| } | ||
| }, | ||
| "ids": [ | ||
| 0 | ||
| ] | ||
| }, | ||
| "filter": { | ||
| "idQueue": [ | ||
| 1 | ||
| ], | ||
| "list": { | ||
| "0": { | ||
| "from": "2014-01-31T22:00:00.000Z", | ||
| "to": "2014-04-23T09:53:36.013Z", | ||
| "field": "start_time", | ||
| "type": "time", | ||
| "mandate": "must", | ||
| "active": true, | ||
| "alias": "", | ||
| "id": 0 | ||
| } | ||
| }, | ||
| "ids": [ | ||
| 0 | ||
| ] | ||
| } | ||
| }, | ||
| "rows": [ | ||
| { | ||
| "title": "Options", | ||
| "height": "50px", | ||
| "editable": true, | ||
| "collapse": false, | ||
| "collapsable": true, | ||
| "panels": [ | ||
| { | ||
| "error": false, | ||
| "span": 4, | ||
| "editable": true, | ||
| "type": "filtering", | ||
| "loadingEditor": false | ||
| }, | ||
| { | ||
| "title": "Set time span", | ||
| "error": "", | ||
| "span": 4, | ||
| "editable": true, | ||
| "group": [ | ||
| "default" | ||
| ], | ||
| "type": "timepicker", | ||
| "mode": "since", | ||
| "time_options": [ | ||
| "5m", | ||
| "15m", | ||
| "1h", | ||
| "6h", | ||
| "12h", | ||
| "24h", | ||
| "2d", | ||
| "7d", | ||
| "30d" | ||
| ], | ||
| "timespan": "30d", | ||
| "timefield": "start_time", | ||
| "timeformat": "", | ||
| "refresh": { | ||
| "enable": false, | ||
| "interval": 600, | ||
| "min": 3 | ||
| }, | ||
| "filter_id": 0, | ||
| "status": "Stable", | ||
| "time": { | ||
| "from": "02/01/2014 00:00:00", | ||
| "to": "04/23/2014 11:53:36" | ||
| } | ||
| }, | ||
| { | ||
| "error": false, | ||
| "span": 4, | ||
| "editable": true, | ||
| "type": "query", | ||
| "loadingEditor": false, | ||
| "query": "*:*", | ||
| "pinned": true, | ||
| "history": [ | ||
| "*:*" | ||
| ], | ||
| "remember": 10, | ||
| "title": "Search", | ||
| "def_type": "" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "title": "BetterMapDemo", | ||
| "height": "650px", | ||
| "editable": true, | ||
| "collapse": false, | ||
| "collapsable": true, | ||
| "panels": [ | ||
| { | ||
| "title": "Better Map Demo", | ||
| "span": 12, | ||
| "editable": true, | ||
| "tooltip": "start_station_id", | ||
| "group": [ | ||
| "default" | ||
| ], | ||
| "field" : "start_station", | ||
| "type" : "bettermap", | ||
| "size" : 7000, | ||
| "time_field": "start_time", | ||
| "lat_start" : 40, | ||
| "lat_end" : 45, | ||
| "lon_start" : -80, | ||
| "lon_end" : -73, | ||
| "dist" : 100, | ||
| "sort": [ | ||
| "start_time", | ||
| "desc" | ||
| ], | ||
| "queries": { | ||
| "mode": "all", | ||
| "ids": [ | ||
| 0 | ||
| ], | ||
| "custom": "" | ||
| }, | ||
| "spyable": true, | ||
| "error": false | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "editable": true, | ||
| "failover": false, | ||
| "index": { | ||
| "interval": "none", | ||
| "pattern": "[logstash-]YYYY.MM.DD", | ||
| "default": "NO_TIME_FILTER_OR_INDEX_PATTERN_NOT_MATCHED" | ||
| }, | ||
| "style": "dark", | ||
| "panel_hints": true, | ||
| "loader": { | ||
| "save_gist": false, | ||
| "save_elasticsearch": true, | ||
| "save_local": true, | ||
| "save_default": true, | ||
| "save_temp": true, | ||
| "save_temp_ttl_enable": true, | ||
| "save_temp_ttl": "30d", | ||
| "load_gist": true, | ||
| "load_elasticsearch": true, | ||
| "load_elasticsearch_size": 20, | ||
| "load_local": true, | ||
| "hide": false | ||
| }, | ||
| "solr": { | ||
| "server": "http://localhost:8983/solr/", | ||
| "core_name": "bike-trip-geo" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.