Merge remote-tracking branch 'origin/master' into feature/merge-code

Author: zfy0701

docs/maps/connect-to-ems.asciidoc

@@ -0,0 +1,27 @@
+[role="xpack"]
+[[maps-connect-to-ems]]
+== Connecting to Elastic Maps Service
+
+https://www.elastic.co/elastic-maps-service[Elastic Maps Service (EMS)] is a service that hosts
+tile layers and vector shapes of administrative boundaries.
+If you are using Kibana's out-of-the box settings, the **Maps** application is already configured to use EMS.
+
+Requests to EMS are made with two methods:
+
+* Requests for tile layer meta data, vector shapes meta data, and vector shapes are proxied through the Kibana server.
+* Requests for EMS tiles are made directly from the browser to EMS.
+
+NOTE: The legacy tilemap and regionmap visualizations make requests directly from the browser to EMS.
+
+
+[float]
+=== Disabling Elastic Maps Service
+
+You might experience EMS connection issues if your Kibana server or browser are on a private network or
+behind a firewall. If this happens, you can disable the EMS connection to avoid unnecessary EMS requests.
+
+To disable EMS, change your <<settings, kibana.yml>> file.
+
+. Set `map.includeElasticMapsService` to `false` to turn off the EMS connection.
+. Set `map.tilemap.url` to the URL of your tile server. This configures the **Maps** default tile layer.
+. (Optional) Set `map.regionmap` to the vector shapes of the administrative boundaries that you want to use.

docs/maps/index.asciidoc

@@ -19,3 +19,4 @@ include::heatmap-layer.asciidoc[]
 include::tile-layer.asciidoc[]
 include::vector-layer.asciidoc[]
 include::search.asciidoc[]
+include::connect-to-ems.asciidoc[]

docs/maps/terms-join.asciidoc

@@ -9,7 +9,7 @@ You can augment vector features with property values that symbolize features and
 image::maps/images/terms_join.png[]
 
 Follow the example below to understand how *Terms joins* work.
-This example uses Elastic Maps Service(EMS) World Countries as the vector source and
+This example uses https://www.elastic.co/elastic-maps-service[Elastic Maps Service (EMS)] World Countries as the vector source and
 the Kibana sample data set "Sample web logs" as the Elasticsearch index.
 
 Example feature from World Countries:

package.json

@@ -283,7 +283,7 @@
     "@types/eslint": "^4.16.6",
     "@types/execa": "^0.9.0",
     "@types/fetch-mock": "7.2.1",
-    "@types/getopts": "^2.0.0",
+    "@types/getopts": "^2.0.1",
     "@types/glob": "^7.1.1",
     "@types/globby": "^8.0.0",
     "@types/graphql": "^0.13.1",
@@ -359,7 +359,7 @@
     "faker": "1.1.0",
     "fetch-mock": "7.3.0",
     "geckodriver": "^1.16.1",
-    "getopts": "2.0.0",
+    "getopts": "^2.2.4",
     "grunt": "1.0.3",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-watch": "^1.1.0",

packages/kbn-es-query/package.json

@@ -25,7 +25,7 @@
     "@kbn/dev-utils": "1.0.0",
     "@kbn/expect": "1.0.0",
     "del": "^3.0.0",
-    "getopts": "^2.2.3",
+    "getopts": "^2.2.4",
     "supports-color": "^6.1.0",
     "typescript": "^3.3.3333"
   }

packages/kbn-es/package.json

@@ -11,7 +11,7 @@
     "dedent": "^0.7.0",
     "del": "^3.0.0",
     "execa": "^1.0.0",
-    "getopts": "^2.0.6",
+    "getopts": "^2.2.4",
     "glob": "^7.1.2",
     "mkdirp": "^0.5.1",
     "node-fetch": "^2.0.0",

packages/kbn-i18n/package.json

@@ -23,7 +23,7 @@
     "@types/intl-relativeformat": "^2.1.0",
     "@types/react-intl": "^2.3.15",
     "del": "^3.0.0",
-    "getopts": "^2.2.3",
+    "getopts": "^2.2.4",
     "supports-color": "^6.1.0",
     "typescript": "^3.3.3333"
   },

packages/kbn-interpreter/package.json

@@ -26,7 +26,7 @@
     "copy-webpack-plugin": "^4.6.0",
     "css-loader": "1.0.0",
     "del": "^3.0.0",
-    "getopts": "^2.2.3",
+    "getopts": "^2.2.4",
     "pegjs": "0.9.0",
     "sass-loader": "^7.1.0",
     "style-loader": "0.23.1",

packages/kbn-plugin-generator/package.json

@@ -7,7 +7,7 @@
     "chalk": "^2.4.1",
     "dedent": "^0.7.0",
     "execa": "^1.0.0",
-    "getopts": "^2.0.0",
+    "getopts": "^2.2.4",
     "lodash.camelcase": "^4.3.0",
     "lodash.kebabcase": "^4.1.1",
     "lodash.snakecase": "^4.1.1",