mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 01:38:56 -04:00
Merge branch 'master' of github.com:elastic/kibana into fix/licenses
This commit is contained in:
Rashid Khan
commit
fb8b2a45cc
18 changed files with 125 additions and 173 deletions
|
|
@ -62,7 +62,8 @@ module.exports = function (grunt) {
|
|||
'postcss-unique-selectors': '1.0.0',
|
||||
'postcss-minify-selectors': '1.4.6',
|
||||
'postcss-single-charset': '0.3.0',
|
||||
'regenerator': '0.8.36'
|
||||
'regenerator': '0.8.36',
|
||||
'readable-stream': '2.1.0'
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/bl
|
|||
|
||||
- Elasticsearch master
|
||||
- Kibana binary package
|
||||
- 512 MB of available RAM
|
||||
|
||||
## Installation
|
||||
|
||||
|
|
@ -15,6 +14,7 @@ Kibana is an open source ([Apache Licensed](https://github.com/elastic/kibana/bl
|
|||
* Run `bin/kibana` on unix, or `bin\kibana.bat` on Windows.
|
||||
* Visit [http://localhost:5601](http://localhost:5601)
|
||||
|
||||
|
||||
## Upgrade from previous version
|
||||
|
||||
* Move any custom configurations in your old kibana.yml to your new one
|
||||
|
|
|
|||
|
|
@ -21,9 +21,4 @@ if [ ! -x "$NODE" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# sets V8 defaults while still allowing them to be overridden
|
||||
if echo "${@}" | grep -qv "\-\-dev"; then
|
||||
NODE_OPTIONS="--max-old-space-size=256 $NODE_OPTIONS"
|
||||
fi
|
||||
|
||||
exec "${NODE}" $NODE_OPTIONS "${DIR}/src/cli" ${@}
|
||||
|
|
|
|||
|
|
@ -21,10 +21,8 @@ If Not Exist "%NODE%" (
|
|||
)
|
||||
)
|
||||
|
||||
echo.%* | findstr /V /C:"--dev" && set NODE_OPTIONS=--max-old-space-size=256 %NODE_OPTIONS%
|
||||
|
||||
TITLE Kibana Server
|
||||
call "%NODE%" %NODE_OPTIONS% "%DIR%\src\cli" %*
|
||||
"%NODE%" %NODE_OPTIONS% "%DIR%\src\cli" %*
|
||||
|
||||
:finally
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
* <<enabling-ssl, Enabling SSL>>
|
||||
* <<controlling-access, Controlling Access>>
|
||||
* <<load-balancing, Load Balancing Across Multiple Elasticsearch Nodes>>
|
||||
* <<memory-management, Memory management>>
|
||||
|
||||
How you deploy Kibana largely depends on your use case. If you are the only user,
|
||||
you can run Kibana on your local machine and configure it to point to whatever
|
||||
|
|
@ -133,10 +132,3 @@ cluster.name: "my_cluster"
|
|||
# The Elasticsearch instance to use for all your queries.
|
||||
elasticsearch_url: "http://localhost:9200"
|
||||
--------
|
||||
|
||||
[float]
|
||||
[[memory-management]]
|
||||
|
||||
=== Memory management
|
||||
|
||||
Kibana is built on Node.js which doesn't tune its heap size based on the amount of memory available. To combat this, we set defaults based on the requirements of Kibana needs, while allowing overhead for additional plugins. These defaults can be overridden at runtime, for example `NODE_OPTIONS="--max-old-space-size=512" bin/kibana`.
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ All you need is:
|
|||
|
||||
* Elasticsearch {esversion}
|
||||
* A modern web browser - http://www.elastic.co/subscriptions/matrix#matrix_browsers[Supported Browsers].
|
||||
* 512 MB of available RAM
|
||||
* Information about your Elasticsearch installation:
|
||||
** URL of the Elasticsearch instance you want to connect to.
|
||||
** Which Elasticsearch indices you want to search.
|
||||
|
|
|
|||
|
|
@ -87,8 +87,9 @@ async function mergePackageData(settings, packages) {
|
|||
*/
|
||||
async function extractArchive(settings) {
|
||||
const filter = {
|
||||
paths: [ settings.plugins[0].folder ]
|
||||
paths: [ `kibana/${settings.plugins[0].folder}` ]
|
||||
};
|
||||
|
||||
await extractFiles(settings.tempArchiveFile, settings.workingPath, 2, filter);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ dashboard-grid {
|
|||
.panel-content {
|
||||
display: flex;
|
||||
flex: 1 1 100%;
|
||||
height: 100%;
|
||||
height: auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,11 @@
|
|||
<div class="header">
|
||||
<h2 class="title">Edit Saved Objects</h2>
|
||||
<button class="btn btn-default controls" ng-click="exportAll()"><i aria-hidden="true" class="fa fa-download"></i> Export Everything</button>
|
||||
<button file-upload="importAll(fileContents)" class="btn btn-default controls" ng-click><i aria-hidden="true" class="fa fa-upload"></i> Import</button>
|
||||
<file-upload on-read="importAll(fileContents)" upload-selector="button.upload">
|
||||
<button class="btn btn-default controls upload" ng-click>
|
||||
<i aria-hidden="true" class="fa fa-upload"></i> Import
|
||||
</button>
|
||||
</file-upload>
|
||||
</div>
|
||||
<p>
|
||||
From here you can delete saved objects, such as saved searches. You can also edit the raw data of saved objects. Typically objects are only modified via their associated application, which is probably what you should use instead of this screen. Each tab is limited to 100 results. You can use the filter to find objects not in the default list.
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ body { overflow-x: hidden; }
|
|||
&.hidden-chrome { left: 0; }
|
||||
&-panel {
|
||||
.flex-parent(@shrink: 0);
|
||||
height: 100%;
|
||||
box-shadow: -4px 0px 3px rgba(0,0,0,0.2);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,80 @@
|
|||
import _ from 'lodash';
|
||||
import $ from 'jquery';
|
||||
import uiModules from 'ui/modules';
|
||||
let module = uiModules.get('kibana');
|
||||
|
||||
module.directive('fileUpload', function ($parse) {
|
||||
let html = '<span class="dropzone" ng-transclude></span>';
|
||||
|
||||
module.directive('fileUpload', function () {
|
||||
return {
|
||||
restrict: 'A',
|
||||
restrict: 'E',
|
||||
transclude: true,
|
||||
scope: {
|
||||
onRead: '&',
|
||||
onLocate: '&',
|
||||
uploadSelector: '@'
|
||||
},
|
||||
template: html,
|
||||
link: function ($scope, $elem, attrs) {
|
||||
let onUpload = $parse(attrs.fileUpload);
|
||||
let $button = $elem.find($scope.uploadSelector);
|
||||
let $dropzone = $elem.find('.dropzone');
|
||||
|
||||
let $fileInput = $('<input type="file" style="opacity: 0" id="testfile" />');
|
||||
$elem.after($fileInput);
|
||||
const handleFile = (file) => {
|
||||
if (_.isUndefined(file)) return;
|
||||
|
||||
$fileInput.on('change', function (e) {
|
||||
let reader = new FileReader();
|
||||
reader.onload = function (e) {
|
||||
$scope.$apply(function () {
|
||||
onUpload($scope, {fileContents: e.target.result});
|
||||
});
|
||||
};
|
||||
if ($scope.onRead) {
|
||||
let reader = new FileReader();
|
||||
reader.onload = function (e) {
|
||||
$scope.$apply(function () {
|
||||
$scope.onRead({fileContents: e.target.result});
|
||||
});
|
||||
};
|
||||
reader.readAsText(file);
|
||||
}
|
||||
|
||||
let target = e.srcElement || e.target;
|
||||
if (target && target.files && target.files.length) reader.readAsText(target.files[0]);
|
||||
if ($scope.onLocate) {
|
||||
$scope.onLocate({ file });
|
||||
}
|
||||
};
|
||||
|
||||
$dropzone.on('dragover', function (e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
}
|
||||
);
|
||||
|
||||
$dropzone.on('dragenter', function (e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
}
|
||||
);
|
||||
|
||||
$dropzone.on('drop', function (e) {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
const file = _.get(e, 'originalEvent.dataTransfer.files[0]');
|
||||
|
||||
if (file) {
|
||||
handleFile(file);
|
||||
}
|
||||
});
|
||||
|
||||
$elem.on('click', function (e) {
|
||||
$fileInput.val(null);
|
||||
$fileInput.trigger('click');
|
||||
});
|
||||
if ($button) {
|
||||
const $fileInput = $('<input type="file" style="opacity: 0; position:absolute; right: -999999999px" id="testfile" />');
|
||||
$elem.append($fileInput);
|
||||
|
||||
$fileInput.on('change', function (e) {
|
||||
let target = e.srcElement || e.target;
|
||||
if (_.get(target, 'files.length')) {
|
||||
handleFile(target.files[0]);
|
||||
}
|
||||
});
|
||||
|
||||
$button.on('click', function (e) {
|
||||
$fileInput.val(null);
|
||||
$fileInput.trigger('click');
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<%
|
||||
let attributes = '';
|
||||
var attributes = '';
|
||||
if (timefield) {
|
||||
attributes='class="discover-table-timefield" width="1%"';
|
||||
} else if (sourcefield) {
|
||||
|
|
|
|||
|
|
@ -1,110 +1,32 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
id="Layer_1"
|
||||
data-name="Layer 1"
|
||||
viewBox="0 0 141.37 51"
|
||||
version="1.1"
|
||||
inkscape:version="0.91 r13725"
|
||||
sodipodi:docname="kibana.svg">
|
||||
<metadata
|
||||
id="metadata31">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title>Kibana-Full-Logo</dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<sodipodi:namedview
|
||||
pagecolor="#515151"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="1"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1796"
|
||||
inkscape:window-height="1079"
|
||||
id="namedview29"
|
||||
showgrid="false"
|
||||
inkscape:zoom="2.0725756"
|
||||
inkscape:cx="70.684998"
|
||||
inkscape:cy="25.5"
|
||||
inkscape:window-x="349"
|
||||
inkscape:window-y="210"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="Layer_1" />
|
||||
<defs
|
||||
id="defs3">
|
||||
<style
|
||||
id="style5">.cls-1,.cls-2,.cls-3,.cls-4{fill:#fff;}.cls-1{opacity:0.6;}.cls-2{opacity:0.4;}.cls-3{opacity:0.9;}</style>
|
||||
</defs>
|
||||
<title
|
||||
id="title7">Kibana-Full-Logo</title>
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M409.68,273.59a38.94,38.94,0,0,1,18.71,4.76L448.2,254.5H408.94v19.11Z"
|
||||
transform="translate(-408.94 -254.5)"
|
||||
id="path9" />
|
||||
<path
|
||||
class="cls-1"
|
||||
d="M428.39,278.35l-19.45,23.42v3.73h39.2A39.2,39.2,0,0,0,428.39,278.35Z"
|
||||
transform="translate(-408.94 -254.5)"
|
||||
id="path11" />
|
||||
<path
|
||||
class="cls-2"
|
||||
d="M428.39,278.35l-19.45,23.42v3.73h7l18.87-22.77s-1.25-1.06-3-2.3C430.41,279.46,428.39,278.35,428.39,278.35Z"
|
||||
transform="translate(-408.94 -254.5)"
|
||||
id="path13" />
|
||||
<path
|
||||
class="cls-3"
|
||||
d="M409.68,273.59l-0.74,0v28.17l19.45-23.42A38.94,38.94,0,0,0,409.68,273.59Z"
|
||||
transform="translate(-408.94 -254.5)"
|
||||
id="path15" />
|
||||
<g
|
||||
style="font-style:normal;font-weight:normal;font-size:33.04906845px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:0.92528737;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text4159"
|
||||
transform="translate(0,-13.509761)">
|
||||
<path
|
||||
d="m 53.346838,50.53812 0,-6.74201 2.14819,-0.231343 4.031986,6.973353 4.065036,0 -5.023459,-8.791052 4.759066,-7.733482 -4.031986,0 -3.89979,6.444568 -2.049043,0.198295 0,-13.517069 -3.602348,0 0,23.39874 3.602348,0 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:Titillium;-inkscape-font-specification:'Titillium Semi-Bold';fill:#ffffff;fill-opacity:0.92528737"
|
||||
id="path4891"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 66.269024,50.53812 3.602349,0 0,-16.524534 -3.602349,0 0,16.524534 z m 0,-19.333705 3.602349,0 0,-3.800643 -3.602349,0 0,3.800643 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:Titillium;-inkscape-font-specification:'Titillium Semi-Bold';fill:#ffffff;fill-opacity:0.92528737"
|
||||
id="path4893"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 81.973529,33.650046 c -1.850747,0 -4.131133,0.991472 -4.131133,0.991472 l 0,-7.502138 -3.5693,0 0,23.365691 c 0,0 4.296379,0.396589 6.04798,0.396589 5.915783,0 8.063973,-2.015993 8.063973,-8.85715 0,-6.180176 -1.916846,-8.394464 -6.41152,-8.394464 z M 80.321076,47.6959 c -0.660981,0 -2.47868,-0.132196 -2.47868,-0.132196 l 0,-10.046917 c 0,0 1.949895,-0.660981 3.701495,-0.660981 2.214288,0 3.172711,1.454159 3.172711,5.188704 0,4.031986 -0.727079,5.65139 -4.395526,5.65139 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:Titillium;-inkscape-font-specification:'Titillium Semi-Bold';fill:#ffffff;fill-opacity:0.92528737"
|
||||
id="path4895"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 104.18766,39.103143 c 0,-3.767594 -1.65245,-5.453097 -5.684435,-5.453097 -3.040515,0 -6.642863,0.859276 -6.642863,0.859276 l 0.132196,2.544778 c 0,0 3.998938,-0.33049 6.213225,-0.33049 1.619405,0 2.412587,0.561834 2.412587,2.379533 l 0,1.189766 -4.263335,0.36354 c -3.53625,0.297441 -5.453096,1.487208 -5.453096,4.990409 0,3.437103 1.652453,5.254802 4.924311,5.254802 2.676975,0 5.3209,-1.222816 5.3209,-1.222816 1.22282,0.958423 2.37953,1.222816 4.39553,1.222816 l 0.0991,-2.743073 c -0.95842,-0.132196 -1.38806,-0.528785 -1.45416,-1.520257 l 0,-7.535187 z m -3.56929,3.734544 0,4.395526 c 0,0 -2.214292,0.72708 -4.098089,0.72708 -1.388061,0 -2.015993,-0.925374 -2.015993,-2.412582 0,-1.487208 0.760128,-2.214288 2.280385,-2.346484 l 3.833697,-0.36354 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:Titillium;-inkscape-font-specification:'Titillium Semi-Bold';fill:#ffffff;fill-opacity:0.92528737"
|
||||
id="path4897"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 112.28004,50.53812 0,-12.823038 c 0,0 1.8177,-0.859276 3.73454,-0.859276 2.51173,0 2.94137,1.619404 2.94137,4.924311 l 0,8.758003 3.5693,0 0,-8.85715 c 0,-5.420047 -1.12367,-8.030924 -5.71749,-8.030924 -2.14819,0 -4.56077,1.388061 -4.56077,1.388061 l 0,-1.024521 -3.5693,0 0,16.524534 3.60235,0 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:Titillium;-inkscape-font-specification:'Titillium Semi-Bold';fill:#ffffff;fill-opacity:0.92528737"
|
||||
id="path4899"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 138.91501,39.103143 c 0,-3.767594 -1.65246,-5.453097 -5.68444,-5.453097 -3.04052,0 -6.64287,0.859276 -6.64287,0.859276 l 0.1322,2.544778 c 0,0 3.99894,-0.33049 6.21322,-0.33049 1.61941,0 2.41259,0.561834 2.41259,2.379533 l 0,1.189766 -4.26333,0.36354 c -3.53625,0.297441 -5.4531,1.487208 -5.4531,4.990409 0,3.437103 1.65245,5.254802 4.92431,5.254802 2.67698,0 5.3209,-1.222816 5.3209,-1.222816 1.22282,0.958423 2.37953,1.222816 4.39553,1.222816 l 0.0991,-2.743073 c -0.95842,-0.132196 -1.38806,-0.528785 -1.45415,-1.520257 l 0,-7.535187 z m -3.5693,3.734544 0,4.395526 c 0,0 -2.21429,0.72708 -4.09809,0.72708 -1.38806,0 -2.01599,-0.925374 -2.01599,-2.412582 0,-1.487208 0.76013,-2.214288 2.28038,-2.346484 l 3.8337,-0.36354 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-family:Titillium;-inkscape-font-specification:'Titillium Semi-Bold';fill:#ffffff;fill-opacity:0.92528737"
|
||||
id="path4901"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" inkscape:version="0.91 r13725" sodipodi:docname="kibana.svg" x="0px" y="0px" viewBox="0 0 141.4 51" style="enable-background:new 0 0 141.4 51;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#FFFFFF;fill-opacity:0.9253;}
|
||||
.st1{opacity:0.7;fill:#FFFFFF;}
|
||||
.st2{opacity:0.5;fill:#FFFFFF;}
|
||||
.st3{fill:#FFFFFF;}
|
||||
</style>
|
||||
<sodipodi:namedview bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview29" inkscape:current-layer="Layer_1" inkscape:cx="70.684998" inkscape:cy="25.5" inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:window-height="1079" inkscape:window-maximized="0" inkscape:window-width="1796" inkscape:window-x="349" inkscape:window-y="210" inkscape:zoom="2.0725756" objecttolerance="10" pagecolor="#515151" showgrid="false">
|
||||
</sodipodi:namedview>
|
||||
<title id="title7">Kibana-Full-Logo</title>
|
||||
<g id="text4159" transform="translate(0,-13.509761)">
|
||||
<path id="path4891" inkscape:connector-curvature="0" class="st0" d="M53.3,50.5v-6.7l2.1-0.2l4,7h4.1l-5-8.8l4.8-7.7h-4l-3.9,6.4 l-2,0.2V27.1h-3.6v23.4C49.7,50.5,53.3,50.5,53.3,50.5z"/>
|
||||
<path id="path4893" inkscape:connector-curvature="0" class="st0" d="M66.3,50.5h3.6V34h-3.6C66.3,34,66.3,50.5,66.3,50.5z M66.3,31.2h3.6v-3.8h-3.6V31.2z"/>
|
||||
<path id="path4895" inkscape:connector-curvature="0" class="st0" d="M82,33.7c-1.9,0-4.1,1-4.1,1v-7.5h-3.6v23.4 c0,0,4.3,0.4,6,0.4c5.9,0,8.1-2,8.1-8.9C88.4,35.9,86.5,33.7,82,33.7z M80.3,47.7c-0.7,0-2.5-0.1-2.5-0.1v-10c0,0,1.9-0.7,3.7-0.7 c2.2,0,3.2,1.5,3.2,5.2C84.7,46.1,84,47.7,80.3,47.7z"/>
|
||||
<path id="path4897" inkscape:connector-curvature="0" class="st0" d="M104.2,39.1c0-3.8-1.7-5.5-5.7-5.5c-3,0-6.6,0.9-6.6,0.9 l0.1,2.5c0,0,4-0.3,6.2-0.3c1.6,0,2.4,0.6,2.4,2.4v1.2l-4.3,0.4c-3.5,0.3-5.5,1.5-5.5,5c0,3.4,1.7,5.3,4.9,5.3 c2.7,0,5.3-1.2,5.3-1.2c1.2,1,2.4,1.2,4.4,1.2l0.1-2.7c-1-0.1-1.4-0.5-1.5-1.5L104.2,39.1L104.2,39.1z M100.6,42.8v4.4 c0,0-2.2,0.7-4.1,0.7c-1.4,0-2-0.9-2-2.4s0.8-2.2,2.3-2.3L100.6,42.8z"/>
|
||||
<path id="path4899" inkscape:connector-curvature="0" class="st0" d="M112.3,50.5V37.7c0,0,1.8-0.9,3.7-0.9c2.5,0,2.9,1.6,2.9,4.9 v8.8h3.6v-8.9c0-5.4-1.1-8-5.7-8c-2.1,0-4.6,1.4-4.6,1.4v-1h-3.6v16.5C108.7,50.5,112.3,50.5,112.3,50.5z"/>
|
||||
<path id="path4901" inkscape:connector-curvature="0" class="st0" d="M138.9,39.1c0-3.8-1.7-5.5-5.7-5.5c-3,0-6.6,0.9-6.6,0.9 l0.1,2.5c0,0,4-0.3,6.2-0.3c1.6,0,2.4,0.6,2.4,2.4v1.2l-4.3,0.4c-3.5,0.3-5.5,1.5-5.5,5c0,3.4,1.7,5.3,4.9,5.3 c2.7,0,5.3-1.2,5.3-1.2c1.2,1,2.4,1.2,4.4,1.2l0.1-2.7c-1-0.1-1.4-0.5-1.5-1.5L138.9,39.1L138.9,39.1z M135.3,42.8v4.4 c0,0-2.2,0.7-4.1,0.7c-1.4,0-2-0.9-2-2.4s0.8-2.2,2.3-2.3L135.3,42.8z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M19.4,23.8L39.3,0H0v19.1c0.2,0,0.5,0,0.7,0C7.5,19.1,13.9,20.8,19.4,23.8z"/>
|
||||
<polygon class="st1" points="0,47.3 0,47.3 19.4,23.8 "/>
|
||||
<path class="st1" d="M24.5,27.1c0.2,0.2,0.4,0.3,0.5,0.4C24.9,27.4,24.7,27.3,24.5,27.1z"/>
|
||||
<path class="st1" d="M23,26c0.1,0.1,0.2,0.1,0.3,0.2C23.2,26.2,23.1,26.1,23,26z"/>
|
||||
<path class="st1" d="M25.8,28.2L7,51h32.2C37.5,41.9,32.7,33.9,25.8,28.2z"/>
|
||||
<path class="st2" d="M22.8,25.9c-1.4-1-3.4-2.1-3.4-2.1c1.2,0.7,2.4,1.4,3.6,2.2C22.9,26,22.9,26,22.8,25.9z"/>
|
||||
<path class="st2" d="M25.9,28.2c0,0-0.3-0.2-0.8-0.6C25.3,27.8,25.6,28,25.9,28.2L25.9,28.2z"/>
|
||||
<path class="st2" d="M23.3,26.3c0.4,0.3,0.8,0.6,1.2,0.9C24.2,26.9,23.8,26.6,23.3,26.3z"/>
|
||||
<path class="st2" d="M25.1,27.6c-0.2-0.1-0.3-0.3-0.5-0.4c-0.4-0.3-0.8-0.6-1.2-0.9c-0.1-0.1-0.2-0.1-0.3-0.2 c-1.1-0.8-2.3-1.5-3.6-2.2L0,47.3V51h7l18.9-22.8C25.6,28,25.3,27.8,25.1,27.6z"/>
|
||||
<path class="st3" d="M0.7,19.1c-0.2,0-0.5,0-0.7,0v28.2l19.4-23.4C13.9,20.8,7.5,19.1,0.7,19.1z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 4.1 KiB |
|
|
@ -94,7 +94,6 @@ ul.navbar-inline li {
|
|||
.flex-parent(@shrink: 0);
|
||||
position: relative;
|
||||
z-index: 0;
|
||||
max-height: 100%;
|
||||
background-color: @white;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -232,17 +232,25 @@ export default function MapFactory(Private) {
|
|||
// TODO: Different drawTypes need differ info. Need a switch on the object creation
|
||||
let bounds = e.layer.getBounds();
|
||||
|
||||
let SElng = bounds.getSouthEast().lng;
|
||||
if (SElng > 180) {
|
||||
SElng -= 360;
|
||||
}
|
||||
let NWlng = bounds.getNorthWest().lng;
|
||||
if (NWlng < -180) {
|
||||
NWlng += 360;
|
||||
}
|
||||
self._events.emit(drawType, {
|
||||
e: e,
|
||||
chart: self._chartData,
|
||||
bounds: {
|
||||
top_left: {
|
||||
lat: bounds.getNorthWest().lat,
|
||||
lon: bounds.getNorthWest().lng
|
||||
lon: NWlng
|
||||
},
|
||||
bottom_right: {
|
||||
lat: bounds.getSouthEast().lat,
|
||||
lon: bounds.getSouthEast().lng
|
||||
lon: SElng
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ visualize {
|
|||
overflow: auto;
|
||||
-webkit-transition: opacity 0.01s;
|
||||
transition: opacity 0.01s;
|
||||
max-height: 100%;
|
||||
|
||||
&.spy-only {
|
||||
display: none;
|
||||
|
|
|
|||
|
|
@ -25,18 +25,13 @@ module.exports = function (grunt) {
|
|||
return flags;
|
||||
}, []);
|
||||
|
||||
const devEnv = Object.assign(process.env, {
|
||||
NODE_OPTIONS: '--max-old-space-size=1024'
|
||||
});
|
||||
|
||||
return {
|
||||
testServer: {
|
||||
options: {
|
||||
wait: false,
|
||||
ready: /Server running/,
|
||||
quiet: false,
|
||||
failOnError: false,
|
||||
env: devEnv
|
||||
failOnError: false
|
||||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
|
|
@ -51,8 +46,7 @@ module.exports = function (grunt) {
|
|||
wait: false,
|
||||
ready: /Server running/,
|
||||
quiet: false,
|
||||
failOnError: false,
|
||||
env: devEnv
|
||||
failOnError: false
|
||||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
|
|
@ -70,8 +64,7 @@ module.exports = function (grunt) {
|
|||
wait: false,
|
||||
ready: /Server running/,
|
||||
quiet: false,
|
||||
failOnError: false,
|
||||
env: devEnv
|
||||
failOnError: false
|
||||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
|
|
@ -87,8 +80,7 @@ module.exports = function (grunt) {
|
|||
wait: false,
|
||||
ready: /Server running/,
|
||||
quiet: false,
|
||||
failOnError: false,
|
||||
env: devEnv
|
||||
failOnError: false
|
||||
},
|
||||
cmd: binScript,
|
||||
args: [
|
||||
|
|
@ -156,8 +148,7 @@ module.exports = function (grunt) {
|
|||
options: {
|
||||
wait: false,
|
||||
ready: /Optimization .+ complete/,
|
||||
quiet: false,
|
||||
env: devEnv
|
||||
quiet: true
|
||||
},
|
||||
cmd: './build/kibana/bin/kibana',
|
||||
args: [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import { includes } from 'lodash';
|
|||
export default function filesToCommit(path) {
|
||||
const simpleGit = new SimpleGit(path);
|
||||
const gitDiff = promisify(simpleGit.diff, simpleGit);
|
||||
const pathsToIgnore = ['webpackShims'];
|
||||
|
||||
return gitDiff(['--name-status', '--cached'])
|
||||
.then(output => {
|
||||
|
|
@ -13,9 +12,6 @@ export default function filesToCommit(path) {
|
|||
.split('\n')
|
||||
.map(line => line.trim().split('\t'))
|
||||
.filter(parts => parts.length === 2)
|
||||
.filter(parts => {
|
||||
return pathsToIgnore.reduce((prev, curr) => {(prev === false) ? prev : parts[1].indexOf(curr) === -1;}, true);
|
||||
})
|
||||
.map(parts => {
|
||||
const status = parts.shift();
|
||||
const name = parts.join('\t').trim();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue