Skip to content

Commit fbf79bd

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into exceptions_creation_api
2 parents 11e3396 + 0e6c38d commit fbf79bd

226 files changed

Lines changed: 7120 additions & 2199 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.

‎.ci/Jenkinsfile_security_cypress‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ kibanaPipeline(timeoutMinutes: 180) {
1717

1818
workers.ci(name: job, size: 'l', ramDisk: true) {
1919
kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
20-
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress.sh')()
20+
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
21+
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
2122
}
2223
}
2324
}

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,22 @@ kibanaPipeline(timeoutMinutes: 210) {
3030
"ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}",
3131
'IGNORE_SHIP_CI_STATS_ERROR=true',
3232
]) {
33-
parallel([
34-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
35-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
36-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
37-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
38-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
39-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
40-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
41-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
42-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
43-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
44-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
45-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
46-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
47-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
48-
]),
49-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
50-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
51-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
52-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
53-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
54-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
55-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
56-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
57-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
58-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
59-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
60-
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
61-
'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
62-
'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
63-
]),
64-
])
33+
kibanaPipeline.withTasks {
34+
tasks([
35+
kibanaPipeline.scriptTaskDocker('Jest Integration Tests', 'test/scripts/test/jest_integration.sh'),
36+
kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh'),
37+
])
38+
39+
task {
40+
kibanaPipeline.buildOss(6)
41+
tasks.ossCiGroups()
42+
}
43+
44+
task {
45+
kibanaPipeline.buildXpack(10)
46+
tasks.xpackCiGroups()
47+
}
48+
}
6549
}
6650

6751
promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
@@ -72,7 +56,9 @@ kibanaPipeline(timeoutMinutes: 210) {
7256
}
7357

7458
def promoteSnapshot(snapshotVersion, snapshotId) {
75-
node(workers.label('s')) {
76-
esSnapshots.promote(snapshotVersion, snapshotId)
59+
if (buildUtils.getBuildStatus() == 'SUCCESS') {
60+
node(workers.label('s')) {
61+
esSnapshots.promote(snapshotVersion, snapshotId)
62+
}
7763
}
7864
}

‎CODE_OF_CONDUCT.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
303 See Other
2+
3+
Location: https://www.elastic.co/community/codeofconduct

‎docs/api/actions-and-connectors/create.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Creates an action.
2727
`secrets`::
2828
(Required, object) The secrets configuration for the action. Secrets configuration properties vary
2929
depending on the action type. For information about the secrets configuration properties, refer to <<action-types,Action and connector types>>.
30+
+
31+
WARNING: Remember these values. You must provide them each time you call the <<actions-and-connectors-api-update, update>> API.
3032

3133
[[actions-and-connectors-api-create-request-codes]]
3234
==== Response code

‎docs/api/alerts/create.asciidoc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ Create {kib} alerts.
99
[[alerts-api-create-request]]
1010
==== Request
1111

12-
`POST <kibana host>:<port>/api/alerts/alert`
12+
`POST <kibana host>:<port>/api/alerts/alert/<id>`
13+
14+
[[alerts-api-create-path-params]]
15+
==== Path parameters
16+
17+
`<id>`::
18+
(Optional, string) Specifies a UUID v1 or v4 to use instead of a randomly generated ID.
1319

1420
[[alerts-api-create-request-body]]
1521
==== Request body

‎docs/api/alerts/find.asciidoc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
Retrieve a paginated set of alerts based on condition.
88

9+
NOTE: As alerts change in {kib}, the results on each page of the response also
10+
change. Use the find API for traditional paginated results, but avoid using it to export large amounts of data.
11+
912
[[alerts-api-find-request]]
1013
==== Request
1114

@@ -14,6 +17,8 @@ Retrieve a paginated set of alerts based on condition.
1417
[[alerts-api-find-query-params]]
1518
==== Query Parameters
1619

20+
NOTE: Alert `params` are stored as a {ref}/flattened.html[flattened field type] and analyzed as keywords.
21+
1722
`per_page`::
1823
(Optional, number) The number of alerts to return per page.
1924

@@ -46,11 +51,6 @@ Retrieve a paginated set of alerts based on condition.
4651
It should look like savedObjectType.attributes.title: "myTitle". However, If you used a direct attribute of a saved object, such as `updatedAt`,
4752
you will have to define your filter, for example, savedObjectType.updatedAt > 2018-12-22.
4853

49-
NOTE: As alerts change in {kib}, the results on each page of the response also
50-
change. Use the find API for traditional paginated results, but avoid using it to export large amounts of data.
51-
52-
NOTE: Alert `params` are stored as {ref}/flattened.html[flattened] and analyzed as `keyword`.
53-
5454
[[alerts-api-find-request-codes]]
5555
==== Response code
5656

‎docs/dev-tools/console/console.asciidoc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ curl -XGET "http://localhost:9200/_search" -d'
4646
When you paste the command into Console, {kib} automatically converts it
4747
to Console syntax. Alternatively, if you want to see Console syntax in cURL,
4848
click the action icon (image:dev-tools/console/images/wrench.png[]) and select *Copy as cURL*.
49+
Once copied, the username and password will need to be provided
50+
for the calls to work from external environments.
4951

5052
[float]
5153
[[console-autocomplete]]

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinputprops.icontype.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<b>Signature:</b>
88

99
```typescript
10-
iconType?: string;
10+
iconType?: EuiIconProps['type'];
1111
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinputprops.isclearable.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [QueryStringInputProps](./kibana-plugin-plugins-data-public.querystringinputprops.md) &gt; [isClearable](./kibana-plugin-plugins-data-public.querystringinputprops.isclearable.md)
4+
5+
## QueryStringInputProps.isClearable property
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
isClearable?: boolean;
11+
```

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinputprops.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@ export interface QueryStringInputProps
1919
| [dataTestSubj](./kibana-plugin-plugins-data-public.querystringinputprops.datatestsubj.md) | <code>string</code> | |
2020
| [disableAutoFocus](./kibana-plugin-plugins-data-public.querystringinputprops.disableautofocus.md) | <code>boolean</code> | |
2121
| [disableLanguageSwitcher](./kibana-plugin-plugins-data-public.querystringinputprops.disablelanguageswitcher.md) | <code>boolean</code> | |
22-
| [iconType](./kibana-plugin-plugins-data-public.querystringinputprops.icontype.md) | <code>string</code> | |
22+
| [iconType](./kibana-plugin-plugins-data-public.querystringinputprops.icontype.md) | <code>EuiIconProps['type']</code> | |
2323
| [indexPatterns](./kibana-plugin-plugins-data-public.querystringinputprops.indexpatterns.md) | <code>Array&lt;IIndexPattern &#124; string&gt;</code> | |
24+
| [isClearable](./kibana-plugin-plugins-data-public.querystringinputprops.isclearable.md) | <code>boolean</code> | |
2425
| [isInvalid](./kibana-plugin-plugins-data-public.querystringinputprops.isinvalid.md) | <code>boolean</code> | |
2526
| [languageSwitcherPopoverAnchorPosition](./kibana-plugin-plugins-data-public.querystringinputprops.languageswitcherpopoveranchorposition.md) | <code>PopoverAnchorPosition</code> | |
27+
| [nonKqlMode](./kibana-plugin-plugins-data-public.querystringinputprops.nonkqlmode.md) | <code>'lucene' &#124; 'text'</code> | |
28+
| [nonKqlModeHelpText](./kibana-plugin-plugins-data-public.querystringinputprops.nonkqlmodehelptext.md) | <code>string</code> | |
2629
| [onBlur](./kibana-plugin-plugins-data-public.querystringinputprops.onblur.md) | <code>() =&gt; void</code> | |
2730
| [onChange](./kibana-plugin-plugins-data-public.querystringinputprops.onchange.md) | <code>(query: Query) =&gt; void</code> | |
2831
| [onChangeQueryInputFocus](./kibana-plugin-plugins-data-public.querystringinputprops.onchangequeryinputfocus.md) | <code>(isFocused: boolean) =&gt; void</code> | |

0 commit comments

Comments
 (0)