Skip to content

Commit 6cc505c

Browse files
Merge branch 'master' into convert-typescript
2 parents acbab25 + 4e6f0c6 commit 6cc505c

File tree

1,157 files changed

+27193
-14541
lines changed

Some content is hidden

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

1,157 files changed

+27193
-14541
lines changed
File renamed without changes.

.ci/Jenkinsfile_baseline_trigger

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
#!/bin/groovy
2+
3+
def MAXIMUM_COMMITS_TO_CHECK = 10
4+
def MAXIMUM_COMMITS_TO_BUILD = 5
5+
6+
if (!params.branches_yaml) {
7+
error "'branches_yaml' parameter must be specified"
8+
}
9+
10+
def additionalBranches = []
11+
12+
def branches = readYaml(text: params.branches_yaml) + additionalBranches
13+
14+
library 'kibana-pipeline-library'
15+
kibanaLibrary.load()
16+
17+
withGithubCredentials {
18+
branches.each { branch ->
19+
stage(branch) {
20+
def commits = getCommits(branch, MAXIMUM_COMMITS_TO_CHECK, MAXIMUM_COMMITS_TO_BUILD)
21+
22+
commits.take(MAXIMUM_COMMITS_TO_BUILD).each { commit ->
23+
catchErrors {
24+
githubCommitStatus.create(commit, 'pending', 'Baseline started.', 'kibana-ci-baseline')
25+
26+
build(
27+
propagate: false,
28+
wait: false,
29+
job: 'elastic+kibana+baseline-capture',
30+
parameters: [
31+
string(name: 'branch_specifier', value: branch),
32+
string(name: 'commit', value: commit),
33+
]
34+
)
35+
}
36+
}
37+
}
38+
}
39+
}
40+
41+
def getCommits(String branch, maximumCommitsToCheck, maximumCommitsToBuild) {
42+
print "Getting latest commits for ${branch}..."
43+
def commits = githubApi.get("repos/elastic/kibana/commits?sha=${branch}").take(maximumCommitsToCheck).collect { it.sha }
44+
def commitsToBuild = []
45+
46+
for (commit in commits) {
47+
print "Getting statuses for ${commit}"
48+
def status = githubApi.get("repos/elastic/kibana/statuses/${commit}").find { it.context == 'kibana-ci-baseline' }
49+
print "Commit '${commit}' already built? ${status ? 'Yes' : 'No'}"
50+
51+
if (!status) {
52+
commitsToBuild << commit
53+
} else {
54+
// Stop at the first commit we find that's already been triggered
55+
break
56+
}
57+
58+
if (commitsToBuild.size() >= maximumCommitsToBuild) {
59+
break
60+
}
61+
}
62+
63+
return commitsToBuild.reverse() // We want the builds to trigger oldest-to-newest
64+
}

Jenkinsfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true)
4242
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4343
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
4444
'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
45-
// 'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
4645
'xpack-securitySolutionCypress': { processNumber ->
4746
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
4847
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)

docs/api/dashboard/export-dashboard.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ experimental[] Export dashboards and corresponding saved objects.
3535

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

docs/api/dashboard/import-dashboard.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Use the complete response body from the <<dashboard-api-export, Export dashboard
4242

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

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
2020
[[logstash-configuration-management-api-create-request-body]]
2121
==== Request body
2222

23+
`id`::
24+
(Required, string) The pipeline ID.
25+
2326
`description`::
2427
(Optional, string) The pipeline description.
2528

@@ -41,7 +44,7 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
4144

4245
[source,sh]
4346
--------------------------------------------------
44-
$ curl -X PUT "localhost:5601/api/logstash/pipeline/hello-world"
47+
$ curl -X PUT api/logstash/pipeline/hello-world
4548
{
4649
"pipeline": "input { stdin {} } output { stdout {} }",
4750
"settings": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ experimental[] Delete a centrally-managed Logstash pipeline.
2828

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

docs/api/role-management/put.asciidoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Grant access to various features in all spaces:
6363

6464
[source,sh]
6565
--------------------------------------------------
66-
$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
66+
$ curl -X PUT api/security/role/my_kibana_role
6767
{
6868
"metadata" : {
6969
"version" : 1
@@ -132,7 +132,7 @@ Grant dashboard-only access to only the Marketing space:
132132

133133
[source,sh]
134134
--------------------------------------------------
135-
$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
135+
$ curl -X PUT api/security/role/my_kibana_role
136136
{
137137
"metadata" : {
138138
"version" : 1
@@ -160,7 +160,7 @@ Grant full access to all features in the Default space:
160160

161161
[source,sh]
162162
--------------------------------------------------
163-
$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
163+
$ curl -X PUT api/security/role/my_kibana_role
164164
{
165165
"metadata" : {
166166
"version" : 1
@@ -187,7 +187,7 @@ Grant different access to different spaces:
187187

188188
[source,sh]
189189
--------------------------------------------------
190-
$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
190+
$ curl -X PUT api/security/role/my_kibana_role
191191
{
192192
"metadata" : {
193193
"version" : 1
@@ -223,7 +223,7 @@ Grant access to {kib} and {es}:
223223

224224
[source,sh]
225225
--------------------------------------------------
226-
$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
226+
$ curl -X PUT api/security/role/my_kibana_role
227227
{
228228
"metadata" : {
229229
"version" : 1

docs/api/saved-objects/bulk_create.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Create an index pattern with the `my-pattern` ID, and a dashboard with the `my-d
6565

6666
[source,sh]
6767
--------------------------------------------------
68-
$ curl -X POST "localhost:5601/api/saved_objects/_bulk_create"
68+
$ curl -X POST api/saved_objects/_bulk_create
6969
[
7070
{
7171
"type": "index-pattern",

docs/api/saved-objects/bulk_get.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ experimental[] Retrieve multiple {kib} saved objects by ID.
2929
(Required, string) ID of the retrieved object. The ID includes the {kib} unique identifier or a custom identifier.
3030

3131
`fields`::
32-
(Optional, array) The fields returned in the object response.
32+
(Optional, array) The fields to return in the `attributes` key of the object response.
3333

3434
[[saved-objects-api-bulk-get-response-body]]
3535
==== Response body
@@ -52,7 +52,7 @@ Retrieve an index pattern with the `my-pattern` ID, and a dashboard with the `my
5252

5353
[source,sh]
5454
--------------------------------------------------
55-
$ curl -X POST "localhost:5601/api/saved_objects/_bulk_get"
55+
$ curl -X POST api/saved_objects/_bulk_get
5656
[
5757
{
5858
"type": "index-pattern",

0 commit comments

Comments
 (0)