Skip to content

Commit 6151df8

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into reporting/np-server-config
2 parents ad8269c + 73deba1 commit 6151df8

826 files changed

Lines changed: 26325 additions & 10927 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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ module.exports = {
6969
'jsx-a11y/no-onchange': 'off',
7070
},
7171
},
72-
{
73-
files: ['src/legacy/core_plugins/data/**/*.{js,ts,tsx}'],
74-
rules: {
75-
'react-hooks/exhaustive-deps': 'off',
76-
},
77-
},
7872
{
7973
files: ['src/legacy/core_plugins/expressions/**/*.{js,ts,tsx}'],
8074
rules: {

‎.i18nrc.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
"console": "src/plugins/console",
55
"core": "src/core",
66
"dashboard": "src/plugins/dashboard",
7-
"data": [
8-
"src/legacy/core_plugins/data",
9-
"src/plugins/data"
10-
],
7+
"data": "src/plugins/data",
118
"embeddableApi": "src/plugins/embeddable",
129
"embeddableExamples": "examples/embeddable_examples",
1310
"share": "src/plugins/share",
@@ -38,8 +35,8 @@
3835
"server": "src/legacy/server",
3936
"statusPage": "src/legacy/core_plugins/status_page",
4037
"telemetry": [
41-
"src/legacy/core_plugins/telemetry",
42-
"src/plugins/telemetry"
38+
"src/plugins/telemetry",
39+
"src/plugins/telemetry_management_section"
4340
],
4441
"tileMap": "src/legacy/core_plugins/tile_map",
4542
"timelion": ["src/legacy/core_plugins/timelion", "src/legacy/core_plugins/vis_type_timelion", "src/plugins/timelion"],

‎Jenkinsfile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
4040
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
4141
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4242
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
43-
'xpack-siemCypress': kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh'),
43+
'xpack-siemCypress': { processNumber ->
44+
whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
45+
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
46+
}
47+
},
48+
4449
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
4550
]),
4651
])

‎docs/api/dashboard/export-dashboard.asciidoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ experimental[] Export dashboards and corresponding saved objects.
99
[[dashboard-api-export-request]]
1010
==== Request
1111

12-
`GET /api/kibana/dashboards/export`
12+
`GET <kibana host>:<port>/api/kibana/dashboards/export`
1313

1414
[[dashboard-api-export-params]]
1515
==== Query parameters
@@ -20,9 +20,9 @@ experimental[] Export dashboards and corresponding saved objects.
2020
[[dashboard-api-export-response-body]]
2121
==== Response body
2222

23-
`objects`::
23+
`objects`::
2424
(array) A top level property that includes the saved objects. The order of the objects is not guaranteed. Use the exact response body as the request body for the corresponding <<dashboard-import-api, Import dashboard API>>.
25-
25+
2626
[[dashboard-api-export-codes]]
2727
==== Response code
2828

@@ -33,10 +33,10 @@ experimental[] Export dashboards and corresponding saved objects.
3333
[[dashboard-api-export-example]]
3434
==== Example
3535

36-
[source,js]
36+
[source,sh]
3737
--------------------------------------------------
38-
GET api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c <1>
38+
$ curl -X GET "localhost:5601/api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c" <1>
3939
--------------------------------------------------
4040
// KIBANA
4141

42-
<1> The dashboard ID is `942dcef0-b2cd-11e8-ad8e-85441f0c2e5c`.
42+
<1> The dashboard ID is `942dcef0-b2cd-11e8-ad8e-85441f0c2e5c`.

‎docs/api/dashboard/import-dashboard.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ experimental[] Import dashboards and corresponding saved objects.
99
[[dashboard-api-import-request]]
1010
==== Request
1111

12-
`POST /api/kibana/dashboards/import`
12+
`POST <kibana host>:<port>/api/kibana/dashboards/import`
1313

1414
[[dashboard-api-import-params]]
1515
==== Query parameters
@@ -40,9 +40,9 @@ Use the complete response body from the <<dashboard-api-export, Export dashboard
4040
[[dashboard-api-import-example]]
4141
==== Example
4242

43-
[source,js]
43+
[source,sh]
4444
--------------------------------------------------
45-
POST api/kibana/dashboards/import?exclude=index-pattern
45+
$ curl -X POST "localhost:5601/api/kibana/dashboards/import?exclude=index-pattern"
4646
{
4747
"objects": [
4848
{

‎docs/api/features.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ experimental[] Retrieves all {kib} features. Features are used by spaces and sec
88
[[features-api-get-request]]
99
=== Request
1010

11-
`GET /api/features`
11+
`GET <kibana host>:<port>/api/features`
1212

1313
[float]
1414
[[features-api-get-codes]]
@@ -23,7 +23,7 @@ experimental[] Retrieves all {kib} features. Features are used by spaces and sec
2323

2424
The API returns the following:
2525

26-
[source,js]
26+
[source,sh]
2727
--------------------------------------------------
2828
{
2929
"id": "discover",

‎docs/api/logstash-configuration-management.asciidoc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
[[logstash-configuration-management-api]]
33
== Logstash configuration management APIs
44

5-
Programmatically integrate with the Logstash configuration management feature.
5+
Programmatically integrate with Logstash configuration management.
66

7-
WARNING: Do not directly access the `.logstash` index. The structure of the `.logstash` index is subject to change, which could cause your integration to break. Instead, use the Logstash configuration management APIs.
7+
WARNING: Do not directly access the `.logstash` index. The structure of the `.logstash` index is subject to change, which could cause your integration to break. Instead, use the Logstash configuration management APIs.
88

99
The following Logstash configuration management APIs are available:
1010

@@ -20,5 +20,3 @@ include::logstash-configuration-management/delete-pipeline.asciidoc[]
2020
include::logstash-configuration-management/list-pipeline.asciidoc[]
2121
include::logstash-configuration-management/create-logstash.asciidoc[]
2222
include::logstash-configuration-management/retrieve-pipeline.asciidoc[]
23-
24-

‎docs/api/logstash-configuration-management/create-logstash.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
99
[[logstash-configuration-management-api-create-request]]
1010
==== Request
1111

12-
`PUT /api/logstash/pipeline/<id>`
12+
`PUT <kibana host>:<port>/api/logstash/pipeline/<id>`
1313

1414
[[logstash-configuration-management-api-create-params]]
1515
==== Path parameters
@@ -39,9 +39,9 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
3939
[[logstash-configuration-management-api-create-example]]
4040
==== Example
4141

42-
[source,js]
42+
[source,sh]
4343
--------------------------------------------------
44-
PUT api/logstash/pipeline/hello-world
44+
$ curl -X PUT "localhost:5601/api/logstash/pipeline/hello-world"
4545
{
4646
"pipeline": "input { stdin {} } output { stdout {} }",
4747
"settings": {

‎docs/api/logstash-configuration-management/delete-pipeline.asciidoc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ experimental[] Delete a centrally-managed Logstash pipeline.
99
[[logstash-configuration-management-api-delete-request]]
1010
==== Request
1111

12-
`DELETE /api/logstash/pipeline/<id>`
12+
`DELETE <kibana host>:<port>/api/logstash/pipeline/<id>`
1313

1414
[[logstash-configuration-management-api-delete-params]]
1515
==== Path parameters
@@ -26,9 +26,8 @@ experimental[] Delete a centrally-managed Logstash pipeline.
2626
[[logstash-configuration-management-api-delete-example]]
2727
==== Example
2828

29-
[source,js]
29+
[source,sh]
3030
--------------------------------------------------
31-
DELETE api/logstash/pipeline/hello-world
31+
$ curl -X DELETE "localhost:5601/api/logstash/pipeline/hello-world"
3232
--------------------------------------------------
3333
// KIBANA
34-

‎docs/api/logstash-configuration-management/list-pipeline.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ experimental[] List all centrally-managed Logstash pipelines.
99
[[logstash-configuration-management-api-list-request]]
1010
==== Request
1111

12-
`GET /api/logstash/pipelines`
12+
`GET <kibana host>:<port>/api/logstash/pipelines`
1313

1414
[[logstash-configuration-management-api-list-example]]
1515
==== Example
1616

1717
The API returns the following:
1818

19-
[source,js]
19+
[source,sh]
2020
--------------------------------------------------
2121
{
2222
"pipelines": [
@@ -35,4 +35,4 @@ The API returns the following:
3535
}
3636
--------------------------------------------------
3737

38-
<1> The `username` property appears when security is enabled, and depends on when the pipeline was created or last updated.
38+
<1> The `username` property appears when security is enabled, and depends on when the pipeline was created or last updated.

0 commit comments

Comments
 (0)