Skip to content

Commit f412fe8

Browse files
YulNaumenkoYulNaumenko
committed
Merge master
2 parents d99cf6b + 7debf4d commit f412fe8

2,049 files changed

Lines changed: 59386 additions & 33183 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: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,25 @@ kibanaPipeline(timeoutMinutes: 240) {
2323
}
2424

2525
def handleIngestion(timestamp) {
26+
def previousSha = handlePreviousSha()
2627
kibanaPipeline.downloadCoverageArtifacts()
2728
kibanaCoverage.prokLinks("### Process HTML Links")
2829
kibanaCoverage.collectVcsInfo("### Collect VCS Info")
2930
kibanaCoverage.generateReports("### Merge coverage reports")
3031
kibanaCoverage.uploadCombinedReports()
31-
kibanaCoverage.ingest(timestamp, '### Injest && Upload')
32+
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, '### Ingest && Upload')
3233
kibanaCoverage.uploadCoverageStaticSite(timestamp)
3334
}
3435

36+
def handlePreviousSha() {
37+
def previous = kibanaCoverage.downloadPrevious('### Download OLD Previous')
38+
kibanaCoverage.uploadPrevious('### Upload NEW Previous')
39+
return previous
40+
}
41+
3542
def handleFail() {
3643
def buildStatus = buildUtils.getBuildStatus()
37-
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED') {
44+
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
3845
slackNotifications.sendFailedBuild(
3946
channel: '#kibana-qa',
4047
username: 'Kibana QA'

‎.ci/end2end.groovy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pipeline {
1414
HOME = "${env.WORKSPACE}"
1515
E2E_DIR = 'x-pack/plugins/apm/e2e'
1616
PIPELINE_LOG_LEVEL = 'DEBUG'
17+
KBN_OPTIMIZER_THEMES = 'v7light'
1718
}
1819
options {
1920
timeout(time: 1, unit: 'HOURS')

‎.ci/es-snapshots/Jenkinsfile_build_es‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION
2525
timeout(time: 120, unit: 'MINUTES') {
2626
timestamps {
2727
ansiColor('xterm') {
28-
node(workers.label('s')) {
28+
node(workers.label('l')) {
2929
catchErrors {
3030
def VERSION
3131
def SNAPSHOT_ID
@@ -154,9 +154,10 @@ def buildArchives(destination) {
154154
"NODE_NAME=",
155155
]) {
156156
sh """
157-
./gradlew -p distribution/archives assemble --parallel
157+
./gradlew -Dbuild.docker=true assemble --parallel
158158
mkdir -p ${destination}
159-
find distribution/archives -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -exec cp {} ${destination} \\;
159+
find distribution -type f \\( -name 'elasticsearch-*-*-*-*.tar.gz' -o -name 'elasticsearch-*-*-*-*.zip' \\) -not -path *no-jdk* -not -path *build-context* -exec cp {} ${destination} \\;
160+
docker images "docker.elastic.co/elasticsearch/elasticsearch" --format "{{.Tag}}" | xargs -n1 bash -c 'docker save docker.elastic.co/elasticsearch/elasticsearch:\${0} | gzip > ${destination}/elasticsearch-\${0}-docker-image.tar.gz'
160161
"""
161162
}
162163
}

‎.fossa.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
2+
# Visit https://fossa.com to learn more
3+
4+
version: 2
5+
cli:
6+
server: https://app.fossa.com
7+
fetcher: custom
8+
project: kibana
9+
analyze:
10+
modules:
11+
- name: kibana
12+
type: nodejs
13+
strategy: yarn.lock
14+
target: .
15+
path: .

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
8585
/x-pack/plugins/ingest_manager/ @elastic/ingest-management
8686
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
87-
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest-management
87+
/x-pack/plugins/observability/ @elastic/observability-ui
8888
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
8989
/x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
9090
/x-pack/plugins/uptime @elastic/uptime
@@ -132,6 +132,7 @@
132132

133133
# Quality Assurance
134134
/src/dev/code_coverage @elastic/kibana-qa
135+
/vars/*Coverage.groovy @elastic/kibana-qa
135136
/test/functional/services/common @elastic/kibana-qa
136137
/test/functional/services/lib @elastic/kibana-qa
137138
/test/functional/services/remote @elastic/kibana-qa

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Delete any items that are not applicable to this PR.
1111
- [ ] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios
1212
- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
1313
- [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)
14-
- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)
14+
- [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
1515

1616
### For maintainers
1717

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ We are still to develop a proper process to accept any contributed translations.
436436

437437
When writing a new component, create a sibling SASS file of the same name and import directly into the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).
438438

439-
Any JavaScript (or TypeScript) file that imports SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`styling_constants.scss` file](https://github.com/elastic/kibana/blob/master/src/legacy/ui/public/styles/_styling_constants.scss). However, any Legacy (file path includes `/legacy`) files will not.
439+
All SASS (.scss) files will automatically build with the [EUI](https://elastic.github.io/eui/#/guidelines/sass) & Kibana invisibles (SASS variables, mixins, functions) from the [`globals_[theme].scss` file](src/legacy/ui/public/styles/_globals_v7light.scss).
440440

441441
**Example:**
442442

@@ -679,15 +679,15 @@ Part of this process only applies to maintainers, since it requires access to Gi
679679
Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases. The Release Notes summarize what the PRs accomplish in language that is meaningful to users. To generate the Release Notes, the team runs a script against this repo to collect the merged PRs against the release.
680680

681681
#### Create the Release Notes text
682-
The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description.
682+
The text that appears in the Release Notes is pulled directly from your PR title, or a single paragraph of text that you specify in the PR description.
683683

684684
To use a single paragraph of text, enter `Release note:` or a `## Release note` header in the PR description, followed by your text. For example, refer to this [PR](https://github.com/elastic/kibana/pull/65796) that uses the `## Release note` header.
685685

686686
When you create the Release Notes text, use the following best practices:
687-
* Use present tense.
687+
* Use present tense.
688688
* Use sentence case.
689689
* When you create a feature PR, start with `Adds`.
690-
* When you create an enhancement PR, start with `Improves`.
690+
* When you create an enhancement PR, start with `Improves`.
691691
* When you create a bug fix PR, start with `Fixes`.
692692
* When you create a deprecation PR, start with `Deprecates`.
693693

‎docs/api/using-api.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NOTE: The {kib} Console supports only Elasticsearch APIs. You are unable to inte
1010
[float]
1111
[[api-authentication]]
1212
=== Authentication
13-
{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console.
13+
{kib} supports token-based authentication with the same username and password that you use to log into the {kib} Console. In a given HTTP tool, and when available, you can select to use its 'Basic Authentication' option, which is where the username and password are stored in order to be passed as part of the call.
1414

1515
[float]
1616
[[api-calls]]

‎docs/apm/api.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ allowing you to easily see how these events are impacting the performance of you
355355

356356
By default, annotations are stored in a newly created `observability-annotations` index.
357357
The name of this index can be changed in your `config.yml` by editing `xpack.observability.annotations.index`.
358+
If you change the default index name, you'll also need to <<apm-app-annotation-user-create,update your user privileges>> accordingly.
358359

359360
The following APIs are available:
360361

‎docs/apm/apm-app-users.asciidoc‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:beat_default_index_prefix: apm
66
:beat_kib_app: APM app
7-
:annotation_index: `observability-annotations`
7+
:annotation_index: observability-annotations
88

99
++++
1010
<titleabbrev>Users and privileges</titleabbrev>
@@ -102,6 +102,54 @@ Here are two examples:
102102
*********************************** ***********************************
103103
////
104104

105+
[role="xpack"]
106+
[[apm-app-annotation-user-create]]
107+
=== APM app annotation user
108+
109+
++++
110+
<titleabbrev>Create an annotation user</titleabbrev>
111+
++++
112+
113+
NOTE: By default, the `apm_user` built-in role provides access to Observability annotations.
114+
You only need to create an annotation user if the default annotation index
115+
defined in <<apm-settings-kb,`xpack.observability.annotations.index`>> has been customized.
116+
117+
[[apm-app-annotation-user]]
118+
==== Annotation user
119+
120+
View deployment annotations in the APM app.
121+
122+
. Create a new role, named something like `annotation_user`,
123+
and assign the following privileges:
124+
+
125+
[options="header"]
126+
|====
127+
|Type | Privilege | Purpose
128+
129+
|Index
130+
|`read` on +\{ANNOTATION_INDEX\}+^1^
131+
|Read-only access to the observability annotation index
132+
133+
|Index
134+
|`view_index_metadata` on +\{ANNOTATION_INDEX\}+^1^
135+
|Read-only access to observability annotation index metadata
136+
|====
137+
+
138+
^1^ +\{ANNOTATION_INDEX\}+ should be the index name you've defined in
139+
<<apm-settings-kb,`xpack.observability.annotations.index`>>.
140+
141+
. Assign the `annotation_user` created previously, and the built-in roles necessary to create
142+
a <<apm-app-reader-full,full>> or <<apm-app-reader-partial,partial>> APM reader to any users that need to view annotations in the APM app
143+
144+
[[apm-app-annotation-api]]
145+
==== Annotation API
146+
147+
See <<apm-app-api-user>>.
148+
149+
////
150+
*********************************** ***********************************
151+
////
152+
105153
[role="xpack"]
106154
[[apm-app-central-config-user]]
107155
=== APM app central config user

0 commit comments

Comments
 (0)