Skip to content

Commit 07aeb9b

Browse files
alisonelizabethalisonelizabeth
committed
Merge branch 'master' of github.com:elastic/kibana into feature/component_templates_list_view
2 parents 6378956 + eaca7ee commit 07aeb9b

3,825 files changed

Lines changed: 33499 additions & 14417 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_coverage‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ kibanaPipeline(timeoutMinutes: 240) {
1111
'CODE_COVERAGE=1', // Enables coverage. Needed for multiple ci scripts, such as remote.ts, test/scripts/*.sh, schema.js, etc.
1212
]) {
1313
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
14-
kibanaCoverage.runTests()
15-
handleIngestion(TIME_STAMP)
14+
catchError {
15+
kibanaCoverage.runTests()
16+
handleIngestion(TIME_STAMP)
17+
}
18+
handleFail()
1619
}
1720
}
1821
kibanaPipeline.sendMail()
@@ -29,4 +32,13 @@ def handleIngestion(timestamp) {
2932
kibanaCoverage.uploadCoverageStaticSite(timestamp)
3033
}
3134

35+
def handleFail() {
36+
def buildStatus = buildUtils.getBuildStatus()
37+
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
38+
slackNotifications.sendFailedBuild(
39+
channel: '#kibana-qa',
40+
username: 'Kibana QA'
41+
)
42+
}
43+
}
3244

‎.eslintrc.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ module.exports = {
225225
'!src/core/server/index.ts', // relative import
226226
'!src/core/server/mocks{,.ts}',
227227
'!src/core/server/types{,.ts}',
228-
'!src/core/server/test_utils',
228+
'!src/core/server/test_utils{,.ts}',
229229
// for absolute imports until fixed in
230230
// https://github.com/elastic/kibana/issues/36096
231231
'!src/core/server/*.test.mocks{,.ts}',
@@ -587,11 +587,11 @@ module.exports = {
587587
},
588588

589589
/**
590-
* SIEM overrides
590+
* Security Solution overrides
591591
*/
592592
{
593593
// front end typescript and javascript files only
594-
files: ['x-pack/plugins/siem/public/**/*.{js,ts,tsx}'],
594+
files: ['x-pack/plugins/security_solution/public/**/*.{js,ts,tsx}'],
595595
rules: {
596596
'import/no-nodejs-modules': 'error',
597597
'no-restricted-imports': [
@@ -605,7 +605,7 @@ module.exports = {
605605
},
606606
{
607607
// typescript only for front and back end
608-
files: ['x-pack/{,legacy/}plugins/siem/**/*.{ts,tsx}'],
608+
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{ts,tsx}'],
609609
rules: {
610610
// This will be turned on after bug fixes are complete
611611
// '@typescript-eslint/explicit-member-accessibility': 'warn',
@@ -640,7 +640,7 @@ module.exports = {
640640
// {
641641
// // will introduced after the other warns are fixed
642642
// // typescript and javascript for front end react performance
643-
// files: ['x-pack/plugins/siem/public/**/!(*.test).{js,ts,tsx}'],
643+
// files: ['x-pack/plugins/security_solution/public/**/!(*.test).{js,ts,tsx}'],
644644
// plugins: ['react-perf'],
645645
// rules: {
646646
// // 'react-perf/jsx-no-new-object-as-prop': 'error',
@@ -651,7 +651,7 @@ module.exports = {
651651
// },
652652
{
653653
// typescript and javascript for front and back end
654-
files: ['x-pack/{,legacy/}plugins/siem/**/*.{js,ts,tsx}'],
654+
files: ['x-pack/{,legacy/}plugins/security_solution/**/*.{js,ts,tsx}'],
655655
plugins: ['eslint-plugin-node', 'react'],
656656
env: {
657657
mocha: true,

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
/config/kibana.yml @elastic/kibana-platform
140140
/x-pack/plugins/features/ @elastic/kibana-platform
141141
/x-pack/plugins/licensing/ @elastic/kibana-platform
142+
/x-pack/plugins/global_search/ @elastic/kibana-platform
142143
/x-pack/plugins/cloud/ @elastic/kibana-platform
143144
/packages/kbn-config-schema/ @elastic/kibana-platform
144145
/src/legacy/server/config/ @elastic/kibana-platform
@@ -225,12 +226,12 @@
225226
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
226227
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
227228

228-
# SIEM
229-
/x-pack/plugins/siem/ @elastic/siem @elastic/endpoint-app-team
229+
# Security Solution
230+
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
230231
/x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
231-
/x-pack/test/api_integration/apis/siem @elastic/siem @elastic/endpoint-app-team
232+
/x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
232233
/x-pack/plugins/case @elastic/siem @elastic/endpoint-app-team
233234
/x-pack/plugins/lists @elastic/siem @elastic/endpoint-app-team
234235

235236
# Security Intelligence And Analytics
236-
/x-pack/plugins/siem/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
237+
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.19.0
1+
10.21.0

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.19.0
1+
10.21.0

‎.sass-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ files:
44
- 'src/legacy/core_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'
7-
- 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
87
- 'x-pack/plugins/canvas/**/*.s+(a|c)ss'
98
- 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
109
- 'x-pack/plugins/lens/**/*.s+(a|c)ss'
1110
- 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss'
1211
- 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
1312
- 'x-pack/plugins/maps/**/*.s+(a|c)ss'
1413
- 'x-pack/plugins/spaces/**/*.s+(a|c)ss'
14+
- 'x-pack/plugins/security/**/*.s+(a|c)ss'
1515
ignore:
1616
- 'x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
1717
rules:

‎Jenkinsfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true) {
4141
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
4242
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
4343
'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
44-
'xpack-siemCypress': { processNumber ->
45-
whenChanged(['x-pack/plugins/siem/', 'x-pack/test/siem_cypress/']) {
46-
kibanaPipeline.functionalTestProcess('xpack-siemCypress', './test/scripts/jenkins_siem_cypress.sh')(processNumber)
44+
'xpack-pageLoadMetrics': kibanaPipeline.functionalTestProcess('xpack-pageLoadMetrics', './test/scripts/jenkins_xpack_page_load_metrics.sh'),
45+
'xpack-securitySolutionCypress': { processNumber ->
46+
whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/']) {
47+
kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
4748
}
4849
},
4950

‎docs/apm/advanced-queries.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ or, to only show transactions that are slower than a specified time threshold.
1111
==== Example APM app queries
1212

1313
* Exclude response times slower than 2000 ms: `transaction.duration.us > 2000000`
14-
* Filter by response status code: `context.response.status_code >= 400`
14+
* Filter by response status code: `context.response.status_code ≥ 400`
1515
* Filter by single user ID: `context.user.id : 12`
1616

1717
When querying in the APM app, you're merely searching and selecting data from fields in Elasticsearch documents.

‎docs/apm/deployment-annotations.asciidoc‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,40 @@
77
++++
88

99
For enhanced visibility into your deployments, we offer deployment annotations on all transaction charts.
10-
This feature automatically tags new deployments, so you can easily see if your deploy has increased response times
11-
for an end-user, or if the memory/CPU footprint of your application has changed.
12-
Being able to identify bad deployments quickly enables you to rollback and fix issues without causing costly outages.
10+
This feature enables you to easily determine if your deployment has increased response times for an end-user,
11+
or if the memory/CPU footprint of your application has changed.
12+
Being able to quickly identify bad deployments enables you to rollback and fix issues without causing costly outages.
13+
14+
By default, automatic deployment annotations are enabled.
15+
This means the APM app will create an annotation on your data when the `service.version` of your application changes.
16+
17+
Alternatively, you can explicitly create deployment annotations with our annotation API.
18+
The API can integrate into your CI/CD pipeline,
19+
so that each time you deploy, a POST request is sent to the annotation API endpoint:
20+
21+
[source,console]
22+
----
23+
curl -X POST \
24+
http://localhost:5601/api/apm/services/${SERVICE_NAME}/annotation \ <1>
25+
-H 'Content-Type: application/json' \
26+
-H 'kbn-xsrf: true' \
27+
-H 'Authorization: Basic ${API_KEY}' \ <2>
28+
-d '{
29+
"@timestamp": "${DEPLOY_TIME}", <3>
30+
"service": {
31+
"version": "${SERVICE_VERSION}" <4>
32+
},
33+
"message": "${MESSAGE}" <5>
34+
}'
35+
----
36+
<1> The `service.name` of your application
37+
<2> An APM app API key with sufficient privileges
38+
<3> The time of the deployment
39+
<4> The `service.version` to be displayed in the annotation
40+
<5> A custom message to be displayed in the annotation
41+
42+
See the <<apm-annotation-api,annotation API>> reference for more information.
1343

14-
Deployment annotations are enabled by default, and can be created with the <<apm-annotation-api,annotation API>>.
15-
If there are no created annotations for the selected time period,
16-
the APM app will automatically annotate your data if the `service.version` of your application changes.
1744

1845
NOTE: If custom annotations have been created for the selected time period, any derived annotations, i.e., those created automatically when `service.version` changes, will not be shown.
1946

‎docs/apm/service-maps.asciidoc‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ Machine learning jobs can be created to calculate anomaly scores on APM transact
6262
When these jobs are active, service maps will display a color-coded anomaly indicator based on the detected anomaly score:
6363

6464
[horizontal]
65-
image:apm/images/green-service.png[APM green service]:: Max anomaly score **<=25**. Service is healthy.
65+
image:apm/images/green-service.png[APM green service]:: Max anomaly score **≤25**. Service is healthy.
6666
image:apm/images/yellow-service.png[APM yellow service]:: Max anomaly score **26-74**. Anomalous activity detected. Service may be degraded.
67-
image:apm/images/red-service.png[APM red service]:: Max anomaly score **>=75**. Anomalous activity detected. Service is unhealthy.
67+
image:apm/images/red-service.png[APM red service]:: Max anomaly score **≥75**. Anomalous activity detected. Service is unhealthy.
6868

6969
[role="screenshot"]
7070
image::apm/images/apm-service-map-anomaly.png[Example view of anomaly scores on service maps in the APM app]
@@ -92,10 +92,10 @@ Type and subtype are based on `span.type`, and `span.subtype`.
9292
Service maps are supported for the following Agent versions:
9393

9494
[horizontal]
95-
Go Agent:: >= v1.7.0
96-
Java Agent:: >= v1.13.0
97-
.NET Agent:: >= v1.3.0
98-
Node.js Agent:: >= v3.6.0
99-
Python Agent:: >= v5.5.0
100-
Ruby Agent:: >= v3.6.0
101-
Real User Monitoring (RUM) Agent:: >= v4.7.0
95+
Go Agent:: ≥ v1.7.0
96+
Java Agent:: ≥ v1.13.0
97+
.NET Agent:: ≥ v1.3.0
98+
Node.js Agent:: ≥ v3.6.0
99+
Python Agent:: ≥ v5.5.0
100+
Ruby Agent:: ≥ v3.6.0
101+
Real User Monitoring (RUM) Agent:: ≥ v4.7.0

0 commit comments

Comments
 (0)