Skip to content

Commit cd22789

Browse files
streamichstreamich
committed
Merge remote-tracking branch 'upstream/master' into anon-access-switch
2 parents fe5e677 + f3fba95 commit cd22789

445 files changed

Lines changed: 10785 additions & 4075 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.bazeliskversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.7.3

‎.bazelversion‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0.0

‎.ci/teamcity/oss/jest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ source "$(dirname "${0}")/../util.sh"
1010
export JOB=kibana-oss-jest
1111

1212
checks-reporter-with-killswitch "Jest Unit Tests" \
13-
node scripts/jest --ci --verbose
13+
node scripts/jest --ci --maxWorkers=5 --verbose

‎.ci/teamcity/tests/jest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ source "$(dirname "${0}")/../util.sh"
77
export JOB=kibana-jest
88

99
checks-reporter-with-killswitch "Jest Unit Tests" \
10-
node scripts/jest --ci --verbose --coverage
10+
node scripts/jest --ci --maxWorkers=5 --verbose

‎.ci/teamcity/tests/test_projects.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -euo pipefail
55
source "$(dirname "${0}")/../util.sh"
66

77
checks-reporter-with-killswitch "Test Projects" \
8-
yarn kbn run test --exclude kibana --oss --skip-kibana-plugins
8+
yarn kbn run test --exclude kibana --oss --skip-kibana-plugins --skip-missing

‎.eslintrc.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,32 @@ module.exports = {
11921192
},
11931193
},
11941194

1195+
/**
1196+
* Osquery overrides
1197+
*/
1198+
{
1199+
extends: ['eslint:recommended', 'plugin:react/recommended'],
1200+
plugins: ['react'],
1201+
files: ['x-pack/plugins/osquery/**/*.{js,mjs,ts,tsx}'],
1202+
rules: {
1203+
'arrow-body-style': ['error', 'as-needed'],
1204+
'prefer-arrow-callback': 'error',
1205+
'no-unused-vars': 'off',
1206+
'react/prop-types': 'off',
1207+
},
1208+
},
1209+
{
1210+
// typescript and javascript for front end react performance
1211+
files: ['x-pack/plugins/osquery/public/**/!(*.test).{js,mjs,ts,tsx}'],
1212+
plugins: ['react', 'react-perf'],
1213+
rules: {
1214+
'react-perf/jsx-no-new-object-as-prop': 'error',
1215+
'react-perf/jsx-no-new-array-as-prop': 'error',
1216+
'react-perf/jsx-no-new-function-as-prop': 'error',
1217+
'react/jsx-no-bind': 'error',
1218+
},
1219+
},
1220+
11951221
/**
11961222
* Prettier disables all conflicting rules, listing as last override so it takes precedence
11971223
*/

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
1010
/x-pack/plugins/lens/ @elastic/kibana-app
1111
/x-pack/plugins/graph/ @elastic/kibana-app
12-
/x-pack/plugins/vis_type_timeseries_enhanced/ @elastic/kibana-app
1312
/src/plugins/advanced_settings/ @elastic/kibana-app
1413
/src/plugins/charts/ @elastic/kibana-app
1514
/src/plugins/discover/ @elastic/kibana-app
@@ -330,6 +329,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
330329
# Security Intelligence And Analytics
331330
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
332331

332+
# Security Asset Management
333+
/x-pack/plugins/osquery @elastic/security-asset-management
334+
333335
# Design (at the bottom for specificity of SASS files)
334336
**/*.scss @elastic/kibana-design
335337
#CC# /packages/kbn-ui-framework/ @elastic/kibana-design

‎WORKSPACE.bazel‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
workspace(
2+
name = "kibana",
3+
)

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,10 @@ Elastic.
460460
|This plugin provides shared components and services for use across observability solutions, as well as the observability landing page UI.
461461
462462
463+
|{kib-repo}blob/{branch}/x-pack/plugins/osquery/README.md[osquery]
464+
|This plugin adds extended support to Security Solution Fleet Osquery integration
465+
466+
463467
|{kib-repo}blob/{branch}/x-pack/plugins/painless_lab/README.md[painlessLab]
464468
|This plugin helps users learn how to use the Painless scripting language.
465469
@@ -555,10 +559,6 @@ in their infrastructure.
555559
|NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.
556560
557561
558-
|{kib-repo}blob/{branch}/x-pack/plugins/vis_type_timeseries_enhanced/README.md[visTypeTimeseriesEnhanced]
559-
|The vis_type_timeseries_enhanced plugin is the x-pack counterpart to the OSS vis_type_timeseries plugin.
560-
561-
562562
|{kib-repo}blob/{branch}/x-pack/plugins/watcher/README.md[watcher]
563563
|This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
564564

‎docs/development/core/public/kibana-plugin-core-public.uisettingsparams.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export interface UiSettingsParams<T = unknown>
2626
| [readonly](./kibana-plugin-core-public.uisettingsparams.readonly.md) | <code>boolean</code> | a flag indicating that value cannot be changed |
2727
| [requiresPageReload](./kibana-plugin-core-public.uisettingsparams.requirespagereload.md) | <code>boolean</code> | a flag indicating whether new value applying requires page reloading |
2828
| [schema](./kibana-plugin-core-public.uisettingsparams.schema.md) | <code>Type&lt;T&gt;</code> | |
29+
| [sensitive](./kibana-plugin-core-public.uisettingsparams.sensitive.md) | <code>boolean</code> | a flag indicating that value might contain user sensitive data. used by telemetry to mask the value of the setting when sent. |
2930
| [type](./kibana-plugin-core-public.uisettingsparams.type.md) | <code>UiSettingsType</code> | defines a type of UI element [UiSettingsType](./kibana-plugin-core-public.uisettingstype.md) |
3031
| [validation](./kibana-plugin-core-public.uisettingsparams.validation.md) | <code>ImageValidation &#124; StringValidation</code> | |
3132
| [value](./kibana-plugin-core-public.uisettingsparams.value.md) | <code>T</code> | default value to fall back to if a user doesn't provide any |

0 commit comments

Comments
 (0)