Skip to content

Commit 2ee4730

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.7' into backport/7.7/pr-59686
2 parents b46b112 + b83498c commit 2ee4730

File tree

166 files changed

+5522
-3606
lines changed

Some content is hidden

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

166 files changed

+5522
-3606
lines changed

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,48 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
1919

2020
def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
2121

22-
kibanaPipeline(timeoutMinutes: 120) {
22+
kibanaPipeline(timeoutMinutes: 150) {
2323
catchErrors {
24-
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
25-
parallel([
26-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
27-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
28-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
29-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
30-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
31-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
32-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
33-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
34-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
35-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
36-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
37-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
38-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
39-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
40-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
41-
]),
42-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
43-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
44-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
45-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
46-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
47-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
48-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
49-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
50-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
51-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
52-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
53-
]),
54-
])
55-
}
24+
slackNotifications.onFailure(
25+
title: ":broken_heart: *<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",
26+
message: ":broken_heart: [${SNAPSHOT_VERSION}] ES Snapshot Verification Failure",
27+
) {
28+
retryable.enable(2)
29+
withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
30+
parallel([
31+
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
32+
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
33+
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
34+
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
35+
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
36+
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
37+
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
38+
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
39+
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
40+
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
41+
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
42+
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
43+
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
44+
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
45+
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
46+
]),
47+
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
48+
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
49+
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
50+
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
51+
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
52+
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
53+
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
54+
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
55+
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
56+
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
57+
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
58+
]),
59+
])
60+
}
5661

57-
promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
62+
promoteSnapshot(SNAPSHOT_VERSION, SNAPSHOT_ID)
63+
}
5864
}
5965

6066
kibanaPipeline.sendMail()

‎.eslintignore‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,48 @@
1-
node_modules
2-
bower_components
3-
/data
4-
/build
5-
/target
1+
**/graphql/types.ts
2+
**/*.js.snap
63
/.es
7-
/plugins
8-
/optimize
4+
/build
95
/built_assets
6+
/data
107
/html_docs
11-
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
12-
/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
13-
src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
14-
/src/legacy/ui/public/flot-charts
8+
/optimize
9+
/plugins
1510
/test/fixtures/scenarios
16-
/src/legacy/core_plugins/console/public/webpackShims
11+
/x-pack/build
12+
node_modules
13+
target
14+
15+
!/.eslintrc.js
16+
17+
# plugin overrides
18+
/src/core/lib/kbn_internal_native_observable
1719
/src/legacy/core_plugins/console/public/tests/webpackShims
18-
/src/legacy/ui/public/utils/decode_geo_hash.js
20+
/src/legacy/core_plugins/console/public/webpackShims
21+
/src/legacy/core_plugins/vis_type_timelion/public/_generated_/**
1922
/src/legacy/core_plugins/vis_type_timelion/public/webpackShims/jquery.flot.*
20-
/src/core/lib/kbn_internal_native_observable
21-
/packages/*/target
22-
/packages/eslint-config-kibana
23-
/packages/kbn-pm/dist
24-
/packages/kbn-plugin-generator/sao_template/template
25-
/packages/kbn-ui-framework/dist
26-
/packages/kbn-ui-framework/doc_site/build
27-
/packages/kbn-ui-framework/generator-kui/*/templates/
28-
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
29-
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
30-
/x-pack/legacy/plugins/maps/public/vendor/**
31-
/x-pack/coverage
32-
/x-pack/build
23+
/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
24+
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
25+
/src/legacy/ui/public/flot-charts
26+
/src/legacy/ui/public/utils/decode_geo_hash.js
27+
/src/plugins/data/common/es_query/kuery/ast/_generated_/**
3328
/x-pack/legacy/plugins/**/__tests__/fixtures/**
34-
/packages/kbn-interpreter/src/common/lib/grammar.js
29+
/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
3530
/x-pack/legacy/plugins/canvas/canvas_plugin
31+
/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
3632
/x-pack/legacy/plugins/canvas/shareable_runtime/build
3733
/x-pack/legacy/plugins/canvas/storybook
38-
/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts
3934
/x-pack/legacy/plugins/infra/common/graphql/types.ts
4035
/x-pack/legacy/plugins/infra/public/graphql/types.ts
4136
/x-pack/legacy/plugins/infra/server/graphql/types.ts
42-
/x-pack/legacy/plugins/apm/e2e/cypress/**/snapshots.js
43-
/src/legacy/plugin_discovery/plugin_pack/__tests__/fixtures/plugins/broken
44-
**/graphql/types.ts
45-
**/*.js.snap
46-
!/.eslintrc.js
37+
/x-pack/legacy/plugins/maps/public/vendor/**
38+
39+
# package overrides
40+
/packages/eslint-config-kibana
41+
/packages/kbn-interpreter/src/common/lib/grammar.js
42+
/packages/kbn-plugin-generator/sao_template/template
43+
/packages/kbn-pm/dist
44+
/packages/kbn-test/src/functional_test_runner/__tests__/fixtures/
45+
/packages/kbn-test/src/functional_test_runner/lib/config/__tests__/fixtures/
46+
/packages/kbn-ui-framework/dist
47+
/packages/kbn-ui-framework/doc_site/build
48+
/packages/kbn-ui-framework/generator-kui/*/templates/

‎Jenkinsfile‎

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,56 @@ library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

66
kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
7-
githubPr.withDefaultPrComments {
8-
catchError {
9-
retryable.enable()
10-
parallel([
11-
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
12-
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
13-
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
14-
// 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
15-
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
16-
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
17-
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
18-
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
19-
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
20-
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
21-
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
22-
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
23-
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
24-
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
25-
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
26-
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
27-
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
28-
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
29-
]),
30-
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
31-
// 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
32-
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
33-
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
34-
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
35-
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
36-
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
37-
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
38-
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
39-
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
40-
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
41-
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
42-
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.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-
},
7+
ciStats.trackBuild {
8+
githubPr.withDefaultPrComments {
9+
catchError {
10+
retryable.enable()
11+
parallel([
12+
'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
13+
'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
14+
'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
15+
// 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
16+
'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
17+
'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
18+
'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
19+
'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
20+
'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
21+
'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
22+
'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
23+
'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
24+
'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
25+
'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
26+
'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
27+
'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
28+
'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
29+
// 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
30+
]),
31+
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
32+
// 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
33+
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
34+
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
35+
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
36+
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
37+
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
38+
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
39+
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
40+
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
41+
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
42+
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
43+
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
44+
'xpack-siemCypress': { processNumber ->
45+
whenChanged(['x-pack/legacy/plugins/siem/', 'x-pack/test/siem_cypress/']) {
46+
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
47+
}
48+
},
4849

49-
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
50-
]),
51-
])
50+
// 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
51+
]),
52+
])
53+
}
5254
}
53-
}
5455

55-
retryable.printFlakyFailures()
56-
kibanaPipeline.sendMail()
56+
retryable.printFlakyFailures()
57+
kibanaPipeline.sendMail()
58+
}
5759
}

‎docs/CHANGELOG.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ See <<breaking-changes-7.7,breaking changes in 7.7>>.
4747
=== Known issues
4848

4949
SIEM::
50-
* When you deactivate an action within a rule, the rule fails {issue}620[#620]
51-
* When you add a timestamp to the PagerDuty action, the rule fails {issue}607[#607]
50+
* When you deactivate an action within a rule, the rule fails {issue}64870[#64870]
51+
* When you add a timestamp to the PagerDuty action, the rule fails {issue}64871[#64871]
5252

5353
[float]
5454
[[enhancement-7.7.0]]

‎docs/apm/api.asciidoc‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following Agent configuration APIs are available:
6060
======
6161

6262
`settings`::
63-
(required) Key/value object with settings and their corresponding value.
63+
(required) Key/value object with option name and option value.
6464

6565
`agent_name`::
6666
(optional) The agent name is used by the UI to determine which settings to display.
@@ -73,14 +73,14 @@ The following Agent configuration APIs are available:
7373
--------------------------------------------------
7474
PUT /api/apm/settings/agent-configuration
7575
{
76-
"service" : {
77-
"name" : "frontend",
78-
"environment" : "production"
76+
"service": {
77+
"name": "frontend",
78+
"environment": "production"
7979
},
80-
"settings" : {
81-
"transaction_sample_rate" : 0.4,
82-
"capture_body" : "off",
83-
"transaction_max_spans" : 500
80+
"settings": {
81+
"transaction_sample_rate": "0.4",
82+
"capture_body": "off",
83+
"transaction_max_spans": "500"
8484
},
8585
"agent_name": "nodejs"
8686
}
@@ -124,7 +124,7 @@ PUT /api/apm/settings/agent-configuration
124124
DELETE /api/apm/settings/agent-configuration
125125
{
126126
"service" : {
127-
"name" : "frontend",
127+
"name": "frontend",
128128
"environment": "production"
129129
}
130130
}
@@ -157,9 +157,9 @@ DELETE /api/apm/settings/agent-configuration
157157
"environment": "production"
158158
},
159159
"settings": {
160-
"transaction_sample_rate": 1,
160+
"transaction_sample_rate": "1",
161161
"capture_body": "off",
162-
"transaction_max_spans": 200
162+
"transaction_max_spans": "200"
163163
},
164164
"@timestamp": 1581934104843,
165165
"applied_by_agent": false,
@@ -171,9 +171,9 @@ DELETE /api/apm/settings/agent-configuration
171171
"name": "opbeans-go"
172172
},
173173
"settings": {
174-
"transaction_sample_rate": 1,
174+
"transaction_sample_rate": "1",
175175
"capture_body": "off",
176-
"transaction_max_spans": 300
176+
"transaction_max_spans": "300"
177177
},
178178
"@timestamp": 1581934111727,
179179
"applied_by_agent": false,
@@ -185,7 +185,7 @@ DELETE /api/apm/settings/agent-configuration
185185
"name": "frontend"
186186
},
187187
"settings": {
188-
"transaction_sample_rate": 1,
188+
"transaction_sample_rate": "1",
189189
},
190190
"@timestamp": 1582031336265,
191191
"applied_by_agent": false,
@@ -250,7 +250,7 @@ GET /api/apm/settings/agent-configuration
250250
"name": "frontend"
251251
},
252252
"settings": {
253-
"transaction_sample_rate": 1,
253+
"transaction_sample_rate": "1",
254254
},
255255
"@timestamp": 1582031336265,
256256
"applied_by_agent": false,
@@ -266,9 +266,9 @@ GET /api/apm/settings/agent-configuration
266266
--------------------------------------------------
267267
POST /api/apm/settings/agent-configuration/search
268268
{
269-
"etag" : "1e58c178efeebae15c25c539da740d21dee422fc",
269+
"etag": "1e58c178efeebae15c25c539da740d21dee422fc",
270270
"service" : {
271-
"name" : "frontend",
271+
"name": "frontend",
272272
"environment": "production"
273273
}
274274
}

0 commit comments

Comments
 (0)