Skip to content

Commit ce1f4be

Browse files
committed
Merge remote-tracking branch 'upstream/master' into bug/remove-agent-status-for-non-endpoint-alerts
2 parents 8cb45fc + d5a760c commit ce1f4be

1,609 files changed

Lines changed: 90501 additions & 24435 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.

.eslintrc.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,8 @@ module.exports = {
893893
files: [
894894
'x-pack/plugins/security_solution/public/**/*.{js,mjs,ts,tsx}',
895895
'x-pack/plugins/security_solution/common/**/*.{js,mjs,ts,tsx}',
896+
'x-pack/plugins/timelines/public/**/*.{js,mjs,ts,tsx}',
897+
'x-pack/plugins/timelines/common/**/*.{js,mjs,ts,tsx}',
896898
],
897899
rules: {
898900
'import/no-nodejs-modules': 'error',
@@ -907,7 +909,10 @@ module.exports = {
907909
},
908910
{
909911
// typescript only for front and back end
910-
files: ['x-pack/plugins/security_solution/**/*.{ts,tsx}'],
912+
files: [
913+
'x-pack/plugins/security_solution/**/*.{ts,tsx}',
914+
'x-pack/plugins/timelines/**/*.{ts,tsx}',
915+
],
911916
rules: {
912917
'@typescript-eslint/no-this-alias': 'error',
913918
'@typescript-eslint/no-explicit-any': 'error',
@@ -917,7 +922,10 @@ module.exports = {
917922
},
918923
{
919924
// typescript and javascript for front and back end
920-
files: ['x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}'],
925+
files: [
926+
'x-pack/plugins/security_solution/**/*.{js,mjs,ts,tsx}',
927+
'x-pack/plugins/timelines/**/*.{js,mjs,ts,tsx}',
928+
],
921929
plugins: ['eslint-plugin-node', 'react'],
922930
env: {
923931
jest: true,

docs/api/saved-objects/bulk_create.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ experimental[] Create multiple {kib} saved objects.
4545
(Optional, string array) Identifiers for the <<xpack-spaces,spaces>> in which this object is created. If this is provided, the
4646
object is created only in the explicitly defined spaces. If this is not provided, the object is created in the current space
4747
(default behavior).
48+
* For shareable object types (registered with `namespaceType: 'multiple'`): this option can be used to specify one or more spaces, including
49+
the "All spaces" identifier (`'*'`).
50+
* For isolated object types (registered with `namespaceType: 'single'` or `namespaceType: 'multiple-isolated'`): this option can only be
51+
used to specify a single space, and the "All spaces" identifier (`'*'`) is not allowed.
52+
* For global object types (registered with `namespaceType: 'agnostic'`): this option cannot be used.
4853

4954
`version`::
5055
(Optional, number) Specifies the version.

docs/api/saved-objects/create.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ any data that you send to the API is properly formed.
5252
(Optional, string array) Identifiers for the <<xpack-spaces,spaces>> in which this object is created. If this is provided, the
5353
object is created only in the explicitly defined spaces. If this is not provided, the object is created in the current space
5454
(default behavior).
55+
* For shareable object types (registered with `namespaceType: 'multiple'`): this option can be used to specify one or more spaces, including
56+
the "All spaces" identifier (`'*'`).
57+
* For isolated object types (registered with `namespaceType: 'single'` or `namespaceType: 'multiple-isolated'`): this option can only be
58+
used to specify a single space, and the "All spaces" identifier (`'*'`) is not allowed.
59+
* For global object types (registered with `namespaceType: 'agnostic'): this option cannot be used.
5560

5661
[[saved-objects-api-create-request-codes]]
5762
==== Response code

docs/developer/getting-started/monorepo-packages.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ yarn kbn watch-bazel
8686
- @kbn/logging
8787
- @kbn/mapbox-gl
8888
- @kbn/monaco
89+
- @kbn/optimizer
8990
- @kbn/rule-data-utils
9091
- @kbn/securitysolution-es-utils
9192
- @kbn/securitysolution-hook-utils

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ readonly links: {
106106
};
107107
readonly search: {
108108
readonly sessions: string;
109+
readonly sessionLimits: string;
109110
};
110111
readonly indexPatterns: {
111112
readonly introduction: string;
@@ -116,6 +117,7 @@ readonly links: {
116117
readonly addData: string;
117118
readonly kibana: string;
118119
readonly upgradeAssistant: string;
120+
readonly rollupJobs: string;
119121
readonly elasticsearch: Record<string, string>;
120122
readonly siem: {
121123
readonly guide: string;

docs/development/core/public/kibana-plugin-core-public.doclinksstart.md

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.initialnamespaces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
Optional initial namespaces for the object to be created in. If this is defined, it will supersede the namespace ID that is in [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md)<!-- -->.
88

9-
Note: this can only be used for multi-namespace object types.
9+
\* For shareable object types (registered with `namespaceType: 'multiple'`<!-- -->): this option can be used to specify one or more spaces, including the "All spaces" identifier (`'*'`<!-- -->). \* For isolated object types (registered with `namespaceType: 'single'` or `namespaceType: 'multiple-isolated'`<!-- -->): this option can only be used to specify a single space, and the "All spaces" identifier (`'*'`<!-- -->) is not allowed. \* For global object types (registered with `namespaceType: 'agnostic'`<!-- -->): this option cannot be used.
1010

1111
<b>Signature:</b>
1212

docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface SavedObjectsBulkCreateObject<T = unknown>
1818
| [attributes](./kibana-plugin-core-server.savedobjectsbulkcreateobject.attributes.md) | <code>T</code> | |
1919
| [coreMigrationVersion](./kibana-plugin-core-server.savedobjectsbulkcreateobject.coremigrationversion.md) | <code>string</code> | A semver value that is used when upgrading objects between Kibana versions. If undefined, this will be automatically set to the current Kibana version when the object is created. If this is set to a non-semver value, or it is set to a semver value greater than the current Kibana version, it will result in an error. |
2020
| [id](./kibana-plugin-core-server.savedobjectsbulkcreateobject.id.md) | <code>string</code> | |
21-
| [initialNamespaces](./kibana-plugin-core-server.savedobjectsbulkcreateobject.initialnamespaces.md) | <code>string[]</code> | Optional initial namespaces for the object to be created in. If this is defined, it will supersede the namespace ID that is in [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md)<!-- -->.<!-- -->Note: this can only be used for multi-namespace object types. |
21+
| [initialNamespaces](./kibana-plugin-core-server.savedobjectsbulkcreateobject.initialnamespaces.md) | <code>string[]</code> | Optional initial namespaces for the object to be created in. If this is defined, it will supersede the namespace ID that is in [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md)<!-- -->.<!-- -->\* For shareable object types (registered with <code>namespaceType: 'multiple'</code>): this option can be used to specify one or more spaces, including the "All spaces" identifier (<code>'*'</code>). \* For isolated object types (registered with <code>namespaceType: 'single'</code> or <code>namespaceType: 'multiple-isolated'</code>): this option can only be used to specify a single space, and the "All spaces" identifier (<code>'*'</code>) is not allowed. \* For global object types (registered with <code>namespaceType: 'agnostic'</code>): this option cannot be used. |
2222
| [migrationVersion](./kibana-plugin-core-server.savedobjectsbulkcreateobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
2323
| [originId](./kibana-plugin-core-server.savedobjectsbulkcreateobject.originid.md) | <code>string</code> | Optional ID of the original saved object, if this object's <code>id</code> was regenerated |
2424
| [references](./kibana-plugin-core-server.savedobjectsbulkcreateobject.references.md) | <code>SavedObjectReference[]</code> | |

docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.initialnamespaces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
Optional initial namespaces for the object to be created in. If this is defined, it will supersede the namespace ID that is in [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md)<!-- -->.
88

9-
Note: this can only be used for multi-namespace object types.
9+
\* For shareable object types (registered with `namespaceType: 'multiple'`<!-- -->): this option can be used to specify one or more spaces, including the "All spaces" identifier (`'*'`<!-- -->). \* For isolated object types (registered with `namespaceType: 'single'` or `namespaceType: 'multiple-isolated'`<!-- -->): this option can only be used to specify a single space, and the "All spaces" identifier (`'*'`<!-- -->) is not allowed. \* For global object types (registered with `namespaceType: 'agnostic'`<!-- -->): this option cannot be used.
1010

1111
<b>Signature:</b>
1212

docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions
1717
| --- | --- | --- |
1818
| [coreMigrationVersion](./kibana-plugin-core-server.savedobjectscreateoptions.coremigrationversion.md) | <code>string</code> | A semver value that is used when upgrading objects between Kibana versions. If undefined, this will be automatically set to the current Kibana version when the object is created. If this is set to a non-semver value, or it is set to a semver value greater than the current Kibana version, it will result in an error. |
1919
| [id](./kibana-plugin-core-server.savedobjectscreateoptions.id.md) | <code>string</code> | (not recommended) Specify an id for the document |
20-
| [initialNamespaces](./kibana-plugin-core-server.savedobjectscreateoptions.initialnamespaces.md) | <code>string[]</code> | Optional initial namespaces for the object to be created in. If this is defined, it will supersede the namespace ID that is in [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md)<!-- -->.<!-- -->Note: this can only be used for multi-namespace object types. |
20+
| [initialNamespaces](./kibana-plugin-core-server.savedobjectscreateoptions.initialnamespaces.md) | <code>string[]</code> | Optional initial namespaces for the object to be created in. If this is defined, it will supersede the namespace ID that is in [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md)<!-- -->.<!-- -->\* For shareable object types (registered with <code>namespaceType: 'multiple'</code>): this option can be used to specify one or more spaces, including the "All spaces" identifier (<code>'*'</code>). \* For isolated object types (registered with <code>namespaceType: 'single'</code> or <code>namespaceType: 'multiple-isolated'</code>): this option can only be used to specify a single space, and the "All spaces" identifier (<code>'*'</code>) is not allowed. \* For global object types (registered with <code>namespaceType: 'agnostic'</code>): this option cannot be used. |
2121
| [migrationVersion](./kibana-plugin-core-server.savedobjectscreateoptions.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
2222
| [originId](./kibana-plugin-core-server.savedobjectscreateoptions.originid.md) | <code>string</code> | Optional ID of the original saved object, if this object's <code>id</code> was regenerated |
2323
| [overwrite](./kibana-plugin-core-server.savedobjectscreateoptions.overwrite.md) | <code>boolean</code> | Overwrite existing documents (defaults to false) |

0 commit comments

Comments
 (0)