Skip to content

Commit f2f52ee

Browse files
watsonwatson
committed
Merge branch 'master' into bump-node
2 parents 5a30a73 + bd99b19 commit f2f52ee

185 files changed

Lines changed: 4158 additions & 1428 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
138138
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
139139
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
140+
#CC# /src/plugins/maps_oss/ @elastic/kibana-gis
140141
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
141142
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
142143
#CC# /src/plugins/home/server/tutorials @elastic/kibana-gis

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export interface UiSettingsParams<T = unknown>
1919
| [category](./kibana-plugin-core-public.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
2020
| [deprecation](./kibana-plugin-core-public.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
2121
| [description](./kibana-plugin-core-public.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
22+
| [metric](./kibana-plugin-core-public.uisettingsparams.metric.md) | <code>{</code><br/><code> type: UiStatsMetricType;</code><br/><code> name: string;</code><br/><code> }</code> | Metric to track once this property changes |
2223
| [name](./kibana-plugin-core-public.uisettingsparams.name.md) | <code>string</code> | title in the UI |
2324
| [optionLabels](./kibana-plugin-core-public.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |
2425
| [options](./kibana-plugin-core-public.uisettingsparams.options.md) | <code>string[]</code> | array of permitted values for this setting |

‎docs/development/core/public/kibana-plugin-core-public.uisettingsparams.metric.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [UiSettingsParams](./kibana-plugin-core-public.uisettingsparams.md) &gt; [metric](./kibana-plugin-core-public.uisettingsparams.metric.md)
4+
5+
## UiSettingsParams.metric property
6+
7+
> Warning: This API is now obsolete.
8+
>
9+
> Temporary measure until https://github.com/elastic/kibana/issues/83084 is in place
10+
>
11+
12+
Metric to track once this property changes
13+
14+
<b>Signature:</b>
15+
16+
```typescript
17+
metric?: {
18+
type: UiStatsMetricType;
19+
name: string;
20+
};
21+
```

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export interface UiSettingsParams<T = unknown>
1919
| [category](./kibana-plugin-core-server.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
2020
| [deprecation](./kibana-plugin-core-server.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
2121
| [description](./kibana-plugin-core-server.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
22+
| [metric](./kibana-plugin-core-server.uisettingsparams.metric.md) | <code>{</code><br/><code> type: UiStatsMetricType;</code><br/><code> name: string;</code><br/><code> }</code> | Metric to track once this property changes |
2223
| [name](./kibana-plugin-core-server.uisettingsparams.name.md) | <code>string</code> | title in the UI |
2324
| [optionLabels](./kibana-plugin-core-server.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |
2425
| [options](./kibana-plugin-core-server.uisettingsparams.options.md) | <code>string[]</code> | array of permitted values for this setting |

‎docs/development/core/server/kibana-plugin-core-server.uisettingsparams.metric.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [UiSettingsParams](./kibana-plugin-core-server.uisettingsparams.md) &gt; [metric](./kibana-plugin-core-server.uisettingsparams.metric.md)
4+
5+
## UiSettingsParams.metric property
6+
7+
> Warning: This API is now obsolete.
8+
>
9+
> Temporary measure until https://github.com/elastic/kibana/issues/83084 is in place
10+
>
11+
12+
Metric to track once this property changes
13+
14+
<b>Signature:</b>
15+
16+
```typescript
17+
metric?: {
18+
type: UiStatsMetricType;
19+
name: string;
20+
};
21+
```

‎docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.getattributeservice.md‎

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

‎docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.embeddablesetup.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@
77
<b>Signature:</b>
88

99
```typescript
10-
export interface EmbeddableSetup
10+
export interface EmbeddableSetup extends PersistableStateService<EmbeddableStateWithType>
1111
```
1212
1313
## Properties
1414
1515
| Property | Type | Description |
1616
| --- | --- | --- |
17-
| [getAttributeService](./kibana-plugin-plugins-embeddable-server.embeddablesetup.getattributeservice.md) | <code>any</code> | |
1817
| [registerEmbeddableFactory](./kibana-plugin-plugins-embeddable-server.embeddablesetup.registerembeddablefactory.md) | <code>(factory: EmbeddableRegistryDefinition) =&gt; void</code> | |
1918
| [registerEnhancement](./kibana-plugin-plugins-embeddable-server.embeddablesetup.registerenhancement.md) | <code>(enhancement: EnhancementRegistryDefinition) =&gt; void</code> | |
2019

‎docs/settings/ssl-settings.asciidoc‎

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

‎src/core/public/chrome/ui/header/header_breadcrumbs.tsx‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
import { EuiHeaderBreadcrumbs } from '@elastic/eui';
20+
import { EuiFlexGroup, EuiHeaderBreadcrumbs } from '@elastic/eui';
2121
import classNames from 'classnames';
2222
import React from 'react';
2323
import useObservable from 'react-use/lib/useObservable';
@@ -51,15 +51,14 @@ export function HeaderBreadcrumbs({ appTitle$, breadcrumbs$, breadcrumbsAppendEx
5151
),
5252
}));
5353

54-
if (breadcrumbsAppendExtension) {
54+
if (breadcrumbsAppendExtension && crumbs[crumbs.length - 1]) {
5555
const lastCrumb = crumbs[crumbs.length - 1];
5656
lastCrumb.text = (
57-
<>
58-
{lastCrumb.text}
59-
<HeaderExtension extension={breadcrumbsAppendExtension.content} display={'inlineBlock'} />
60-
</>
57+
<EuiFlexGroup responsive={false} gutterSize={'none'} alignItems={'baseline'}>
58+
<div className="eui-textTruncate">{lastCrumb.text}</div>
59+
<HeaderExtension extension={breadcrumbsAppendExtension.content} />
60+
</EuiFlexGroup>
6161
);
6262
}
63-
6463
return <EuiHeaderBreadcrumbs breadcrumbs={crumbs} max={10} data-test-subj="breadcrumbs" />;
6564
}

‎src/core/public/public.api.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
3838
import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
3939
import { Type } from '@kbn/config-schema';
4040
import { TypeOf } from '@kbn/config-schema';
41+
import { UiStatsMetricType } from '@kbn/analytics';
4142
import { UnregisterCallback } from 'history';
4243
import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/types';
4344

@@ -1361,6 +1362,11 @@ export interface UiSettingsParams<T = unknown> {
13611362
// Warning: (ae-forgotten-export) The symbol "DeprecationSettings" needs to be exported by the entry point index.d.ts
13621363
deprecation?: DeprecationSettings;
13631364
description?: string;
1365+
// @deprecated
1366+
metric?: {
1367+
type: UiStatsMetricType;
1368+
name: string;
1369+
};
13641370
name?: string;
13651371
optionLabels?: Record<string, string>;
13661372
options?: string[];

0 commit comments

Comments
 (0)