Merge branch 'master' of github.com:elastic/kibana into de-signals-ac…

…tions
elastic · Dec 18, 2019 · 681f002 · 681f002
2 parents b1fec53 + 815f721
commit 681f002
Show file tree

Hide file tree

Showing 192 changed files with 4,593 additions and 2,895 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,7 +29,6 @@ disabledPlugins
 webpackstats.json
 /config/*
 !/config/kibana.yml
-!/config/apm.js
 coverage
 selenium
 .babel_register_cache.json

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-10.15.2
+10.18.0
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-10.15.2
+10.18.0
diff --git a/config/apm.js b/config/apm.js
diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
@@ -5,7 +5,7 @@ base image is https://hub.docker.com/_/centos/[centos:7].
 
 A list of all published Docker images and tags is available at
 https://www.docker.elastic.co[www.docker.elastic.co]. The source code is in
-https://github.com/elastic/kibana-docker/tree/{branch}[GitHub].
+https://github.com/elastic/dockerfiles/tree/{branch}/kibana[GitHub].
 
 These images are free to use under the Elastic license. They contain open source 
 and free commercial features and access to paid commercial features.  

diff --git a/package.json b/package.json
@@ -112,6 +112,7 @@
   "dependencies": {
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.7.0",
+    "@elastic/apm-rum": "^4.6.0",
     "@elastic/charts": "^14.0.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
@@ -467,7 +468,7 @@
     "zlib": "^1.0.5"
   },
   "engines": {
-    "node": "10.15.2",
+    "node": "10.18.0",
     "yarn": "^1.21.1"
   }
 }