Merge branch '7.17' into backport/7.17/pr-193107

Author: kc13greiner

.github/workflows/on-merge.yml

@@ -24,7 +24,7 @@ jobs:
       )
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           repository: 'elastic/kibana-github-actions'
           ref: main

package.json

@@ -322,7 +322,7 @@
     "prop-types": "^15.7.2",
     "proxy-from-env": "1.0.0",
     "puid": "1.0.7",
-    "puppeteer": "22.13.1",
+    "puppeteer": "23.3.1",
     "query-string": "^6.13.2",
     "random-word-slugs": "^0.0.5",
     "raw-loader": "^3.1.0",

packages/kbn-screenshotting-server/src/paths.ts

@@ -45,10 +45,10 @@ export class ChromiumArchivePaths {
       platform: 'darwin',
       architecture: 'x64',
       archiveFilename: 'chrome-mac.zip',
-      archiveChecksum: 'fa8004f3c8c5574c089c901e48429d1b01720bf3dd25e05ac56c41d0ab470c10',
-      binaryChecksum: '56f25cb6881e5c2b1aac0d8e87630517d1af8effdc9319d35f872add048df1ca',
+      archiveChecksum: '0a3d18efd00b3406f66139a673616b4b2b4b00323776678cb82295996f5a6733',
+      binaryChecksum: '8bcdaa973ee11110f6b70eaac2418fda3bb64446cf37f964fce331cdc8907a20',
       binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
-      revision: 1300317, // 1300313 is not available for Mac_x64
+      revision: 1331485, // 1331488 is not available for Mac_x64
       location: 'common',
       archivePath: 'Mac',
       isPreInstalled: false,
@@ -57,44 +57,44 @@ export class ChromiumArchivePaths {
       platform: 'darwin',
       architecture: 'arm64',
       archiveFilename: 'chrome-mac.zip',
-      archiveChecksum: 'bea49fd3ccd6aaccd7cdc4df38306f002a2934aaa2c044f3b5a3272b31ec77ca',
-      binaryChecksum: '4c55d9e47deb1179c377c9785afdcdb5f3d3f351bff62b414d43e32ff195bd55',
+      archiveChecksum: '426eddf16acb88b9446a91de53cc4364c7d487414248f33e30f68cf488cea0c0',
+      binaryChecksum: '827931739bfdd2b6790a81d5ade8886c159cd051581d79b84d1ede447293e9cf',
       binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
-      revision: 1300314, // 1300313 is not available for Mac_Arm
+      revision: 1331488,
       location: 'common',
       archivePath: 'Mac_Arm',
       isPreInstalled: false,
     },
     {
       platform: 'linux',
       architecture: 'x64',
-      archiveFilename: 'chromium-5b5d829-locales-linux_x64.zip',
-      archiveChecksum: '799e8fd5f47ea70b8a3972d39b2617c9cbebc7fc433a89251dae312a7c77534b',
-      binaryChecksum: '216b8f7ff9b41e985397342c2df54e4f8e07a01a3b8a929f39b9a10931d26ff5',
+      archiveFilename: 'chromium-fe621c5-locales-linux_x64.zip',
+      archiveChecksum: '12ce2e0eac184072dfcbc7a267328e3eb7fbe10a682997f4111c0378f2397341',
+      binaryChecksum: '670481cfa8db209401106cd23051009d390c03608724d0822a12c8c0a92b4c25',
       binaryRelativePath: 'headless_shell-linux_x64/headless_shell',
-      revision: 1300313,
+      revision: 1331488,
       location: 'custom',
       isPreInstalled: true,
     },
     {
       platform: 'linux',
       architecture: 'arm64',
-      archiveFilename: 'chromium-5b5d829-locales-linux_arm64.zip',
-      archiveChecksum: '961e20c45c61f8e948efdc4128bb17c23217bbcb28537f270ccf5bf0826981e7',
-      binaryChecksum: 'fc4027fb6b1c96bef9374d5d9f791097fae2ec2ddc4e0134167075bd52d1458f',
+      archiveFilename: 'chromium-fe621c5-locales-linux_arm64.zip',
+      archiveChecksum: 'f7333eaff5235046c8775f0c1a0b7395b7ebc2e054ea638710cf511c4b6f9daf',
+      binaryChecksum: '8a3a3371b3d04f4b0880b137a3611c223e0d8e65a218943cb7be1ec4a91f5e35',
       binaryRelativePath: 'headless_shell-linux_arm64/headless_shell',
-      revision: 1300313,
+      revision: 1331488,
       location: 'custom',
       isPreInstalled: true,
     },
     {
       platform: 'win32',
       architecture: 'x64',
       archiveFilename: 'chrome-win.zip',
-      archiveChecksum: '27a2ed1473cefc6f48ff5665faa1fbcc69ef5be47ee21777a60e87c8379fdd93',
-      binaryChecksum: 'd603401a5e6f8bd734b329876e4221a4d24a1999f14df6e32eeb5e6a72520d96',
+      archiveChecksum: 'fa62be702f55f37e455bab4291c59ceb40e81e1922d30cf9453a4ee176b909bc',
+      binaryChecksum: '1345e66583bad1a1f16885f381d1173de8bf931487da9ba155e1b58bf23b2c66',
       binaryRelativePath: path.join('chrome-win', 'chrome.exe'),
-      revision: 1300320, // 1300313 is not available for win32
+      revision: 1331487, // 1331488 is not available for win32
       location: 'common',
       archivePath: 'Win',
       isPreInstalled: true,

src/plugins/console/server/lib/spec_definitions/js/filter.ts

@@ -108,38 +108,6 @@ filters.geo_distance = {
   },
 };
 
-filters.geo_distance_range = {
-  __template: {
-    from: 100,
-    to: 200,
-    distance_unit: 'km',
-    FIELD: {
-      lat: 40.73,
-      lon: -74.1,
-    },
-  },
-  from: 100,
-  to: 200,
-
-  distance_unit: {
-    __one_of: ['km', 'miles'],
-  },
-  distance_type: {
-    __one_of: ['arc', 'plane'],
-  },
-  include_lower: {
-    __one_of: [true, false],
-  },
-  include_upper: {
-    __one_of: [true, false],
-  },
-
-  '{field}': {
-    lat: 40.73,
-    lon: -74.1,
-  },
-};
-
 filters.geo_polygon = {
   __template: {
     FIELD: {

src/plugins/data_views/common/fields/utils.test.ts

@@ -16,8 +16,8 @@ describe('shortenDottedString', () => {
   test('should ignore non-string values', () => {
     const obj = { key: 'val' };
 
-    expect(shortenDottedString(true)).toBe(true);
-    expect(shortenDottedString(123)).toBe(123);
-    expect(shortenDottedString(obj)).toBe(obj);
+    expect(shortenDottedString(true as unknown as string)).toBe(true);
+    expect(shortenDottedString(123 as unknown as string)).toBe(123);
+    expect(shortenDottedString(obj as unknown as string)).toBe(obj);
   });
 });

src/plugins/data_views/common/fields/utils.ts

@@ -25,16 +25,25 @@ export const isMultiField = isDataViewFieldSubtypeMulti;
 export const getFieldSubtypeMulti = getDataViewFieldSubtypeMulti;
 export const getFieldSubtypeNested = getDataViewFieldSubtypeNested;
 
-const DOT_PREFIX_RE = /(.).+?\./g;
-
 /**
  * Convert a dot.notated.string into a short
  * version (d.n.string)
  *
  * @return {any}
  */
-export function shortenDottedString(input: any) {
-  return typeof input !== 'string' ? input : input.replace(DOT_PREFIX_RE, '$1.');
+
+export function shortenDottedString(input: string): string {
+  if (typeof input === 'string') {
+    const split = input.split('.');
+    return split.reduce((acc, part, i) => {
+      if (i === split.length - 1) {
+        return acc + part;
+      }
+      return acc + part[0] + '.';
+    }, '');
+  }
+
+  return input;
 }
 
 // Note - this code is duplicated from @kbn/es-query

x-pack/build_chromium/linux/args.gn

@@ -17,7 +17,7 @@ v8_symbol_level = 0
 enable_ink = false
 rtc_build_examples = false
 angle_build_tests = false
-enable_screen_ai_service = false
+use_fake_screen_ai = true
 enable_vr = false
 
 # Please, consult @elastic/kibana-security before changing/removing this option.

x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.test.ts

@@ -16,6 +16,7 @@ import { LEGEND_TYPES } from '../vega_chart/common';
 
 import {
   getColorSpec,
+  getEscapedVegaFieldName,
   getScatterplotMatrixVegaLiteSpec,
   COLOR_OUTLIER,
   COLOR_RANGE_NOMINAL,
@@ -56,6 +57,49 @@ describe('getColorSpec()', () => {
   });
 });
 
+describe('getEscapedVegaFieldName()', () => {
+  it('should escape dots in field names', () => {
+    const fieldName = 'field.name';
+    const escapedFieldName = getEscapedVegaFieldName(fieldName);
+    expect(escapedFieldName).toBe('field\\.name');
+  });
+
+  it('should escape brackets in field names', () => {
+    const fieldName = 'field[name]';
+    const escapedFieldName = getEscapedVegaFieldName(fieldName);
+    expect(escapedFieldName).toBe('field\\[name\\]');
+  });
+
+  it('should escape both dots and brackets in field names', () => {
+    const fieldName = 'field.name[0]';
+    const escapedFieldName = getEscapedVegaFieldName(fieldName);
+    expect(escapedFieldName).toBe('field\\.name\\[0\\]');
+  });
+
+  it('should return the same string if there are no special characters', () => {
+    const fieldName = 'fieldname';
+    const escapedFieldName = getEscapedVegaFieldName(fieldName);
+    expect(escapedFieldName).toBe('fieldname');
+  });
+
+  it('should escape newlines in field names', () => {
+    // String quotes process backslashes, so we need to escape them for
+    // the test string to contain a backslash. For example, without the
+    // double backslash, this string would contain a newline character.
+    const fieldName = 'field\\name';
+    const escapedFieldName = getEscapedVegaFieldName(fieldName);
+    expect(escapedFieldName).toBe('field\\\\name');
+  });
+
+  it('should escape backslashes in field names', () => {
+    // String quotes process backslashes, so we need to escape them for
+    // the test string to contain a backslash.
+    const fieldName = 'fieldname\\withbackslash';
+    const escapedFieldName = getEscapedVegaFieldName(fieldName);
+    expect(escapedFieldName).toBe('fieldname\\\\withbackslash');
+  });
+});
+
 describe('getScatterplotMatrixVegaLiteSpec()', () => {
   it('should return the default spec for non-outliers without a legend', () => {
     const data = [{ x: 1, y: 1 }];

x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts

@@ -59,11 +59,28 @@ export const getColorSpec = (
   return { value: DEFAULT_COLOR };
 };
 
-// Escapes the characters .[] in field names with double backslashes
+// Escapes the characters .[]\ in field names with double backslashes
 // since VEGA treats dots/brackets in field names as nested values.
 // See https://vega.github.io/vega-lite/docs/field.html for details.
-function getEscapedVegaFieldName(fieldName: string) {
-  return fieldName.replace(/([\.|\[|\]])/g, '\\$1');
+export function getEscapedVegaFieldName(fieldName: string) {
+  // Note the following isn't 100% ideal because there are cases when we may
+  // end up with an additional backslash being rendered for labels of the
+  // scatterplot. However, all other variations I tried caused rendering
+  // problems of the charts and rendering would fail completely.
+
+  // For example, just escaping \n in the first replace without the general
+  // backslash escaping causes the following Vega error:
+  // Duplicate scale or projection name: "child__row_my_numbercolumn_my_number_x"
+
+  // Escaping just the backslash without the additional \n escaping causes
+  // causes an "expression parse error" in Vega and the chart wouldn't render.
+
+  // Escape newline characters
+  fieldName = fieldName.replace(/\n/g, '\\n');
+  // Escape .[]\
+  fieldName = fieldName.replace(/([\.|\[|\]|\\])/g, '\\$1');
+
+  return fieldName;
 }
 
 type VegaValue = Record<string, string | number>;

x-pack/plugins/reporting/server/browsers/chromium/driver/chromium_driver.ts

@@ -180,8 +180,8 @@ export class HeadlessChromiumDriver {
       captureBeyondViewport: false, // workaround for an internal resize. See: https://github.com/puppeteer/puppeteer/issues/7043
     });
 
-    if (Buffer.isBuffer(screenshot)) {
-      return screenshot;
+    if (screenshot.byteLength) {
+      return Buffer.from(screenshot);
     }
 
     if (typeof screenshot === 'string') {