Skip to content

Commit 600dde6

Browse files
sulemanofsulemanof
committed
Merge remote-tracking branch 'upstream/master' into shim/ensure_default_index
# Conflicts: # src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js # src/legacy/core_plugins/kibana/public/discover/kibana_services.ts # src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js # src/legacy/core_plugins/kibana/public/visualize/np_ready/editor/editor.js # src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js # src/plugins/kibana_utils/public/history/index.ts # src/plugins/kibana_utils/public/history/redirect_when_missing.tsx # src/plugins/kibana_utils/public/index.ts
2 parents 2f29a51 + eddbdc8 commit 600dde6

3,190 files changed

Lines changed: 66613 additions & 21273 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.

‎.eslintrc.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ module.exports = {
142142
},
143143
},
144144
{
145-
files: ['x-pack/legacy/plugins/ml/**/*.{js,ts,tsx}'],
145+
files: ['x-pack/plugins/ml/**/*.{js,ts,tsx}'],
146146
rules: {
147147
'react-hooks/exhaustive-deps': 'off',
148148
},
@@ -322,6 +322,7 @@ module.exports = {
322322
'x-pack/test/functional/apps/**/*.js',
323323
'x-pack/legacy/plugins/apm/**/*.js',
324324
'test/*/config.ts',
325+
'test/*/config_open.ts',
325326
'test/*/{tests,test_suites,apis,apps}/**/*',
326327
'test/visual_regression/tests/**/*',
327328
'x-pack/test/*/{tests,test_suites,apis,apps}/**/*',

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
/src/plugins/kibana_legacy/ @elastic/kibana-app
2727
/src/plugins/timelion/ @elastic/kibana-app
2828
/src/plugins/dev_tools/ @elastic/kibana-app
29-
/src/plugins/dashboard_embeddable_container/ @elastic/kibana-app
29+
/src/plugins/dashboard/ @elastic/kibana-app
3030

3131
# App Architecture
3232
/packages/kbn-interpreter/ @elastic/kibana-app-arch

‎.github/ISSUE_TEMPLATE/v8_breaking_change.md‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: 8.0 Breaking change
3+
about: Breaking changes from 7.x -> 8.0
4+
title: "[Breaking change]"
5+
labels: Team:Elasticsearch UI, Feature:Upgrade Assistant
6+
assignees: ''
7+
8+
---
9+
10+
## Change description
11+
12+
**Which release will ship the breaking change?**
13+
14+
<!-- e.g., v7.6.2 -->
15+
16+
**Describe the change. How will it manifest to users?**
17+
18+
**What percentage of users will be affected?**
19+
20+
<!-- e.g., Roughly 75% will need to make changes to x. -->
21+
22+
**What can users to do to address the change manually?**
23+
24+
<!-- If applicable, describe the manual workaround -->
25+
26+
**How could we make migration easier with the Upgrade Assistant?**
27+
28+
**Are there any edge cases?**
29+
30+
## Test Data
31+
32+
Provide test data. We can’t build a solution without data to test it against.
33+
34+
## Cross links
35+
36+
Cross-link to relevant [Elasticsearch breaking changes](https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-8.0.html).

‎.i18nrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"common.ui": "src/legacy/ui",
44
"console": "src/plugins/console",
55
"core": "src/core",
6-
"dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
6+
"dashboard": "src/plugins/dashboard",
77
"data": [
88
"src/legacy/core_plugins/data",
99
"src/plugins/data"

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ Bootstrap Kibana and install all the dependencies
171171
yarn kbn bootstrap
172172
```
173173

174+
> Node.js native modules could be in use and node-gyp is the tool used to build them. There are tools you need to install per platform and python versions you need to be using. Please see https://github.com/nodejs/node-gyp#installation and follow the guide according your platform.
175+
174176
(You can also run `yarn kbn` to see the other available commands. For more info about this tool, see https://github.com/elastic/kibana/tree/master/packages/kbn-pm.)
175177

176178
When switching branches which use different versions of npm packages you may need to run;

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
library 'kibana-pipeline-library'
44
kibanaLibrary.load()
55

6-
kibanaPipeline(timeoutMinutes: 135) {
6+
kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
77
githubPr.withDefaultPrComments {
88
catchError {
99
retryable.enable()

‎docs/apm/advanced-queries.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ When querying in the APM app, you're simply searching and selecting data from fi
55
Queries entered into the query bar are also added as parameters to the URL,
66
so it's easy to share a specific query or view with others.
77

8-
In the screenshot below, you can begin to see some of the transaction fields available for filtering on:
8+
You can begin to see some of the transaction fields available for filtering:
99

1010
[role="screenshot"]
1111
image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]

‎docs/apm/spans.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ This makes it useful for visualizing where the selected transaction spent most o
1212
image::apm/images/apm-transaction-sample.png[Example of distributed trace colors in the APM app in Kibana]
1313

1414
View a span in detail by clicking on it in the timeline waterfall.
15-
For example, in the below screenshot we've clicked on an SQL Select database query.
16-
The information displayed includes the actual SQL that was executed, how long it took,
15+
When you click on an SQL Select database query,
16+
the information displayed includes the actual SQL that was executed, how long it took,
1717
and the percentage of the trace's total time.
1818
You also get a stack trace, which shows the SQL query in your code.
1919
Finally, APM knows which files are your code and which are just modules or libraries that you've installed.
20-
These library frames will be minimized by default in order to show you the most relevant stack trace.
20+
These library frames will be minimized by default in order to show you the most relevant stack trace.
2121

2222
[role="screenshot"]
2323
image::apm/images/apm-span-detail.png[Example view of a span detail in the APM app in Kibana]

‎docs/apm/transactions.asciidoc‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ If there's a particular endpoint you're worried about, you can click on it to vi
5050
[IMPORTANT]
5151
====
5252
If you only see one route in the Transactions table, or if you have transactions named "unknown route",
53-
it could be a symptom that the agent either wasn't installed correctly or doesn't support your framework.
53+
it could be a symptom that the agent either wasn't installed correctly or doesn't support your framework.
5454
5555
For further details, including troubleshooting and custom implementation instructions,
5656
refer to the documentation for each {apm-agents-ref}[APM Agent] you've implemented.
@@ -103,9 +103,7 @@ The number of requests per bucket is displayed when hovering over the graph, and
103103
[role="screenshot"]
104104
image::apm/images/apm-transaction-duration-dist.png[Example view of transactions duration distribution graph]
105105

106-
Let's look at an example.
107-
In the screenshot below,
108-
you'll notice most of the requests fall into buckets on the left side of the graph,
106+
Most of the requests fall into buckets on the left side of the graph,
109107
with a long tail of smaller buckets to the right.
110108
This is a typical distribution, and indicates most of our requests were served quickly - awesome!
111109
It's the requests on the right, the ones taking longer than average, that we probably want to focus on.
@@ -133,4 +131,4 @@ For a particular transaction sample, we can get even more information in the *me
133131
* Custom - You can configure your agent to add custom contextual information on transactions.
134132

135133
TIP: All of this data is stored in documents in Elasticsearch.
136-
This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.
134+
This means you can select "Actions - View sample document" to see the actual Elasticsearch document under the discover tab.

0 commit comments

Comments
 (0)