Skip to content

Commit

Permalink
Merge branch '7.17' of github.com:elastic/kibana into docs/71726-rele…
Browse files Browse the repository at this point in the history
…ase-notes
  • Loading branch information
florent-leborgne committed Nov 28, 2024
2 parents 08e3b14 + 2d19a8d commit 7645ec8
Show file tree
Hide file tree
Showing 31 changed files with 882 additions and 630 deletions.
1 change: 1 addition & 0 deletions .buildkite/pipelines/artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: c2-standard-16
diskSizeGb: 125
timeout_in_minutes: 75
retry:
automatic:
Expand Down
1 change: 1 addition & 0 deletions .buildkite/pipelines/pull_request/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ steps:
imageProject: elastic-images-prod
provider: gcp
machineType: c2-standard-16
diskSizeGb: 125
key: build
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
timeout_in_minutes: 60
Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/common/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export KIBANA_DIR
export XPACK_DIR="$KIBANA_DIR/x-pack"

export CACHE_DIR="$HOME/.kibana"
export ES_CACHE_DIR="$HOME/.es-snapshot-cache"
PARENT_DIR="$(cd "$KIBANA_DIR/.."; pwd)"
export PARENT_DIR
export WORKSPACE="${WORKSPACE:-$PARENT_DIR}"
Expand Down
14 changes: 14 additions & 0 deletions .buildkite/scripts/copy_es_snapshot_cache.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/env bash

set -euo pipefail

# If cached snapshots are baked into the agent, copy them into our workspace first
# We are doing this rather than simply changing the ES base path because many workers
# run with the workspace mounted in memory or on a local ssd
cacheDir="$ES_CACHE_DIR/cache"
if [[ -d "$cacheDir" ]]; then
mkdir -p .es/cache
echo "--- Copying ES snapshot cache"
echo "Copying cached snapshots from $cacheDir to .es/cache"
cp -R "$cacheDir"/* .es/cache/
fi
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/functional/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

is_test_execution_step
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/test/jest_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ source .buildkite/scripts/common/util.sh
is_test_execution_step

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/copy_es_snapshot_cache.sh

echo '--- Jest Integration Tests'
checks-reporter-with-killswitch "Jest Integration Tests $((BUILDKITE_PARALLEL_JOB+1))" \
Expand Down
435 changes: 435 additions & 0 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ report.asciidoc
# Ignore gihub folder to avoid pings on backports
.github/*
!.github/workflows/
!.github/CODEOWNERS

# Automatically generated and user-modifiable
/tsconfig.refs.json
Expand Down
2 changes: 1 addition & 1 deletion docs/settings/security-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ Use a string of `<count>[ms\|s\|m\|h\|d\|w\|M\|Y]` (e.g. '20m', '24h', '7d', '1w
|[[xpack-session-lifespan]] `xpack.security.session.lifespan` {ess-icon}
| Ensures that user sessions will expire after the defined time period. This behavior is also known as an "absolute timeout". If
this is _not_ set or set to `0`, user sessions could stay active indefinitely. This and <<xpack-session-idleTimeout, `xpack.security.session.idleTimeout`>> are both highly
recommended. You can also specify this setting for <<xpack-security-provider-session-lifespan, every provider separately>>. By default, this setting is not set.
recommended. You can also specify this setting for <<xpack-security-provider-session-lifespan, every provider separately>>. By default, this setting is not set for on-prem, and is set to 24 hours on Elastic Cloud.

2+a|
[TIP]
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dashboarding"
],
"private": true,
"version": "7.17.25",
"version": "7.17.26",
"branch": "7.17",
"types": "./kibana.d.ts",
"tsdocMetadata": "./build/tsdoc-metadata.json",
Expand Down Expand Up @@ -110,10 +110,10 @@
"@elastic/filesaver": "1.1.2",
"@elastic/good": "^9.0.1-kibana3",
"@elastic/maki": "6.3.0",
"@elastic/node-crypto": "1.2.1",
"@elastic/node-crypto": "^1.2.3",
"@elastic/numeral": "^2.5.1",
"@elastic/react-search-ui": "^1.6.0",
"@elastic/request-crypto": "2.0.2",
"@elastic/request-crypto": "^2.0.3",
"@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set",
"@elastic/search-ui-app-search-connector": "^1.6.0",
"@emotion/react": "^11.4.0",
Expand Down Expand Up @@ -241,7 +241,6 @@
"get-port": "^5.0.0",
"getopts": "^2.2.5",
"getos": "^3.1.0",
"glob": "^7.1.2",
"glob-all": "^3.2.1",
"globby": "^11.0.3",
"handlebars": "4.7.7",
Expand Down Expand Up @@ -314,15 +313,15 @@
"p-map": "^4.0.0",
"p-retry": "^4.2.0",
"papaparse": "^5.2.0",
"pdfmake": "^0.1.65",
"pdfmake": "^0.2.15",
"peggy": "^1.2.0",
"pluralize": "3.1.0",
"pngjs": "^3.4.0",
"polished": "^3.7.2",
"prop-types": "^15.7.2",
"proxy-from-env": "1.0.0",
"puid": "1.0.7",
"puppeteer": "23.3.1",
"puppeteer": "23.7.0",
"query-string": "^6.13.2",
"random-word-slugs": "^0.0.5",
"raw-loader": "^3.1.0",
Expand Down Expand Up @@ -668,7 +667,7 @@
"callsites": "^3.1.0",
"chai": "3.5.0",
"chance": "1.0.18",
"chromedriver": "^129.0.0",
"chromedriver": "^131.0.0",
"clean-webpack-plugin": "^3.0.0",
"cmd-shim": "^2.1.0",
"compression-webpack-plugin": "^4.0.0",
Expand Down Expand Up @@ -719,7 +718,8 @@
"file-loader": "^4.2.0",
"find-cypress-specs": "^1.35.1",
"form-data": "^4.0.0",
"geckodriver": "^4.4.2",
"geckodriver": "^4.5.1",
"glob": "^7.1.2",
"glob-watcher": "5.0.3",
"gulp": "4.0.2",
"gulp-babel": "^8.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
export function createPicker(fields: string[]) {
const wildcards = fields
.filter((field) => field.endsWith('.*'))
.map((field) => field.replace('*', ''));
.map((field) => field.replace(/\*/g, ''));

return (value: unknown, key: string) => {
return fields.includes(key) || wildcards.some((field) => key.startsWith(field));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const getDisplayName = (name, imported) => {
displayName = name.split('.').pop() || name;
}

return displayName.replace('$', '.');
return displayName.replace(/^\$/g, '.');
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-monaco/src/painless/worker/painless_worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class PainlessWorker {
fields?: PainlessAutocompleteField[]
): PainlessCompletionResult {
// Array of the active line words, e.g., [boolean, isTrue, =, true]
const words = currentLineChars.replace('\t', '').split(' ');
const words = currentLineChars.replace(/\t/g, '').split(/\s/);

const autocompleteSuggestions: PainlessCompletionResult = getAutocompleteSuggestions(
context,
Expand Down
34 changes: 17 additions & 17 deletions packages/kbn-screenshotting-server/src/paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ export class ChromiumArchivePaths {
platform: 'darwin',
architecture: 'x64',
archiveFilename: 'chrome-mac.zip',
archiveChecksum: '0a3d18efd00b3406f66139a673616b4b2b4b00323776678cb82295996f5a6733',
binaryChecksum: '8bcdaa973ee11110f6b70eaac2418fda3bb64446cf37f964fce331cdc8907a20',
archiveChecksum: '04f0132019c15660eea0b9d261fd14940c33b625c253689fcb5b09d58c4dbfe7',
binaryChecksum: 'a3ada6874ee052c096f09481fba75fcdabb96a8a9ad94a96949946a2485feccf',
binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
revision: 1331485, // 1331488 is not available for Mac_x64
revision: 1355985,
location: 'common',
archivePath: 'Mac',
isPreInstalled: false,
Expand All @@ -57,44 +57,44 @@ export class ChromiumArchivePaths {
platform: 'darwin',
architecture: 'arm64',
archiveFilename: 'chrome-mac.zip',
archiveChecksum: '426eddf16acb88b9446a91de53cc4364c7d487414248f33e30f68cf488cea0c0',
binaryChecksum: '827931739bfdd2b6790a81d5ade8886c159cd051581d79b84d1ede447293e9cf',
archiveChecksum: '6c75bb645696aed0e60b17e0e50423b97d21ca11f2c5cdfbaf17edbf582cec94',
binaryChecksum: '2f819f59379917056e07d640f75b1dbe22a830c2655e32ab0543013b7198c139',
binaryRelativePath: 'chrome-mac/Chromium.app/Contents/MacOS/Chromium',
revision: 1331488,
revision: 1355985,
location: 'common',
archivePath: 'Mac_Arm',
isPreInstalled: false,
},
{
platform: 'linux',
architecture: 'x64',
archiveFilename: 'chromium-fe621c5-locales-linux_x64.zip',
archiveChecksum: '12ce2e0eac184072dfcbc7a267328e3eb7fbe10a682997f4111c0378f2397341',
binaryChecksum: '670481cfa8db209401106cd23051009d390c03608724d0822a12c8c0a92b4c25',
archiveFilename: 'chromium-53ac076-locales-linux_x64.zip',
archiveChecksum: '50424bf105710d184198484a8a666db414627596002dacf80e83b00c8da71115',
binaryChecksum: 'afbc87a7f946bd6df763ffffb38dd4d75ee50c28ba705ac177dc893030d20206',
binaryRelativePath: 'headless_shell-linux_x64/headless_shell',
revision: 1331488,
revision: 1356013,
location: 'custom',
isPreInstalled: true,
},
{
platform: 'linux',
architecture: 'arm64',
archiveFilename: 'chromium-fe621c5-locales-linux_arm64.zip',
archiveChecksum: 'f7333eaff5235046c8775f0c1a0b7395b7ebc2e054ea638710cf511c4b6f9daf',
binaryChecksum: '8a3a3371b3d04f4b0880b137a3611c223e0d8e65a218943cb7be1ec4a91f5e35',
archiveFilename: 'chromium-53ac076-locales-linux_arm64.zip',
archiveChecksum: '24ffa183a6bf355209f3960a2377a1f8cc75aef093fe1934fcc72d2a5f9a274b',
binaryChecksum: 'db1c0226e03dfc26a6d61e02a885912906529e8477ac3214962b160d1e99f25c',
binaryRelativePath: 'headless_shell-linux_arm64/headless_shell',
revision: 1331488,
revision: 1356013,
location: 'custom',
isPreInstalled: true,
},
{
platform: 'win32',
architecture: 'x64',
archiveFilename: 'chrome-win.zip',
archiveChecksum: 'fa62be702f55f37e455bab4291c59ceb40e81e1922d30cf9453a4ee176b909bc',
binaryChecksum: '1345e66583bad1a1f16885f381d1173de8bf931487da9ba155e1b58bf23b2c66',
archiveChecksum: 'f86aadca5d1ab02fc05b580f23a30ee02d34bd348f9a3f0032b7117027676727',
binaryChecksum: 'b7b98dd681dfea2333a0136ba5788e38010730bb2e42eafa291b16931f00449d',
binaryRelativePath: path.join('chrome-win', 'chrome.exe'),
revision: 1331487, // 1331488 is not available for win32
revision: 1355984,
location: 'common',
archivePath: 'Win',
isPreInstalled: true,
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-spec-to-console/bin/spec_to_console.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
const fs = require('fs');
const path = require('path');
const program = require('commander');
const glob = require('glob');
const globby = require('globby');
const chalk = require('chalk');

const packageJSON = require('../package.json');
Expand All @@ -26,7 +26,7 @@ if (!program.glob) {
process.exit(1);
}

const files = glob.sync(program.glob);
const files = globby.sync(program.glob);
const totalFilesCount = files.length;
let convertedFilesCount = 0;

Expand Down
Loading

0 comments on commit 7645ec8

Please sign in to comment.