github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update manifest endpoint to new staging server (#9981)

Browse source 
Backports PR #9972

**Commit 1:**
update manifest endpoint

* Original sha: c928f905fa
* Authored by Thomas Neirynck <thomas@elastic.co> on 2017-01-19T21:22:05Z

**Commit 2:**
update corresponding doc

* Original sha: 1b359f27f6
* Authored by Thomas Neirynck <thomas@elastic.co> on 2017-01-20T14:44:21Z

**Commit 3:**
readd example url

* Original sha: 7c44469592
* Authored by Thomas Neirynck <thomas@elastic.co> on 2017-01-20T14:49:36Z

**Commit 4:**
configure manifest to master service

* Original sha: 6094b7f047
* Authored by Thomas Neirynck <thomas@elastic.co> on 2017-01-20T17:16:19Z
This commit is contained in:
jasper 2017-01-20 15:27:38 -05:00 • committed by Thomas Neirynck
parent 813278f01f
commit bbbd2e81d8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/setup/settings.asciidoc
View file

@ -23,8 +23,8 @@ to this Kibana instance.
`kibana.index:`:: *Default: ".kibana"* Kibana uses an index in Elasticsearch to store saved searches, visualizations and
dashboards. Kibana creates a new index if the index doesn’t already exist.
`kibana.defaultAppId:`:: *Default: "discover"* The default application to load.
[[tilemap-settings]]`tilemap.url:`:: *Default: `"https://tiles.elastic.co/v1/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana"`* The URL to the tile
service that Kibana uses to display map tiles in tilemap visualizations.
[[tilemap-settings]]`tilemap.url:`:: The URL to the tile
service that Kibana uses to display map tiles in tilemap visualizations. By default, Kibana reads this url from an external metadata service, but users can still override this parameter to use their own Tile Map Service. For example: `"https://tiles.elastic.co/v2/default/{z}/{x}/{y}.png?elastic_tile_service_tos=agree&my_app_name=kibana"`
`tilemap.options.minZoom:`:: *Default: 1* The minimum zoom level.
`tilemap.options.maxZoom:`:: *Default: 10* The maximum zoom level.
`tilemap.options.attribution:`:: *Default: `"© [Elastic Tile Service](https://www.elastic.co/elastic-tile-service)"`* The map attribution string.

2
src/server/config/schema.js
View file

@ -132,7 +132,7 @@ module.exports = () => Joi.object({
allowAnonymous: Joi.boolean().default(false)
}).default(),
tilemap: Joi.object({
manifestServiceUrl: Joi.string().default('https://proxy-tiles.elastic.co/v1/manifest'),
manifestServiceUrl: Joi.string().default('https://tiles-stage.elastic.co/v2/manifest'),
url: Joi.string(),
options: Joi.object({
attribution: Joi.string(),