Skip to content

Commit 974cd88

Browse files
Merge branch 'master' into de_fixes
2 parents ca674af + 3c8a66e commit 974cd88

File tree

1,499 files changed

+38362
-19104
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,499 files changed

+38362
-19104
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+
}

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ target
2626
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
2727
/src/plugins/vis_type_timelion/public/_generated_/**
2828
/src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
29+
/src/plugins/timelion/public/webpackShims/jquery.flot.*
2930
/x-pack/legacy/plugins/**/__tests__/fixtures/**
3031
/x-pack/plugins/apm/e2e/**/snapshots.js
3132
/x-pack/plugins/apm/e2e/tmp/*

.i18nrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"src/plugins/telemetry_management_section"
4545
],
4646
"tileMap": "src/plugins/tile_map",
47-
"timelion": ["src/legacy/core_plugins/timelion", "src/plugins/vis_type_timelion"],
47+
"timelion": ["src/plugins/timelion", "src/plugins/vis_type_timelion"],
4848
"uiActions": "src/plugins/ui_actions",
4949
"visDefaultEditor": "src/plugins/vis_default_editor",
5050
"visTypeMarkdown": "src/plugins/vis_type_markdown",

.sass-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
files:
22
include:
33
- 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
4-
- 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
4+
- 'src/plugins/timelion/**/*.s+(a|c)ss'
55
- 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
66
- 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
77
- 'x-pack/plugins/canvas/**/*.s+(a|c)ss'

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

0 commit comments

Comments
 (0)