Skip to content

Commit 3cf416f

Browse files
committed
Merge remote-tracking branch 'upstream/master' into EUIfication/options/timelion
2 parents a691c12 + 80b11a7 commit 3cf416f

File tree

445 files changed

+9928
-4672
lines changed

Some content is hidden

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

445 files changed

+9928
-4672
lines changed

.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: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,11 @@ jobs:
1111
uses: elastic/github-actions/[email protected]
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173897}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362}]'
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+
]
1521
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/[email protected]
1212
id: project_assigner
1313
with:
14-
issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}]'
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

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]
719 KB
Loading
17.3 KB
Loading
212 KB
Loading

docs/canvas/canvas-elements.asciidoc

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,80 +20,76 @@ When you add elements to your workpad, you can:
2020
[[add-canvas-element]]
2121
=== Add elements to your workpad
2222

23-
Choose the elements to display on your workpad, then familiarize yourself with the element using the preconfigured demo data.
23+
Choose the elements to display on your workpad, then familiarize yourself with the element using the preconfigured demo data. By default, every element you add to a workpad uses demo data until you change the data source. The demo data includes a small sample data set that you can use to experiment with your element.
2424

2525
. Click *Add element*.
2626

27-
. In the *Elements* window, select the element you want to use.
27+
. In the *Elements* window, select the element you want to use.
2828
+
2929
[role="screenshot"]
3030
image::images/canvas-element-select.gif[Canvas elements]
3131

32-
. Play around with the default settings and see what the element can do.
32+
. Play around with the default settings and see what the element can do.
3333

34-
TIP: Want to use a different element? You can delete the element by selecting it, clicking the *Element options* icon in the top right corner, then selecting *Delete*.
34+
TIP: Want to use a different element? You can delete the element by selecting it, clicking the *Element options* icon in the top right, then selecting *Delete*.
3535

3636
[float]
3737
[[connect-element-data]]
3838
=== Connect the element to your data
3939

40-
When you are ready to move on from the demo data, connect the element to your own data.
40+
When you have finished using the demo data, connect the element to a data source.
4141

4242
. Make sure that the element is selected, then select *Data*.
4343

4444
. Click *Change your data source*.
4545

4646
[float]
4747
[[elasticsearch-sql-data-source]]
48-
==== Connect to Elasticsearch SQL
48+
==== Connect to {es} SQL
4949

50-
Access your data in Elasticsearch using the Elasticsearch SQL syntax.
50+
Access your data in {es} using SQL syntax. For information about SQL syntax, refer to {ref}/sql-spec.html[SQL language].
5151

52-
Unfamiliar with writing Elasticsearch SQL queries? For more information, refer to {ref}/sql-spec.html[SQL language].
52+
. Click *{es} SQL*.
5353

54-
. Click *Elasticsearch SQL*.
54+
. In the *{es} SQL query* box, enter your query, then *Preview* it.
5555

56-
. In the *Elasticearch SQL query* box, enter your query, then *Preview* it.
57-
58-
. If everything looks correct, *Save* it.
56+
. If everything looks correct, *Save* it.
5957

6058
[float]
6159
[[elasticsearch-raw-doc-data-source]]
62-
==== Connect to Elasticsearch raw data
60+
==== Connect to {es} raw data
6361

64-
Use the Lucene query syntax to use your raw data in Elasticsearch.
62+
Access your raw data in {es} without the use of aggregations. Use {es} raw data when you have low volume datasets, or to plot exact, non-aggregated values.
6563

66-
For for more information about the Lucene query string sytax, refer to <<lucene-query,Lucene Query Syntax>>.
64+
To use targeted queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
6765

68-
. Click *Elasticsearch raw documents*.
66+
. Click *{es} raw documents*.
6967

70-
. In the *Index* field, enter the index pattern that you want to display.
68+
. In the *Index* field, enter the index pattern that you want to display.
7169

7270
. From the *Fields* dropdown, select the associated fields you want to display.
7371

7472
. To sort the data, select an option from the *Sort Field* and *Sort Order* dropdowns.
7573

76-
. For more targeted queries, enter a *Query* using the Lucene query string syntax.
74+
. For more targeted queries, enter a *Query* using the Lucene query string syntax.
7775

78-
. *Preview* the query.
76+
. *Preview* the query.
7977

80-
. If your query looks correct, *Save* it.
78+
. If your query looks correct, *Save* it.
8179

8280
[float]
8381
[[timelion-data-source]]
8482
==== Connect to Timelion
8583

86-
Use <<timelion,Timelion>> queries to use your time series data.
84+
Access your time series data using <<timelion,Timelion>> queries. To use Timelion queries, you can enter a query using the <<lucene-query,Lucene Query Syntax>>.
8785

8886
. Click *Timelion*.
8987

90-
. Enter a *Query* using the Lucene query string syntax.
91-
+
92-
For for more information about the Lucene query string syntax, refer to <<lucene-query,Lucene Query Syntax>>.
88+
. Enter a *Query* using the Lucene query string syntax.
9389

9490
. Enter the *Interval*, then *Preview* the query.
9591

96-
. If your query looks correct, *Save* it.
92+
. If your query looks correct, *Save* it.
9793

9894
[float]
9995
[[configure-display-options]]
@@ -109,7 +105,7 @@ When you connect your element to a data source, the element often appears as a w
109105

110106
. Click *Display*
111107

112-
. Change the display options for the element.
108+
. Change the display options for the element.
113109

114110
[float]
115111
[[element-display-container]]
@@ -122,7 +118,7 @@ Further define the appearance of the element container and border.
122118
. Expand *Container style*.
123119

124120
. Change the *Appearance* and *Border* options.
125-
121+
126122
[float]
127123
[[apply-element-styles]]
128124
==== Apply a set of styles
@@ -155,7 +151,7 @@ Increase or decrease how often your data refreshes on your workpad.
155151
[role="screenshot"]
156152
image::images/canvas-refresh-interval.png[Element data refresh interval]
157153

158-
TIP: To manually refresh the data, click the *Refresh data* icon.
154+
TIP: To manually refresh the data, click the *Refresh data* icon.
159155

160156
[float]
161157
[[organize-element]]
@@ -223,7 +219,7 @@ Change the order of how the elements are displayed on your workpad.
223219

224220
. Select an element.
225221

226-
. In the top right corder, click the *Element options* icon.
222+
. In the top right corder, click the *Element options* icon.
227223

228224
. Select *Order*, then select the order that you want the element to appear.
229225

@@ -262,7 +258,7 @@ When you have run out of room on your workpad page, add more pages.
262258

263259
. Click *Page 1*, then click *+*.
264260

265-
. On the *Page* editor panel on the right, select the page transition from the *Transition* dropdown.
261+
. On the *Page* editor panel on the right, select the page transition from the *Transition* dropdown.
266262
+
267263
[role="screenshot"]
268264
image::images/canvas-add-pages.gif[Add pages]

docs/development/core/public/kibana-plugin-public.httpservicebase.md

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

docs/development/core/public/kibana-plugin-public.httpservicebase.removeallinterceptors.md

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

0 commit comments

Comments
 (0)