Skip to content

Commit dd260b5

Browse files
vadimkibanavadimkibana
committed
Merge remote-tracking branch 'upstream/master' into dashboard-locator
2 parents 210cb48 + e806dde commit dd260b5

364 files changed

Lines changed: 6784 additions & 3080 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.

‎docs/developer/getting-started/monorepo-packages.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ yarn kbn watch-bazel
100100
- @kbn/server-http-tools
101101
- @kbn/server-route-repository
102102
- @kbn/std
103+
- @kbn/storybook
103104
- @kbn/telemetry-utils
104105
- @kbn/tinymath
105106
- @kbn/ui-shared-deps

‎docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,5 +185,18 @@ readonly links: {
185185
readonly plugins: Record<string, string>;
186186
readonly snapshotRestore: Record<string, string>;
187187
readonly ingest: Record<string, string>;
188+
readonly fleet: Readonly<{
189+
guide: string;
190+
fleetServer: string;
191+
fleetServerAddFleetServer: string;
192+
settings: string;
193+
settingsFleetServerHostSettings: string;
194+
troubleshooting: string;
195+
elasticAgent: string;
196+
datastreams: string;
197+
datastreamsNamingScheme: string;
198+
upgradeElasticAgent: string;
199+
upgradeElasticAgent712lower: string;
200+
}>;
188201
};
189202
```

‎docs/development/core/public/kibana-plugin-core-public.doclinksstart.md‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.getresolvedtimerange.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [getResolvedTimeRange](./kibana-plugin-plugins-data-public.aggconfigs.getresolvedtimerange.md)
4+
5+
## AggConfigs.getResolvedTimeRange() method
6+
7+
Returns the current time range as moment instance (date math will get resolved using the current "now" value or system time if not set)
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
getResolvedTimeRange(): import("../..").TimeRangeBounds | undefined;
13+
```
14+
<b>Returns:</b>
15+
16+
`import("../..").TimeRangeBounds | undefined`
17+
18+
Current time range as resolved date.
19+

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ export declare class AggConfigs
4242
| [getAll()](./kibana-plugin-plugins-data-public.aggconfigs.getall.md) | | |
4343
| [getRequestAggById(id)](./kibana-plugin-plugins-data-public.aggconfigs.getrequestaggbyid.md) | | |
4444
| [getRequestAggs()](./kibana-plugin-plugins-data-public.aggconfigs.getrequestaggs.md) | | |
45+
| [getResolvedTimeRange()](./kibana-plugin-plugins-data-public.aggconfigs.getresolvedtimerange.md) | | Returns the current time range as moment instance (date math will get resolved using the current "now" value or system time if not set) |
4546
| [getResponseAggById(id)](./kibana-plugin-plugins-data-public.aggconfigs.getresponseaggbyid.md) | | Find a response agg by it's id. This may be an agg in the aggConfigs, or one created specifically for a response value |
4647
| [getResponseAggs()](./kibana-plugin-plugins-data-public.aggconfigs.getresponseaggs.md) | | Gets the AggConfigs (and possibly ResponseAggConfigs) that represent the values that will be produced when all aggs are run.<!-- -->With multi-value metric aggs it is possible for a single agg request to result in multiple agg values, which is why the length of a vis' responseValuesAggs may be different than the vis' aggs {<!-- -->array\[AggConfig\]<!-- -->} |
4748
| [getSearchSourceTimeFilter(forceNow)](./kibana-plugin-plugins-data-public.aggconfigs.getsearchsourcetimefilter.md) | | |

‎docs/setup/settings.asciidoc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,9 @@ The time interval policy will rotate the log file every given interval of time.
325325
When `includeElasticMapsService` is turned off, only the vector layers configured by <<regionmap-settings, `map.regionmap`>>
326326
and the tile layer configured by <<tilemap-url, `map.tilemap.url`>> are available in <<maps, Maps>>. *Default: `true`*
327327

328+
| `map.emsUrl:`
329+
| Specifies the URL of a self hosted <<elastic-maps-server,{hosted-ems}>>
330+
328331
| `map.proxyElasticMapsServiceInMaps:`
329332
| Set to `true` to proxy all <<maps, Maps application>> Elastic Maps Service
330333
requests through the {kib} server. *Default: `false`*

‎docs/user/alerting/alerting-getting-started.asciidoc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,4 @@ Functionally, {kib} alerting differs in that:
136136
At a higher level, {kib} alerting allows rich integrations across use cases like <<xpack-apm,*APM*>>, <<metrics-app,*Metrics*>>, <<xpack-siem,*Security*>>, and <<uptime-app,*Uptime*>>.
137137
Pre-packaged *rule types* simplify setup and hide the details of complex, domain-specific detections, while providing a consistent interface across {kib}.
138138

139-
[float]
140-
[[alerting-setup-prerequisites]]
141-
== Prerequisites
142-
<<alerting-prerequisites, Alerting prerequisites>>
143-
144139
--

‎docs/user/alerting/alerting-setup.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[role="xpack"]
22
[[alerting-setup]]
3-
== Alerting Setup
3+
== Alerting Set up
44
++++
5-
<titleabbrev>Setup</titleabbrev>
5+
<titleabbrev>Set up</titleabbrev>
66
++++
77

88
The Alerting feature is automatically enabled in {kib}, but might require some additional configuration.

‎docs/user/alerting/defining-rules.asciidoc‎

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

‎docs/user/alerting/index.asciidoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
include::alerting-getting-started.asciidoc[]
22
include::alerting-setup.asciidoc[]
33
include::create-and-manage-rules.asciidoc[]
4-
include::defining-rules.asciidoc[]
5-
include::rule-management.asciidoc[]
64
include::rule-types.asciidoc[]
75
include::alerting-troubleshooting.asciidoc[]

0 commit comments

Comments
 (0)