Skip to content

Commit

Permalink
Revert "Limit memory overhead"
Browse files Browse the repository at this point in the history
  • Loading branch information
tylersmalley committed Apr 28, 2016
1 parent dadceb1 commit 5ae32d1
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 32 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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

Expand All @@ -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
Expand Down
5 changes: 0 additions & 5 deletions bin/kibana
Expand Up @@ -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" ${@}
4 changes: 1 addition & 3 deletions bin/kibana.bat
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions docs/production.asciidoc
Expand Up @@ -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
Expand Down Expand Up @@ -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`.
1 change: 0 additions & 1 deletion docs/setup.asciidoc
Expand Up @@ -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.
Expand Down
19 changes: 5 additions & 14 deletions tasks/config/run.js
Expand Up @@ -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: [
Expand All @@ -51,8 +46,7 @@ module.exports = function (grunt) {
wait: false,
ready: /Server running/,
quiet: false,
failOnError: false,
env: devEnv
failOnError: false
},
cmd: binScript,
args: [
Expand All @@ -70,8 +64,7 @@ module.exports = function (grunt) {
wait: false,
ready: /Server running/,
quiet: false,
failOnError: false,
env: devEnv
failOnError: false
},
cmd: binScript,
args: [
Expand All @@ -87,8 +80,7 @@ module.exports = function (grunt) {
wait: false,
ready: /Server running/,
quiet: false,
failOnError: false,
env: devEnv
failOnError: false
},
cmd: binScript,
args: [
Expand Down Expand Up @@ -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: [
Expand Down

0 comments on commit 5ae32d1

Please sign in to comment.