Skip to content

Commit 1bfff12

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into dual_mode_tsvb
2 parents ebc220a + 69bf127 commit 1bfff12

350 files changed

Lines changed: 3431 additions & 2704 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
@@ -18,7 +18,8 @@ kibanaPipeline(timeoutMinutes: 180) {
1818
workers.ci(name: job, size: 'l', ramDisk: true) {
1919
kibanaPipeline.bash('test/scripts/jenkins_xpack_build_kibana.sh', 'Build Default Distributable')
2020
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_chrome.sh')()
21-
kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
21+
// Temporarily disabled to figure out test flake
22+
// kibanaPipeline.functionalTestProcess(job, 'test/scripts/jenkins_security_solution_cypress_firefox.sh')()
2223
}
2324
}
2425
}

‎.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
}

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.4
1+
14.16.0

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.15.4
1+
14.16.0

‎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/management/alerting/alert-management.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
=== Managing Alerts
44

55

6-
The *Alerts* tab provides a cross-app view of alerting. Different {kib} apps like <<metrics-app,Metrics>>, <<xpack-apm,APM>>, <<uptime-app,Uptime>>, and <<xpack-siem,SIEM>> can offer their own alerts, and the *Alerts* tab provides a central place to:
6+
The *Alerts* tab provides a cross-app view of alerting. Different {kib} apps like {observability-guide}/create-alerts.html[*Observability*], {security-guide}/prebuilt-rules.html[*Security*], <<geo-alerting, *Maps*>> and <<xpack-ml, *Machine Learning*>> can offer their own alerts. The *Alerts* tab provides a central place to:
77

88
* <<create-edit-alerts, Create and edit>> alerts
99
* <<controlling-alerts, Control alerts>> including enabling/disabling, muting/unmuting, and deleting

‎docs/management/index-patterns.asciidoc‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ which indicates the type of data the field contains in {es},
139139
such as strings or boolean values. The field mapping also determines
140140
how you can use the field, such as whether it can be searched or aggregated.
141141

142+
When a new field is added to the index, the index pattern field list is updated
143+
the next time the index pattern is loaded, for example, when you load the page or
144+
move between {kib} apps.
145+
142146
[role="screenshot"]
143147
image:management/index-patterns/images/new-index-pattern.png["Create index pattern"]
144148

@@ -158,7 +162,7 @@ date values in {es}, you can use a {kib} field formatter to change the display t
158162
<<field-formatters-geopoint, geopoints>>,
159163
and <<field-formatters-numeric, numbers>>.
160164

161-
To customize the displayed field name provided by {es}, you can
165+
To customize the displayed field name provided by {es}, you can
162166
use *Custom Label* .
163167

164168
A popularity counter keeps track of the fields you use most often.
@@ -170,13 +174,6 @@ To edit the field display, click the edit icon
170174
[role="screenshot"]
171175
image:management/index-patterns/images/edit-field-format.png["Edit field format"]
172176

173-
[float]
174-
==== Refresh the data fields
175-
176-
To pick up newly-added fields,
177-
refresh (image:management/index-patterns/images/refresh-icon.png[Refresh icon]) the index fields list.
178-
This action also resets the {kib} popularity counters for the fields.
179-
180177
[float]
181178
[[default-index-pattern]]
182179
=== Set the default index pattern

‎docs/management/index-patterns/images/new-index-pattern.png‎

-14.9 KB
Loading

‎docs/user/alerting/action-types.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[role="xpack"]
22
[[action-types]]
3-
== Action and connector types
3+
== Actions and connectors
44

55
Actions are Kibana services or integrations with third-party systems that run as background tasks on the Kibana server when alert conditions are met. {kib} provides the following types of actions:
66

0 commit comments

Comments
 (0)