From bbcbc11412fa49327c3b1d219593d2380dfa2e97 Mon Sep 17 00:00:00 2001 From: Katerina Patticha Date: Thu, 13 Jul 2023 15:31:08 +0200 Subject: [PATCH 01/40] [SharedUxChromeNavigation] Set iconSize for the nav group to medium (#161632) ## Summary The default iconsSize is large which is too big. According to mockups the icon should be 16px ### Before ![Screenshot 2023-07-11 at 11 47 13](https://github.com/elastic/kibana/assets/3369346/e07b66fe-f6a3-4a8a-b210-c05af8fe1e89) ![Screenshot 2023-07-11 at 12 08 23](https://github.com/elastic/kibana/assets/3369346/5120ea1a-bf31-4c36-a5e9-fac919c6c154) ### After ![Screenshot 2023-07-11 at 11 48 19](https://github.com/elastic/kibana/assets/3369346/3fbaa4ce-1ee8-44a2-a4a9-877fac242a70) ![Screenshot 2023-07-11 at 12 08 57](https://github.com/elastic/kibana/assets/3369346/493f688a-7ade-45a7-8206-ca8e30eb3455) Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../navigation/src/ui/components/navigation_section_ui.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/shared-ux/chrome/navigation/src/ui/components/navigation_section_ui.tsx b/packages/shared-ux/chrome/navigation/src/ui/components/navigation_section_ui.tsx index 12a4605d4837a..06be447ba2a65 100644 --- a/packages/shared-ux/chrome/navigation/src/ui/components/navigation_section_ui.tsx +++ b/packages/shared-ux/chrome/navigation/src/ui/components/navigation_section_ui.tsx @@ -124,6 +124,7 @@ export const NavigationSectionUI: FC = ({ navNode, items = [] }) => { id={id} title={title} iconType={icon} + iconSize={'m'} isCollapsible={true} initialIsOpen={isActive} onToggle={(isOpen) => { From 9d76fe3027c6c38fb3bd91cb281c16f49881c330 Mon Sep 17 00:00:00 2001 From: Stratoula Kalafateli Date: Thu, 13 Jul 2023 16:38:27 +0300 Subject: [PATCH 02/40] Fixes wrong safe guard (#161843) ## Summary Closes https://github.com/elastic/kibana/issues/161358 --- .../public/components/heatmap_component.tsx | 4 ++-- src/plugins/charts/public/services/palettes/helpers.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx index 94d8b582d02c6..ab70211361e46 100644 --- a/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx +++ b/src/plugins/chart_expressions/expression_heatmap/public/components/heatmap_component.tsx @@ -95,8 +95,8 @@ function shiftAndNormalizeStops( if (params.range === 'percent') { result = min + ((max - min) * value) / 100; } - // for a range of 1 value the formulas above will divide by 0, so here's a safety guard - if (Number.isNaN(result)) { + // a division by zero safeguard + if (!Number.isFinite(result)) { return 1; } return Number(result.toFixed(2)); diff --git a/src/plugins/charts/public/services/palettes/helpers.ts b/src/plugins/charts/public/services/palettes/helpers.ts index 7f687780c5dd4..22631822c4b02 100644 --- a/src/plugins/charts/public/services/palettes/helpers.ts +++ b/src/plugins/charts/public/services/palettes/helpers.ts @@ -54,8 +54,8 @@ function getNormalizedValueByRange( if (range === 'percent') { result = (100 * (value - minMax.min)) / (minMax.max - minMax.min); - // for a range of 1 value the formulas above will divide by 0, so here's a safety guard - if (Number.isNaN(result)) { + // a division by zero safeguard is required if the range above has equal boundaries + if (!Number.isFinite(result)) { return rangeMin; } } From 3c46440e94ad8ceba433cb8eee607fa9e8ef0d9c Mon Sep 17 00:00:00 2001 From: Stratoula Kalafateli Date: Thu, 13 Jul 2023 16:38:41 +0300 Subject: [PATCH 03/40] [TSVB] Removes unused type (#161844) ## Summary Closes https://github.com/elastic/kibana/issues/161019 Cleanups unused type --- src/plugins/vis_types/timeseries/common/types/panel_model.ts | 1 - .../timeseries/public/convert_to_lens/lib/__mocks__/index.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/plugins/vis_types/timeseries/common/types/panel_model.ts b/src/plugins/vis_types/timeseries/common/types/panel_model.ts index cddf9188b2ce3..a61d50f306862 100644 --- a/src/plugins/vis_types/timeseries/common/types/panel_model.ts +++ b/src/plugins/vis_types/timeseries/common/types/panel_model.ts @@ -102,7 +102,6 @@ export interface Series { }; point_size?: number; separate_axis: number; - seperate_axis: number; series_drop_last_bucket: number; series_index_pattern: IndexPatternValue; series_interval?: string; diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/__mocks__/index.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/__mocks__/index.ts index d1cf412ade45c..3ed242d2bcdcb 100644 --- a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/__mocks__/index.ts +++ b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/__mocks__/index.ts @@ -28,7 +28,6 @@ export const createSeries = (partialSeries?: Partial): Series => ({ stacked: 'none', time_range_mode: 'entire_time_range', value_template: '{{value}}', - seperate_axis: 0, series_index_pattern: { id: 'test' }, series_max_bars: 0, steps: 0, From 61590efbdca8bd0daed457cbf1668f1643341ade Mon Sep 17 00:00:00 2001 From: David Kilfoyle <41695641+kilfoyle@users.noreply.github.com> Date: Thu, 13 Jul 2023 10:03:58 -0400 Subject: [PATCH 04/40] [backport] [main] [161313] Adding 161249 to known issues for 8.8.x (#161762) Manual backport of #161313 to main (my second ever forward-port) Co-authored-by: Pius --- docs/CHANGELOG.asciidoc | 83 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc index 52674816fbcaa..156a8f0254dd3 100644 --- a/docs/CHANGELOG.asciidoc +++ b/docs/CHANGELOG.asciidoc @@ -49,6 +49,36 @@ Review important information about the {kib} 8.x releases. Review the following information about the {kib} 8.8.2 release. +[float] +[[known-issues-8.8.2]] +=== Known issues + +// tag::known-issue-161249[] +[discrete] +.Kibana can run out of memory during an upgrade when there are many {fleet} agent policies. +[%collapsible] +==== +*Details* + +Due to a schema version update, during {fleet} setup in 8.8.x, all agent policies are being queried and deployed. +This action triggers a lot of queries to the Elastic Package Registry (EPR) to fetch integration packages. As a result, +there is an increase in Kibana's resident memory usage (RSS). + +*Impact* + +Because the default batch size of `100` for schema version upgrade of {fleet} agent policies is too high, this can +cause Kibana to run out of memory during an upgrade. For example, we have observed 1GB Kibana instances run +out of memory during an upgrade when there were 20 agent policies with 5 integrations in each. + +*Workaround* + +Two workaround options are available: + +* Increase the Kibana instance size to 2GB. So far, we are not able to reproduce the issue with 2GB instances. +* Set `xpack.fleet.setup.agentPolicySchemaUpgradeBatchSize` to `2` in the `kibana.yml` and restart the Kibana instance(s). + +In 8.9.0, we are addressing this by changing the default batch size to `2`. + +==== +// end::known-issue-161249[] + [float] [[fixes-v8.8.2]] === Bug Fixes @@ -106,6 +136,32 @@ Review the following information about the {kib} 8.8.1 release. [[known-issues-8.8.1]] === Known issues +// tag::known-issue-161249[] +[discrete] +.Kibana can run out of memory during an upgrade when there are many {fleet} agent policies. +[%collapsible] +==== +*Details* + +Due to a schema version update, during {fleet} setup in 8.8.x, all agent policies are being queried and deployed. +This action triggers a lot of queries to the Elastic Package Registry (EPR) to fetch integration packages. As a result, +there is an increase in Kibana's resident memory usage (RSS). + +*Impact* + +Because the default batch size of `100` for schema version upgrade of {fleet} agent policies is too high, this can +cause Kibana to run out of memory during an upgrade. For example, we have observed 1GB Kibana instances run +out of memory during an upgrade when there were 20 agent policies with 5 integrations in each. + +*Workaround* + +Two workaround options are available: + +* Increase the Kibana instance size to 2GB. So far, we are not able to reproduce the issue with 2GB instances. +* Set `xpack.fleet.setup.agentPolicySchemaUpgradeBatchSize` to `2` in the `kibana.yml` and restart the Kibana instance(s). + +In 8.9.0, we are addressing this by changing the default batch size to `2`. + +==== +// end::known-issue-161249[] + // tag::known-issue-159807[] [discrete] .Memory leak in {fleet} audit logging. @@ -198,6 +254,32 @@ Review the following information about the {kib} 8.8.0 release. [[known-issues-8.8.0]] === Known issues +// tag::known-issue-161249[] +[discrete] +.Kibana can run out of memory during an upgrade when there are many {fleet} agent policies. +[%collapsible] +==== +*Details* + +Due to a schema version update, during {fleet} setup in 8.8.x, all agent policies are being queried and deployed. +This action triggers a lot of queries to the Elastic Package Registry (EPR) to fetch integration packages. As a result, +there is an increase in Kibana's resident memory usage (RSS). + +*Impact* + +Because the default batch size of `100` for schema version upgrade of {fleet} agent policies is too high, this can +cause Kibana to run out of memory during an upgrade. For example, we have observed 1GB Kibana instances run +out of memory during an upgrade when there were 20 agent policies with 5 integrations in each. + +*Workaround* + +Two workaround options are available: + +* Increase the Kibana instance size to 2GB. So far, we are not able to reproduce the issue with 2GB instances. +* Set `xpack.fleet.setup.agentPolicySchemaUpgradeBatchSize` to `2` in the `kibana.yml` and restart the Kibana instance(s). + +In 8.9.0, we are addressing this by changing the default batch size to `2`. + +==== +// end::known-issue-161249[] + // tag::known-issue-158940[] [discrete] .Failed upgrades to 8.8.0 can cause bootlooping and data loss @@ -221,6 +303,7 @@ The 8.8.1 release includes in {kibana-pull}158940[a fix] for this problem. Custo *Details* + {fleet} introduced audit logging for various CRUD (create, read, update, and delete) operations in version 8.8.0. While audit logging is not enabled by default, we have identified an off-heap memory leak in the implementation of {fleet} audit logging that can result in poor {kib} performance, and in some cases {kib} instances being terminated by the OS kernel's oom-killer. This memory leak can occur even when {kib} audit logging is not explicitly enabled (regardless of whether `xpack.security.audit.enabled` is set in the `kibana.yml` settings file). + *Impact* + The version 8.8.2 release includes in {kibana-pull}159807[a fix] for this problem. If you are using {fleet} integrations and {kib} audit logging in version 8.8.0 or 8.8.1, you should upgrade to 8.8.2 or above to obtain the fix. From 9509425349e41f5becadd0cab0c9ef3a6b4f1fc8 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Thu, 13 Jul 2023 08:22:15 -0600 Subject: [PATCH 05/40] [Maps] update to maplibre 3.1.0 (#161032) maplibre change log https://github.com/maplibre/maplibre-gl-js/blob/main/CHANGELOG.md#310 Breaking changes that required fixes * 3.0.0 Remove "mapbox-gl-supported" package from API. If needed, please reference it directly instead of going through MapLibre. (https://github.com/maplibre/maplibre-gl-js/pull/2451) * 3.0.0 Resize map when container element is resized. The "resize"-related events now has different data associated with it (https://github.com/maplibre/maplibre-gl-js/pull/2157, https://github.com/maplibre/maplibre-gl-js/issues/2551). Previously the originalEvent field was the reason of this change, for example it could be a resize event from the browser. Now it is ResizeObserverEntry, see more [here](https://developer.mozilla.org/en-US/docs/web/api/resizeobserverentry). * 2.2.0 Improve filter specification typings (https://github.com/maplibre/maplibre-gl-js/pull/1390) --------- Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- package.json | 3 +- .../vega_map_view/vega_map_view.scss | 2 +- .../mvt_vector_layer/mvt_vector_layer.tsx | 2 +- .../vector/components/symbol/icon_preview.tsx | 18 +- .../classes/util/mb_filter_expressions.ts | 4 +- .../draw_feature_control.tsx | 4 +- .../connected_components/mb_map/mb_map.tsx | 19 +-- .../tile_status_tracker.tsx | 1 - .../__snapshots__/embedded_map.test.tsx.snap | 2 +- .../visitor_breakdown_map/embedded_map.tsx | 2 +- yarn.lock | 159 +++++++++++++----- 11 files changed, 127 insertions(+), 89 deletions(-) diff --git a/package.json b/package.json index a6fe03d4ab479..88c4458833292 100644 --- a/package.json +++ b/package.json @@ -756,6 +756,7 @@ "@mapbox/geojson-rewind": "^0.5.0", "@mapbox/mapbox-gl-draw": "1.3.0", "@mapbox/mapbox-gl-rtl-text": "0.2.3", + "@mapbox/mapbox-gl-supported": "2.0.1", "@mapbox/vector-tile": "1.3.1", "@opentelemetry/api": "^1.1.0", "@opentelemetry/api-metrics": "^0.31.0", @@ -878,7 +879,7 @@ "luxon": "^2.5.2", "lz-string": "^1.4.4", "mapbox-gl-draw-rectangle-mode": "1.0.4", - "maplibre-gl": "2.1.9", + "maplibre-gl": "3.1.0", "markdown-it": "^12.3.2", "md5": "^2.1.0", "mdast-util-to-hast": "10.0.1", diff --git a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/vega_map_view.scss b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/vega_map_view.scss index 3e3ef71faf0d7..719404e6d1429 100644 --- a/src/plugins/vis_types/vega/public/vega_view/vega_map_view/vega_map_view.scss +++ b/src/plugins/vis_types/vega/public/vega_view/vega_map_view/vega_map_view.scss @@ -1,5 +1,5 @@ .vgaVis { - .mapboxgl-canvas-container { + .maplibregl-canvas-container { cursor: auto; } } diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx index 208e8c4acdb07..670ec35a18983 100644 --- a/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx +++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/mvt_vector_layer/mvt_vector_layer.tsx @@ -336,7 +336,7 @@ export class MvtVectorLayer extends AbstractVectorLayer { // When there are no join results, return a filter that hides all features // work around for 'match' with empty array not filtering out features // This filter always returns false because features will never have `__kbn_never_prop__` property - const hideAllFilter = ['has', '__kbn_never_prop__']; + const hideAllFilter = ['has', '__kbn_never_prop__'] as FilterSpecification; if (!joinPropertiesMap) { return hideAllFilter; diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx index cc7dc0dd9b316..1f18a810041fe 100644 --- a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx +++ b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_preview.tsx @@ -18,7 +18,6 @@ import { } from '@elastic/eui'; import { maplibregl, Map as MapboxMap } from '@kbn/mapbox-gl'; import { i18n } from '@kbn/i18n'; -import { ResizeChecker } from '@kbn/kibana-utils-plugin/public'; import { CUSTOM_ICON_PIXEL_RATIO, createSdfIcon } from '../../symbol_utils'; export interface Props { @@ -35,7 +34,6 @@ interface State { export class IconPreview extends Component { static iconId = `iconPreview`; - private _checker?: ResizeChecker; private _isMounted = false; private _containerRef: HTMLDivElement | null = null; @@ -61,9 +59,6 @@ export class IconPreview extends Component { componentWillUnmount() { this._isMounted = false; - if (this._checker) { - this._checker.destroy(); - } if (this.state.map) { this.state.map.remove(); this.state.map = null; @@ -115,15 +110,6 @@ export class IconPreview extends Component { map.setLayoutProperty('icon-layer', 'icon-size', 12); } - _initResizerChecker() { - this._checker = new ResizeChecker(this._containerRef!); - this._checker.on('resize', () => { - if (this.state.map) { - this.state.map.resize(); - } - }); - } - _createMapInstance(): MapboxMap { const map = new maplibregl.Map({ container: this._containerRef!, @@ -171,9 +157,7 @@ export class IconPreview extends Component { _initializeMap() { const map: MapboxMap = this._createMapInstance(); - this.setState({ map }, () => { - this._initResizerChecker(); - }); + this.setState({ map }); } render() { diff --git a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts index a86ca84901cd9..7ffc2955a79a6 100644 --- a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts +++ b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts @@ -46,7 +46,7 @@ function getFilterExpression( ]); } - return ['all', ...allFilters]; + return ['all', ...allFilters] as FilterSpecification; } export function getFillFilterExpression( @@ -91,7 +91,7 @@ const IS_POINT_FEATURE = [ 'any', ['==', ['geometry-type'], GEO_JSON_TYPE.POINT], ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POINT], -]; +] as FilterSpecification; export function getPointFilterExpression( isSourceGeoJson: boolean, diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx index df70d4b7cfd9b..76e0241ef5622 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx +++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_feature_control/draw_feature_control.tsx @@ -12,7 +12,7 @@ import { Feature, Geometry, Position } from 'geojson'; import { i18n } from '@kbn/i18n'; // @ts-expect-error import * as jsts from 'jsts'; -import type { Map as MbMap, MapMouseEvent, PointLike } from '@kbn/mapbox-gl'; +import type { FilterSpecification, Map as MbMap, MapMouseEvent, PointLike } from '@kbn/mapbox-gl'; import { getToasts } from '../../../../kibana_services'; import { DrawControl } from '../draw_control'; import { DRAW_MODE, DRAW_SHAPE } from '../../../../../common/constants'; @@ -105,7 +105,7 @@ export class DrawFeatureControl extends Component { ] as [PointLike, PointLike]; const selectedFeatures = this.props.mbMap.queryRenderedFeatures(mbBbox, { layers: mbEditLayerIds, - filter: ['all', EXCLUDE_CENTROID_FEATURES], + filter: ['all', EXCLUDE_CENTROID_FEATURES] as FilterSpecification, }); if (!selectedFeatures.length) { return; diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx index 84f2ec12f29c4..5c71696cb280b 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx +++ b/x-pack/plugins/maps/public/connected_components/mb_map/mb_map.tsx @@ -7,12 +7,12 @@ import _ from 'lodash'; import React, { Component } from 'react'; +import { supported as maplibreglSupported } from '@mapbox/mapbox-gl-supported'; import { Adapters } from '@kbn/inspector-plugin/public'; import { Filter } from '@kbn/es-query'; import { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public'; import { maplibregl } from '@kbn/mapbox-gl'; import type { Map as MapboxMap, MapOptions, MapMouseEvent } from '@kbn/mapbox-gl'; -import { ResizeChecker } from '@kbn/kibana-utils-plugin/public'; import { METRIC_TYPE } from '@kbn/analytics'; import { DrawFilterControl } from './draw_control/draw_filter_control'; import { ScaleControl } from './scale_control'; @@ -85,7 +85,6 @@ interface State { } export class MbMap extends Component { - private _checker?: ResizeChecker; private _isMounted: boolean = false; private _containerRef: HTMLDivElement | null = null; private _prevCustomIcons?: CustomIcon[]; @@ -110,9 +109,6 @@ export class MbMap extends Component { componentWillUnmount() { this._isMounted = false; - if (this._checker) { - this._checker.destroy(); - } if (this.state.mbMap) { this.state.mbMap.remove(); this.state.mbMap = undefined; @@ -239,7 +235,6 @@ export class MbMap extends Component { this.setState({ mbMap }, () => { this._loadMakiSprites(mbMap); - this._initResizerChecker(); this._registerMapEventListeners(mbMap); this.props.onMapReady(this._getMapExtentState()); }); @@ -284,19 +279,11 @@ export class MbMap extends Component { } } - _initResizerChecker() { - this.state.mbMap?.resize(); // ensure map is sized for container prior to monitoring - this._checker = new ResizeChecker(this._containerRef!); - this._checker.on('resize', () => { - this.state.mbMap?.resize(); - }); - } - _reportUsage() { const usageCollector = getUsageCollection(); if (!usageCollector) return; - const webglSupport = maplibregl.supported(); + const webglSupport = maplibreglSupported(); usageCollector.reportUiCounter( APP_ID, @@ -305,7 +292,7 @@ export class MbMap extends Component { ); // Report low system performance or no hardware GPU - if (webglSupport && !maplibregl.supported({ failIfMajorPerformanceCaveat: true })) { + if (webglSupport && !maplibreglSupported({ failIfMajorPerformanceCaveat: true })) { usageCollector.reportUiCounter(APP_ID, METRIC_TYPE.LOADED, 'gl_majorPerformanceCaveat'); } } diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker/tile_status_tracker.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker/tile_status_tracker.tsx index ce23768477993..65ff1b8fc623f 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker/tile_status_tracker.tsx +++ b/x-pack/plugins/maps/public/connected_components/mb_map/tile_status_tracker/tile_status_tracker.tsx @@ -237,7 +237,6 @@ export class TileStatusTracker extends Component { // Tile meta will never have duplicated features since by their nature, tile meta is a feature contained within a single tile const mbFeatures = this.props.mbMap.querySourceFeatures(layer.getMbSourceId(), { sourceLayer: ES_MVT_META_LAYER_NAME, - filter: [], }); const features = mbFeatures diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/__snapshots__/embedded_map.test.tsx.snap b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/__snapshots__/embedded_map.test.tsx.snap index 70929d04d0548..06eea601e4365 100644 --- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/__snapshots__/embedded_map.test.tsx.snap +++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/__snapshots__/embedded_map.test.tsx.snap @@ -29,7 +29,7 @@ exports[`Embedded Map it renders 1`] = ` min-height: 0; } -.c0.c0.c0 .mapboxgl-canvas { +.c0.c0.c0 .maplibregl-canvas { -webkit-animation: none !important; animation: none !important; } diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx index 219eb75494068..7cfff20dfb5cb 100644 --- a/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx +++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/visitor_breakdown_map/embedded_map.tsx @@ -36,7 +36,7 @@ const EmbeddedPanel = styled.div` z-index: 1; min-height: 0; // Absolute must for Firefox to scroll contents } - &&& .mapboxgl-canvas { + &&& .maplibregl-canvas { animation: none !important; } `; diff --git a/yarn.lock b/yarn.lock index ac8fd62ea9dcb..0a728423b3105 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5973,7 +5973,7 @@ resolved "https://registry.yarnpkg.com/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz#1da1e6b3a7add3ad29909b30f438f60581b7cd80" integrity sha1-HaHms6et060pkJsw9Dj2BYG3zYA= -"@mapbox/geojson-rewind@^0.5.0", "@mapbox/geojson-rewind@^0.5.1": +"@mapbox/geojson-rewind@^0.5.0": version "0.5.1" resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz#adbe16dc683eb40e90934c51a5e28c7bbf44f4e1" integrity sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA== @@ -5981,6 +5981,14 @@ get-stream "^6.0.1" minimist "^1.2.5" +"@mapbox/geojson-rewind@^0.5.2": + version "0.5.2" + resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" + integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA== + dependencies: + get-stream "^6.0.1" + minimist "^1.2.6" + "@mapbox/hast-util-table-cell-style@^0.1.3": version "0.1.3" resolved "https://registry.yarnpkg.com/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz#5b7166ae01297d72216932b245e4b2f0b642dca6" @@ -5988,7 +5996,7 @@ dependencies: unist-util-visit "^1.3.0" -"@mapbox/jsonlint-lines-primitives@^2.0.2": +"@mapbox/jsonlint-lines-primitives@^2.0.2", "@mapbox/jsonlint-lines-primitives@~2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" integrity sha1-zlblOfg1UrWNENZy6k1vya3HsjQ= @@ -6011,7 +6019,7 @@ resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-rtl-text/-/mapbox-gl-rtl-text-0.2.3.tgz#a26ecfb3f0061456d93ee8570dd9587d226ea8bd" integrity sha512-RaCYfnxULUUUxNwcUimV9C/o2295ktTyLEUzD/+VWkqXqvaVfFcZ5slytGzb2Sd/Jj4MlbxD0DCZbfa6CzcmMw== -"@mapbox/mapbox-gl-supported@^2.0.1": +"@mapbox/mapbox-gl-supported@2.0.1": version "2.0.1" resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz#c15367178d8bfe4765e6b47b542fe821ce259c7b" integrity sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ== @@ -6021,10 +6029,10 @@ resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2" integrity sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI= -"@mapbox/tiny-sdf@^2.0.4": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz#cdba698d3d65087643130f9af43a2b622ce0b372" - integrity sha512-OhXt2lS//WpLdkqrzo/KwB7SRD8AiNTFFzuo9n14IBupzIMa67yGItcK7I2W9D8Ghpa4T04Sw9FWsKCJG50Bxw== +"@mapbox/tiny-sdf@^2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz#9a1d33e5018093e88f6a4df2343e886056287282" + integrity sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA== "@mapbox/unitbezier@^0.0.1": version "0.0.1" @@ -6043,6 +6051,20 @@ resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== +"@maplibre/maplibre-gl-style-spec@^19.2.1": + version "19.2.1" + resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.2.1.tgz#eb78211151b93f4f9c0cf6cb908133dab7a438dd" + integrity sha512-ZVT5QlkVhlxlPav+ca0NO3Moc7EzbHDO2FXW4ic3Q0Vm+TDUw9I8A2EBws7xUUQZf7HQB3kQ+3Jsh5mFLRD4GQ== + dependencies: + "@mapbox/jsonlint-lines-primitives" "~2.0.2" + "@mapbox/point-geometry" "^0.1.0" + "@mapbox/unitbezier" "^0.0.1" + "@types/mapbox__point-geometry" "^0.1.2" + json-stringify-pretty-compact "^3.0.0" + minimist "^1.2.8" + rw "^1.3.3" + sort-object "^3.0.3" + "@math.gl/core@3.5.6": version "3.5.6" resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-3.5.6.tgz#d849db978d7d4a4984bb63868adc693975d97ce7" @@ -8471,7 +8493,7 @@ dependencies: "@types/node" "*" -"@types/geojson@*", "@types/geojson@^7946.0.10", "@types/geojson@^7946.0.8": +"@types/geojson@*", "@types/geojson@^7946.0.10": version "7946.0.10" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA== @@ -11806,6 +11828,21 @@ bytesish@^0.4.1: resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6" integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ== +bytewise-core@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/bytewise-core/-/bytewise-core-1.2.3.tgz#3fb410c7e91558eb1ab22a82834577aa6bd61d42" + integrity sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA== + dependencies: + typewise-core "^1.2" + +bytewise@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/bytewise/-/bytewise-1.1.0.tgz#1d13cbff717ae7158094aa881b35d081b387253e" + integrity sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ== + dependencies: + bytewise-core "^1.2.2" + typewise "^1.0.3" + cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -13221,11 +13258,6 @@ css@2.X, css@^2.2.1, css@^2.2.4: source-map-resolve "^0.5.2" urix "^0.1.0" -csscolorparser@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b" - integrity sha1-s085HupNqPPpgjHizNjfnAQfFxs= - cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -14514,10 +14546,10 @@ duplexify@^3.4.2, duplexify@^3.5.3: readable-stream "^2.0.0" stream-shift "^1.0.0" -earcut@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.3.tgz#d44ced2ff5a18859568e327dd9c7d46b16f55cf4" - integrity sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug== +earcut@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" + integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== ecc-jsbn@~0.1.1: version "0.1.2" @@ -16788,7 +16820,7 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -get-value@^2.0.3, get-value@^2.0.6: +get-value@^2.0.2, get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= @@ -19873,7 +19905,7 @@ json-stringify-pretty-compact@1.2.0: resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-1.2.0.tgz#0bc316b5e6831c07041fc35612487fb4e9ab98b8" integrity sha512-/11Pj1OyX814QMKO7K8l85SHPTr/KsFxHp8GE2zVa0BtJgGimDjXHfM3FhC7keQdWDea7+nXf+f1de7ATZcZkQ== -json-stringify-pretty-compact@~3.0.0: +json-stringify-pretty-compact@^3.0.0, json-stringify-pretty-compact@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz#f71ef9d82ef16483a407869556588e91b681d9ab" integrity sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA== @@ -20016,10 +20048,10 @@ jws@^3.2.2: jwa "^1.4.1" safe-buffer "^5.0.1" -kdbush@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0" - integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew== +kdbush@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-4.0.2.tgz#2f7b7246328b4657dd122b6c7f025fbc2c868e39" + integrity sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA== kea@^2.4.2: version "2.4.2" @@ -20877,32 +20909,33 @@ mapcap@^1.0.0: resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a" integrity sha512-KcNlZSlFPx+r1jYZmxEbTVymG+dIctf10WmWkuhrhrblM+KMoF77HelwihL5cxYlORye79KoR4IlOOk99lUJ0g== -maplibre-gl@2.1.9: - version "2.1.9" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-2.1.9.tgz#042f3ef4224fa890ecf7a410145243f1fc943dcd" - integrity sha512-pnWJmILeZpgA5QSI7K7xFK3yrkyYTd9srw3fCi2Ca52Phm78hsznPwUErEQcZLfxXKn/1h9t8IPdj0TH0NBNbg== +maplibre-gl@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-3.1.0.tgz#68e73461f994f0d44378b121e026688962b5492f" + integrity sha512-KFarVUUszCEucPwnGsFJtPMQBg/F6lg+SPDmTztKUD/n0YShETjIOdNmm5jpxacEX3+dq50MzlqDr6VH+RtDDA== dependencies: - "@mapbox/geojson-rewind" "^0.5.1" + "@mapbox/geojson-rewind" "^0.5.2" "@mapbox/jsonlint-lines-primitives" "^2.0.2" - "@mapbox/mapbox-gl-supported" "^2.0.1" "@mapbox/point-geometry" "^0.1.0" - "@mapbox/tiny-sdf" "^2.0.4" + "@mapbox/tiny-sdf" "^2.0.6" "@mapbox/unitbezier" "^0.0.1" "@mapbox/vector-tile" "^1.3.1" "@mapbox/whoots-js" "^3.1.0" - "@types/geojson" "^7946.0.8" + "@maplibre/maplibre-gl-style-spec" "^19.2.1" + "@types/geojson" "^7946.0.10" "@types/mapbox__point-geometry" "^0.1.2" "@types/mapbox__vector-tile" "^1.3.0" "@types/pbf" "^3.0.2" - csscolorparser "~1.0.3" - earcut "^2.2.3" + earcut "^2.2.4" geojson-vt "^3.2.1" gl-matrix "^3.4.3" + global-prefix "^3.0.0" + kdbush "^4.0.2" murmurhash-js "^1.0.0" pbf "^3.2.1" - potpack "^1.0.2" + potpack "^2.0.0" quickselect "^2.0.0" - supercluster "^7.1.4" + supercluster "^8.0.1" tinyqueue "^2.0.3" vt-pbf "^3.1.3" @@ -23694,10 +23727,10 @@ postcss@^8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" -potpack@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14" - integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ== +potpack@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/potpack/-/potpack-2.0.0.tgz#61f4dd2dc4b3d5e996e3698c0ec9426d0e169104" + integrity sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw== preact-render-to-string@^5.1.19: version "5.1.19" @@ -25751,7 +25784,7 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rw@1: +rw@1, rw@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= @@ -26482,11 +26515,33 @@ sonic-boom@^3.2.0: dependencies: atomic-sleep "^1.0.0" +sort-asc@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/sort-asc/-/sort-asc-0.2.0.tgz#00a49e947bc25d510bfde2cbb8dffda9f50eb2fc" + integrity sha512-umMGhjPeHAI6YjABoSTrFp2zaBtXBej1a0yKkuMUyjjqu6FJsTF+JYwCswWDg+zJfk/5npWUUbd33HH/WLzpaA== + +sort-desc@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/sort-desc/-/sort-desc-0.2.0.tgz#280c1bdafc6577887cedbad1ed2e41c037976646" + integrity sha512-NqZqyvL4VPW+RAxxXnB8gvE1kyikh8+pR+T+CXLksVRN9eiQqkQlPwqWYU0mF9Jm7UnctShlxLyAt1CaBOTL1w== + sort-object-keys@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg== +sort-object@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/sort-object/-/sort-object-3.0.3.tgz#945727165f244af9dc596ad4c7605a8dee80c269" + integrity sha512-nK7WOY8jik6zaG9CRwZTaD5O7ETWDLZYMM12pqY8htll+7dYeqGfEUPcUBHOpSJg2vJOrvFIY2Dl5cX2ih1hAQ== + dependencies: + bytewise "^1.1.0" + get-value "^2.0.2" + is-extendable "^0.1.1" + sort-asc "^0.2.0" + sort-desc "^0.2.0" + union-value "^1.0.1" + sort-package-json@^1.53.1: version "1.53.1" resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.53.1.tgz#8f2672b06314cf04d9a6bcefc75a5f38d600b811" @@ -27295,12 +27350,12 @@ superagent@^3.8.2, superagent@^3.8.3: qs "^6.5.1" readable-stream "^2.3.5" -supercluster@^7.1.4: - version "7.1.4" - resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.4.tgz#6762aabfd985d3390b49f13b815567d5116a828a" - integrity sha512-GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g== +supercluster@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-8.0.1.tgz#9946ba123538e9e9ab15de472531f604e7372df5" + integrity sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ== dependencies: - kdbush "^3.0.0" + kdbush "^4.0.2" superjson@^1.10.0: version "1.10.1" @@ -28189,6 +28244,18 @@ typescript@4.6.3, typescript@^3.3.3333, typescript@^4.6.3, typescript@^4.8.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== +typewise-core@^1.2, typewise-core@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195" + integrity sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg== + +typewise@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/typewise/-/typewise-1.0.3.tgz#1067936540af97937cc5dcf9922486e9fa284651" + integrity sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ== + dependencies: + typewise-core "^1.2.0" + ua-parser-js@^0.7.18: version "0.7.24" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" @@ -28323,7 +28390,7 @@ unified@^9.0.0, unified@^9.2.0, unified@^9.2.1: trough "^1.0.0" vfile "^4.0.0" -union-value@^1.0.0: +union-value@^1.0.0, union-value@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== From 9e9a09cd33a88a3d36c2ecb81f175d17643d7b92 Mon Sep 17 00:00:00 2001 From: Kevin Delemme Date: Thu, 13 Jul 2023 10:29:04 -0400 Subject: [PATCH 06/40] fix(slo): timeslice objective definition (#161863) --- .../observability/docs/openapi/slo/bundled.yaml | 16 ++++++++-------- .../slo/components/schemas/objective.yaml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/x-pack/plugins/observability/docs/openapi/slo/bundled.yaml b/x-pack/plugins/observability/docs/openapi/slo/bundled.yaml index 1c6954116076d..d1a2d233328c6 100644 --- a/x-pack/plugins/observability/docs/openapi/slo/bundled.yaml +++ b/x-pack/plugins/observability/docs/openapi/slo/bundled.yaml @@ -8,17 +8,14 @@ info: license: name: Elastic License 2.0 url: https://www.elastic.co/licensing/elastic-license -servers: - - url: http://localhost:5601 - description: local -security: - - basicAuth: [] - - apiKeyAuth: [] tags: - name: slo description: SLO APIs enable you to define, manage and track service-level objectives - name: composite slo description: Composite SLO APIs enable you to define, manage and track a group of SLOs. +servers: + - url: http://localhost:5601 + description: local paths: /s/{spaceId}/api/observability/slos: post: @@ -835,11 +832,11 @@ components: description: the target objective between 0 and 1 excluded type: number example: 0.99 - timeslicesTarget: + timesliceTarget: description: the target objective for each slice when using a timeslices budgeting method type: number example: 0.995 - timeslicesWindow: + timesliceWindow: description: the duration of each slice when using a timeslices budgeting method, as {duraton}{unit} type: string example: 5m @@ -1157,3 +1154,6 @@ components: example: 0.9836 errorBudget: $ref: '#/components/schemas/error_budget' +security: + - basicAuth: [] + - apiKeyAuth: [] diff --git a/x-pack/plugins/observability/docs/openapi/slo/components/schemas/objective.yaml b/x-pack/plugins/observability/docs/openapi/slo/components/schemas/objective.yaml index e80dfb38f98c2..e0272c5a04029 100644 --- a/x-pack/plugins/observability/docs/openapi/slo/components/schemas/objective.yaml +++ b/x-pack/plugins/observability/docs/openapi/slo/components/schemas/objective.yaml @@ -8,11 +8,11 @@ properties: description: the target objective between 0 and 1 excluded type: number example: 0.99 - timeslicesTarget: + timesliceTarget: description: the target objective for each slice when using a timeslices budgeting method type: number example: 0.995 - timeslicesWindow: + timesliceWindow: description: the duration of each slice when using a timeslices budgeting method, as {duraton}{unit} type: string example: 5m From b9eae62b5d39126a31e1f285e47387438cb77461 Mon Sep 17 00:00:00 2001 From: Cee Chen <549407+cee-chen@users.noreply.github.com> Date: Thu, 13 Jul 2023 07:41:17 -0700 Subject: [PATCH 07/40] Order Emotion styles before Sass styles (#161592) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary fixes https://github.com/elastic/kibana/issues/161441 fixes https://github.com/elastic/kibana/issues/161464 The recent `EuiButtonEmpty`/`EuiButtonIcon` Emotion conversions have highlighted a CSS order/specificity flaw in Kibana compared to EUI - EUI orders its Sass _after_ its Emotion styles (see https://elastic.github.io/eui/#/), and Kibana orders Sass _before_ Emotion styles. I'm not totally sure why Greg set up Kibana's style order the way he did in https://github.com/elastic/kibana/pull/134919, but at this point, EUI has enough of its baseline atom components converted to Emotion that remaining components in Sass are all generally molecules or higher level components that need to come after Emotion. ### QA - [x] Test as many pages in Kibana as possible to ensure no visual regressions 🤞 --------- Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../core-rendering-server-internal/src/views/template.tsx | 2 +- packages/kbn-storybook/templates/index.ejs | 3 +-- .../unified_histogram/public/panels/panels_resizable.tsx | 6 ++++-- .../change_point_detection/change_points_table.tsx | 6 +++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx b/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx index bbc8109e403da..bac48c88e1b23 100644 --- a/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx +++ b/packages/core/rendering/core-rendering-server-internal/src/views/template.tsx @@ -54,8 +54,8 @@ export const Template: FunctionComponent = ({ {/* Inject EUI reset and global styles before all other component styles */} - + {/* Inject stylesheets into the before scripts so that KP plugins with bundled styles will override them */} diff --git a/packages/kbn-storybook/templates/index.ejs b/packages/kbn-storybook/templates/index.ejs index e8d8d4d6df09d..b52fc548b814b 100644 --- a/packages/kbn-storybook/templates/index.ejs +++ b/packages/kbn-storybook/templates/index.ejs @@ -15,6 +15,7 @@ +