Skip to content

Commit 1dcca68

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into lens-do-not-save
2 parents f25b7fe + 672eac0 commit 1dcca68

1,101 files changed

Lines changed: 24422 additions & 12275 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.

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757
/x-pack/test/functional/services/transform_ui/ @elastic/ml-ui
5858
/x-pack/test/functional/services/transform.ts @elastic/ml-ui
5959

60+
# Maps
61+
/x-pack/legacy/plugins/maps/ @elastic/kibana-gis
62+
/x-pack/test/api_integration/apis/maps/ @elastic/kibana-gis
63+
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
64+
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
65+
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
66+
6067
# Operations
6168
/src/dev/ @elastic/kibana-operations
6269
/src/setup_node_env/ @elastic/kibana-operations

‎.github/workflows/pr-project-assigner.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v1.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]'
15-
ghToken: ${{ secrets.GITHUB_TOKEN }}
14+
issue-mappings: |
15+
[
16+
{ "label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173897 },
17+
{ "label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362 },
18+
{ "label": "Team:Platform", "projectName": "kibana-platform", "columnId": 5514360 },
19+
{"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187580}
20+
]
21+
ghToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/project-assigner.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: elastic/github-actions/project-assigner@v1.0.0
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]'
14+
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}, {"label": "Team:Canvas", "projectName": "canvas", "columnId": 6187593}]'
1515
ghToken: ${{ secrets.GITHUB_TOKEN }}
16-
16+
1717

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ disabledPlugins
2929
webpackstats.json
3030
/config/*
3131
!/config/kibana.yml
32-
!/config/apm.js
3332
coverage
3433
selenium
3534
.babel_register_cache.json

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.2
1+
10.18.0

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.15.2
1+
10.18.0

‎config/apm.js‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎docs/apm/advanced-queries.asciidoc‎

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
[[advanced-queries]]
22
=== Advanced queries
33

4-
When querying, you're simply searching and selecting data from fields in Elasticsearch documents.
5-
It may be helpful to view some of your documents in {kibana-ref}/discover.html[Discover] to better understand how APM data is stored in Elasticsearch.
6-
4+
When querying in the APM app, you're simply searching and selecting data from fields in Elasticsearch documents.
75
Queries entered into the query bar are also added as parameters to the URL,
86
so it's easy to share a specific query or view with others.
97

@@ -13,11 +11,48 @@ In the screenshot below, you can begin to see some of the transaction fields ava
1311
image::apm/images/apm-query-bar.png[Example of the Kibana Query bar in APM app in Kibana]
1412

1513
[float]
16-
==== Example queries
14+
==== Example APM app queries
1715

1816
* Exclude response times slower than 2000 ms: `transaction.duration.us > 2000000`
1917
* Filter by response status code: `context.response.status_code >= 400`
2018
* Filter by single user ID: `context.user.id : 12`
21-
* View _all_ transactions for an endpoint, instead of just a sample - `processor.event: "transaction" AND transaction.name: "<TRANSACTION_NAME_HERE>"`
2219

2320
TIP: Read the {kibana-ref}/kuery-query.html[Kibana Query Language Enhancements] documentation to learn more about the capabilities of the {kib} query language.
21+
22+
[float]
23+
[[discover-advanced-queries]]
24+
=== Querying in the Discover app
25+
26+
It may also be helpful to view your APM data in the {kibana-ref}/discover.html[Discover app].
27+
Querying documents in Discover works the same way as querying in the APM app,
28+
and all of the example queries listed above can also be used in the Discover app.
29+
30+
[float]
31+
==== Example Discover app query
32+
33+
One example where you may want to make use of the Discover app,
34+
is for viewing _all_ transactions for an endpoint, instead of just a sample.
35+
36+
TIP: Starting in v7.6, you can view 10 samples per bucket in the APM app, instead of just one.
37+
38+
Use the APM app to find a transaction name and time bucket that you're interested in learning more about.
39+
Then, switch to the Discover app and make a search:
40+
41+
["source","sh"]
42+
-----
43+
processor.event: "transaction" AND transaction.name: "<TRANSACTION_NAME_HERE>" and transaction.duration.us > 13000 and transaction.duration.us < 14000`
44+
-----
45+
46+
In this example, we're interested in viewing all of the `APIRestController#customers` transactions
47+
that took between 13 and 14 milliseconds. Here's what Discover returns:
48+
49+
[role="screenshot"]
50+
image::apm/images/advanced-discover.png[View all transactions in bucket]
51+
52+
You can now explore the data until you find a specific transaction that you're interested in.
53+
Copy that transaction's `transaction.id`, and paste it into the APM app to view the data in the context of the APM app:
54+
55+
[role="screenshot"]
56+
image::apm/images/specific-transaction-search.png[View specific transaction in apm app]
57+
[role="screenshot"]
58+
image::apm/images/specific-transaction.png[View specific transaction in apm app]

‎docs/apm/images/advanced-discover.png‎

719 KB
Loading

‎docs/apm/images/specific-transaction-search.png‎

17.3 KB
Loading

0 commit comments

Comments
 (0)