Skip to content

Commit b9b8df0

Browse files
skhskh
committed
Merge branch 'feature-integrations-manager' into 40752-rewrite-ingest-pipeline
2 parents 7bc0bdc + ee2ecf4 commit b9b8df0

748 files changed

Lines changed: 90895 additions & 58792 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.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,5 @@ package-lock.json
4444
*.sublime-*
4545
npm-debug.log*
4646
.tern-project
47+
x-pack/legacy/plugins/apm/tsconfig.json
48+
apm.tsconfig.json

‎docs/development/core/server/kibana-plugin-server.basepath.get.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ returns `basePath` value, specific for an incoming request.
99
<b>Signature:</b>
1010

1111
```typescript
12-
get: (request: LegacyRequest | KibanaRequest<unknown, unknown, unknown>) => string;
12+
get: (request: KibanaRequest<unknown, unknown, unknown> | LegacyRequest) => string;
1313
```

‎docs/development/core/server/kibana-plugin-server.basepath.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ export declare class BasePath
1616

1717
| Property | Modifiers | Type | Description |
1818
| --- | --- | --- | --- |
19-
| [get](./kibana-plugin-server.basepath.get.md) | | <code>(request: LegacyRequest &#124; KibanaRequest&lt;unknown, unknown, unknown&gt;) =&gt; string</code> | returns <code>basePath</code> value, specific for an incoming request. |
19+
| [get](./kibana-plugin-server.basepath.get.md) | | <code>(request: KibanaRequest&lt;unknown, unknown, unknown&gt; &#124; LegacyRequest) =&gt; string</code> | returns <code>basePath</code> value, specific for an incoming request. |
2020
| [prepend](./kibana-plugin-server.basepath.prepend.md) | | <code>(path: string) =&gt; string</code> | Prepends <code>path</code> with the basePath. |
2121
| [remove](./kibana-plugin-server.basepath.remove.md) | | <code>(path: string) =&gt; string</code> | Removes the prepended basePath from the <code>path</code>. |
2222
| [serverBasePath](./kibana-plugin-server.basepath.serverbasepath.md) | | <code>string</code> | returns the server's basePath<!-- -->See [BasePath.get](./kibana-plugin-server.basepath.get.md) for getting the basePath value for a specific request |
23-
| [set](./kibana-plugin-server.basepath.set.md) | | <code>(request: LegacyRequest &#124; KibanaRequest&lt;unknown, unknown, unknown&gt;, requestSpecificBasePath: string) =&gt; void</code> | sets <code>basePath</code> value, specific for an incoming request. |
23+
| [set](./kibana-plugin-server.basepath.set.md) | | <code>(request: KibanaRequest&lt;unknown, unknown, unknown&gt; &#124; LegacyRequest, requestSpecificBasePath: string) =&gt; void</code> | sets <code>basePath</code> value, specific for an incoming request. |
2424

2525
## Remarks
2626

‎docs/development/core/server/kibana-plugin-server.basepath.set.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ sets `basePath` value, specific for an incoming request.
99
<b>Signature:</b>
1010

1111
```typescript
12-
set: (request: LegacyRequest | KibanaRequest<unknown, unknown, unknown>, requestSpecificBasePath: string) => void;
12+
set: (request: KibanaRequest<unknown, unknown, unknown> | LegacyRequest, requestSpecificBasePath: string) => void;
1313
```

‎docs/epm/index.asciidoc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[role="xpack"]
2+
[[epm]]
3+
== Elastic Package Manager
4+
5+
These are the docs for the Elastic Package Manager (EPM).

‎docs/getting-started/tutorial-dashboard.asciidoc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
=== Add visualizations to a dashboard
33

44
A dashboard is a collection of visualizations that you can arrange and share.
5-
You'll build a dashboard that contains the visualizations you saved during
5+
You'll build a dashboard that contains the visualizations and map that you saved during
66
this tutorial.
77

88
. Open *Dashboard*.
99
. On the Dashboard overview page, click *Create new dashboard*.
10+
. Set the time filter to May 18, 2015 to May 20, 2015.
1011
. Click *Add* in the menu bar.
1112
. Add *Bar Example*, *Map Example*, *Markdown Example*, and *Pie Example*.
1213
+
@@ -26,12 +27,12 @@ is on the lower right.
2627

2728
==== Inspect the data
2829

29-
Seeing visualizations of your data is great,
30+
Seeing visualizations of your data is great,
3031
but sometimes you need to look at the actual data to
3132
understand what's really going on. You can inspect the data behind any visualization
3233
and view the {es} query used to retrieve it.
3334

34-
. In the dashboard, hover the pointer over the pie chart, and then click the icon in the upper right.
35+
. In the dashboard, hover the pointer over the pie chart, and then click the icon in the upper right.
3536
. From the *Options* menu, select *Inspect*.
3637
+
3738
[role="screenshot"]

‎docs/getting-started/tutorial-visualizing.asciidoc‎

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
In the Visualize application, you can shape your data using a variety
55
of charts, tables, and maps, and more. In this tutorial, you'll create four
6-
visualizations:
6+
visualizations:
77

88
* <<tutorial-visualize-pie, Pie chart>>
99
* <<tutorial-visualize-bar, Bar chart>>
10-
* <<tutorial-visualize-map, Coordinate map>>
10+
* <<tutorial-visualize-map, Map>>
1111
* <<tutorial-visualize-markdown, Markdown widget>>
1212

1313
[float]
@@ -25,7 +25,7 @@ types in Kibana.
2525
image::images/tutorial-visualize-wizard-step-1.png[]
2626
. Click *Pie*.
2727

28-
. In *Choose a source*, select the `ba*` index pattern.
28+
. In *Choose a source*, select the `ba*` index pattern.
2929
+
3030
Initially, the pie contains a single "slice."
3131
That's because the default search matched all documents.
@@ -76,7 +76,7 @@ in a ring around the balance ranges.
7676
[role="screenshot"]
7777
image::images/tutorial-visualize-pie-3.png[]
7878

79-
. To save this chart so you can use it later, click *Save* in
79+
. To save this chart so you can use it later, click *Save* in
8080
the top menu bar and enter `Pie Example`.
8181

8282
[float]
@@ -123,29 +123,56 @@ you did at the beginning of the tutorial, when you marked the `play_name` field
123123
as `not analyzed`.
124124

125125
[float]
126-
[[tutorial-visualize-map]]
127-
=== Coordinate map
126+
[[tutorial-visualize-markdown]]
127+
=== Markdown
128128

129-
Using a coordinate map, you can visualize geographic information in the log file sample data.
129+
Create a Markdown widget to add formatted text to your dashboard.
130+
131+
. Create a *Markdown* visualization.
132+
. Copy the following text into the text box.
133+
+
134+
[source,markdown]
135+
# This is a tutorial dashboard!
136+
The Markdown widget uses **markdown** syntax.
137+
> Blockquotes in Markdown use the > character.
130138

131-
. Create a *Coordinate map* and set the search source to `logstash*`.
139+
. Click *Apply changes* image:images/apply-changes-button.png[].
132140
+
133-
You haven't defined any buckets yet, so the visualization is a map of the world.
141+
The Markdown renders in the preview pane.
142+
+
143+
[role="screenshot"]
144+
image::images/tutorial-visualize-md-2.png[]
145+
146+
. *Save* this visualization with the name `Markdown Example`.
147+
148+
[float]
149+
[[tutorial-visualize-map]]
150+
=== Map
151+
152+
Using <<maps>>, you can visualize geographic information in the log file sample data.
153+
154+
. Click *Maps* in the New Visualization
155+
menu to create a Map.
134156

135157
. Set the time.
136158
.. In the time filter, click *Show dates*.
137159
.. Click the start date, then *Absolute*.
138160
.. Set the *Start date* to May 18, 2015.
139161
.. In the time filter, click *now*, then *Absolute*.
140162
.. Set the *End date* to May 20, 2015.
163+
.. Click *Update*
141164

142165
. Map the geo coordinates from the log files.
143166

144-
.. In the *Buckets* pane, click *Add > Geo coordinates*.
145-
.. Set *Aggregation* to *Geohash*.
146-
.. Set *Field* to *geo.coordinates*.
167+
.. Click *Add layer*.
168+
.. Click the *Grid aggregation* data source.
169+
.. Set *Index pattern* to *logstash*.
170+
.. Click the *Add layer* button.
147171

148-
. Click *Apply changes* image:images/apply-changes-button.png[].
172+
. Set the layer style.
173+
.. For *Fill color*, select the yellow to red color ramp.
174+
.. For *Border color*, select white.
175+
.. Click *Save & close*.
149176
+
150177
The map now looks like this:
151178
+
@@ -155,26 +182,3 @@ image::images/tutorial-visualize-map-2.png[]
155182
. Navigate the map by clicking and dragging. Use the controls
156183
on the left to zoom the map and set filters.
157184
. *Save* this map with the name `Map Example`.
158-
159-
[float]
160-
[[tutorial-visualize-markdown]]
161-
=== Markdown
162-
163-
The final visualization is a Markdown widget that renders formatted text.
164-
165-
. Create a *Markdown* visualization.
166-
. Copy the following text into the text box.
167-
+
168-
[source,markdown]
169-
# This is a tutorial dashboard!
170-
The Markdown widget uses **markdown** syntax.
171-
> Blockquotes in Markdown use the > character.
172-
173-
. Click *Apply changes* image:images/apply-changes-button.png[].
174-
+
175-
The Markdown renders in the preview pane.
176-
+
177-
[role="screenshot"]
178-
image::images/tutorial-visualize-md-2.png[]
179-
180-
. *Save* this visualization with the name `Markdown Example`.

‎docs/images/tutorial-visualize-map-2.png‎

309 KB
Loading

‎docs/maps/maps-getting-started.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ the {es} index `kibana_sample_data_logs` on the shared key iso2 = geo.src.
8484
. Set *Right source* to *kibana_sample_data_logs*.
8585
. Set *Right field* to *geo.src*.
8686

87-
===== Set the vector style
87+
===== Set the layer style
8888

8989
All of the world countries are still a single color because the layer is using <<maps-vector-style-static, static styling>>.
9090
To shade the world countries based on which country is sending the most requests, you'll need to use <<maps-vector-style-data-driven, data driven styling>>.
@@ -161,9 +161,9 @@ image::maps/images/grid_metrics_both.png[]
161161
. Select *Sum* in the aggregation select.
162162
. Select *bytes* in the field select.
163163

164-
===== Set the vector style
164+
===== Set the layer style
165165

166-
. In *Vector style*, change *Symbol size*:
166+
. In *Layer style*, change *Symbol size*:
167167
.. Set *Min size* to 1.
168168
.. Set *Max size* to 25.
169169
.. In the field select, select *sum of bytes*.

‎docs/settings/apm-settings.asciidoc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ xpack.apm.ui.transactionGroupBucketSize:: Number of top transaction groups displ
2323

2424
xpack.apm.ui.maxTraceItems:: Max number of child items displayed when viewing trace details. Defaults to `1000`.
2525

26-
apm_oss.apmAgentConfigurationIndex:: Index containing agent configuration settings. Defaults to `.apm-agent-configuration`.
27-
2826
apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`.
2927

3028
apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-*`.
@@ -34,3 +32,8 @@ apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents.
3432
apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-*`.
3533

3634
apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-*`.
35+
36+
apm_oss.metricsIndices:: Matcher for indices containing metric documents. Defaults to `apm-*`.
37+
38+
apm_oss.sourcemapIndices:: Matcher for indices containing sourcemap documents. Defaults to `apm-*`.
39+

0 commit comments

Comments
 (0)