Merge branch 'master' into eui/18.2

elastic · Jan 14, 2020 · af21cdd · af21cdd
2 parents dc4a1ef + 6c9e4ec
commit af21cdd
Show file tree

Hide file tree

Showing 22 changed files with 165 additions and 114 deletions.
diff --git a/docs/settings/monitoring-settings.asciidoc b/docs/settings/monitoring-settings.asciidoc
@@ -7,10 +7,10 @@
 
 By default, the Monitoring application is enabled, but data collection
 is disabled.  When you first start {kib} monitoring, you are prompted to
-enable data collection. If you are using {security}, you must be 
+enable data collection. If you are using {security}, you must be
 signed in as a user with the `cluster:manage` privilege to enable
 data collection. The built-in `superuser` role has this privilege and the
-built-in `elastic` user has this role. 
+built-in `elastic` user has this role.
 
 You can adjust how monitoring data is
 collected from {kib} and displayed in {kib} by configuring settings in the
@@ -134,3 +134,11 @@ For {es} clusters that are running in containers, this setting changes the
 statistics. It also adds the calculated Cgroup CPU utilization to the
 *Node Overview* page instead of the overall operating system's CPU
 utilization. Defaults to `false`.
+
+`xpack.monitoring.ui.container.logstash.enabled`::
+
+For {ls} nodes that are running in containers, this setting
+changes the {ls} *Node Listing* to display the CPU utilization
+based on the reported Cgroup statistics. It also adds the
+calculated Cgroup CPU utilization to the {ls} node detail
+pages instead of the overall operating system’s CPU utilization. Defaults to `false`.
diff --git a/package.json b/package.json
@@ -117,7 +117,7 @@
     "@elastic/apm-rum": "^4.6.0",
     "@elastic/charts": "^16.1.0",
     "@elastic/datemath": "5.0.2",
-    "@elastic/ems-client": "1.0.5",
+    "@elastic/ems-client": "7.6.0",
     "@elastic/eui": "18.2.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",

diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
@@ -91,12 +91,25 @@ const cspRulesDeprecation: ConfigDeprecation = (settings, fromPath, log) => {
   return settings;
 };
 
+const mapManifestServiceUrlDeprecation: ConfigDeprecation = (settings, fromPath, log) => {
+  if (has(settings, 'map.manifestServiceUrl')) {
+    log(
+      'You should no longer use the map.manifestServiceUrl setting in kibana.yml to configure the location ' +
+        'of the Elastic Maps Service settings. These settings have moved to the "map.emsTileApiUrl" and ' +
+        '"map.emsFileApiUrl" settings instead. These settings are for development use only and should not be ' +
+        'modified for use in production environments.'
+    );
+  }
+  return settings;
+};
+
 export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   unusedFromRoot,
   renameFromRoot,
 }) => [
   unusedFromRoot('savedObjects.indexCheckTimeout'),
   unusedFromRoot('server.xsrf.token'),
+  unusedFromRoot('maps.manifestServiceUrl'),
   renameFromRoot('optimize.lazy', 'optimize.watch'),
   renameFromRoot('optimize.lazyPort', 'optimize.watchPort'),
   renameFromRoot('optimize.lazyHost', 'optimize.watchHost'),
@@ -110,4 +123,5 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   dataPathDeprecation,
   rewriteBasePathDeprecation,
   cspRulesDeprecation,
+  mapManifestServiceUrlDeprecation,
 ];
diff --git a/src/legacy/core_plugins/tests_bundle/tests_entry_template.js b/src/legacy/core_plugins/tests_bundle/tests_entry_template.js
@@ -114,7 +114,8 @@ const coreSystem = new CoreSystem({
       },
       mapConfig: {
         includeElasticMapsService: true,
-        manifestServiceUrl: 'https://catalogue-staging.maps.elastic.co/v2/manifest'
+        emsFileApiUrl: 'https://vector-staging.maps.elastic.co',
+        emsTileApiUrl: 'https://tiles.maps.elastic.co',
       },
       vegaConfig: {
         enabled: true,

diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js
@@ -254,7 +254,11 @@ export default () =>
           )
           .default([]),
       }).default(),
-      manifestServiceUrl: Joi.string().default('https://catalogue.maps.elastic.co/v7.2/manifest'),
+      manifestServiceUrl: Joi.string()
+        .default('')
+        .allow(''),
+      emsFileApiUrl: Joi.string().default('https://vector-staging.maps.elastic.co'),
+      emsTileApiUrl: Joi.string().default('https://tiles.maps.elastic.co'),
       emsLandingPageUrl: Joi.string().default('https://maps.elastic.co/v7.4'),
       emsFontLibraryUrl: Joi.string().default(
         'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf'

diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_files.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_files.json
@@ -24,7 +24,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/world_countries_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/world_countries_v1.geo.json",
           "legacy_default": true
         }
       ],
@@ -430,7 +430,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/australia_states_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/australia_states_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -629,7 +629,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/canada_provinces_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/canada_provinces_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -908,7 +908,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/china_provinces_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/china_provinces_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -1266,7 +1266,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/finland_regions_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/finland_regions_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -1634,7 +1634,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/france_departments_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/france_departments_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -1984,7 +1984,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/germany_states_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/germany_states_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -2328,7 +2328,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/ireland_counties_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/ireland_counties_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -2637,7 +2637,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/japan_prefectures_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/japan_prefectures_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -3003,7 +3003,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/netherlands_provinces_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/netherlands_provinces_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -3309,7 +3309,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/norway_counties_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/norway_counties_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -3671,7 +3671,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/spain_provinces_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/spain_provinces_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -4002,7 +4002,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/sweden_counties_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/sweden_counties_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -4311,7 +4311,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/switzerland_cantons_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/switzerland_cantons_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -4827,7 +4827,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/uk_subdivisions_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/uk_subdivisions_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -5074,7 +5074,7 @@
       "formats": [
         {
           "type": "topojson",
-          "url": "https://vector-staging.maps.elastic.co/files/usa_counties_v2.topo.json?elastic_tile_service_tos=agree",
+          "url": "/files/usa_counties_v2.topo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -5441,7 +5441,7 @@
       "formats": [
         {
           "type": "geojson",
-          "url": "https://vector-staging.maps.elastic.co/files/usa_states_v1.geo.json?elastic_tile_service_tos=agree",
+          "url": "/files/usa_states_v1.geo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],
@@ -5731,7 +5731,7 @@
       "formats": [
         {
           "type": "topojson",
-          "url": "https://vector-staging.maps.elastic.co/files/usa_zip_codes_v2.topo.json?elastic_tile_service_tos=agree",
+          "url": "/files/usa_zip_codes_v2.topo.json?elastic_tile_service_tos=agree",
           "legacy_default": true
         }
       ],

diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_manifest.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_manifest.json
@@ -3,13 +3,13 @@
     {
       "id": "tiles_v2",
       "name": "Elastic Maps Tile Service",
-      "manifest": "https://tiles.foobar/manifest",
+      "manifest": "https://tiles.foobar/v7.6/manifest",
       "type": "tms"
     },
     {
       "id": "geo_layers",
       "name": "Elastic Maps Vector Service",
-      "manifest": "https://files.foobar/manifest",
+      "manifest": "https://files.foobar/v7.6/manifest",
       "type": "file"
     }
   ]

diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_bright.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_bright.json
@@ -7,6 +7,6 @@
   "bounds": [-180, -85.0511, 180, 85.0511],
   "format": "png",
   "type": "baselayer",
-  "tiles": ["https://raster-style.foobar/styles/osm-bright/{z}/{x}/{y}.png"],
+  "tiles": ["/raster/styles/osm-bright/{z}/{x}/{y}.png"],
   "center": [0, 0, 2]
 }
diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_bright_vector.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_bright_vector.json
@@ -41,11 +41,11 @@
   "sources": {
     "openmaptiles": {
       "type": "vector",
-      "url": "https://tiles.maps.elastic.co/data/v3.json"
+      "url": "/data/v3.json"
     }
   },
-  "sprite": "https://tiles.maps.elastic.co/styles/osm-bright/sprite",
-  "glyphs": "https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf",
+  "sprite": "/styles/osm-bright/sprite",
+  "glyphs": "/fonts/{fontstack}/{range}.pbf",
   "layers": [
     {
       "id": "background",

diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_bright_vector_source.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_bright_vector_source.json
@@ -1,6 +1,6 @@
 {
   "tiles": [
-    "https://tiles.maps.elastic.co/data/v3/{z}/{x}/{y}.pbf"
+    "/data/v3/{z}/{x}/{y}.pbf"
   ],
   "name": "OpenMapTiles",
   "format": "pbf",

diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_dark.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_dark.json
@@ -7,6 +7,6 @@
   "bounds": [-180, -85.0511, 180, 85.0511],
   "format": "png",
   "type": "baselayer",
-  "tiles": ["https://raster-style.foobar/styles/dark-matter/{z}/{x}/{y}.png"],
+  "tiles": ["/raster/styles/dark-matter/{z}/{x}/{y}.png"],
   "center": [0, 0, 2]
 }
diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_desaturated.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_style_desaturated.json
@@ -7,6 +7,6 @@
   "bounds": [-180, -85.0511, 180, 85.0511],
   "format": "png",
   "type": "baselayer",
-  "tiles": ["https://raster-style.foobar/styles/osm-bright-desaturated/{z}/{x}/{y}.png"],
+  "tiles": ["/raster/styles/osm-bright-desaturated/{z}/{x}/{y}.png"],
   "center": [0, 0, 2]
 }
diff --git a/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_tiles.json b/src/legacy/ui/public/vis/__tests__/map/ems_mocks/sample_tiles.json
@@ -19,12 +19,12 @@
         {
           "locale": "en",
           "format": "vector",
-          "url": "https://vector-style.foobar/styles/osm-bright/style.json"
+          "url": "/v7.6/styles/osm-bright/style.json"
         },
         {
           "locale": "en",
           "format": "raster",
-          "url": "https://raster-style.foobar/styles/osm-bright.json"
+          "url": "/v7.6/styles/osm-bright.json"
         }
       ]
     },
@@ -47,12 +47,12 @@
         {
           "locale": "en",
           "format": "vector",
-          "url": "https://vector-style.foobar/styles/osm-bright-desaturated/style.json"
+          "url": "/v7.6/styles/osm-bright-desaturated/style.json"
         },
         {
           "locale": "en",
           "format": "raster",
-          "url": "https://raster-style.foobar/styles/osm-bright-desaturated.json"
+          "url": "/v7.6/styles/osm-bright-desaturated.json"
         }
       ]
     },
@@ -75,12 +75,12 @@
         {
           "locale": "en",
           "format": "vector",
-          "url": "https://vector-style.foobar/styles/dark-matter/style.json"
+          "url": "/v7.6/styles/dark-matter/style.json"
         },
         {
           "locale": "en",
           "format": "raster",
-          "url": "https://raster-style.foobar/styles/dark-matter.json"
+          "url": "/v7.6/styles/dark-matter.json"
         }
       ]
     }