Skip to content

Commit 89ad419

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-60790
2 parents 354cb14 + 55cbd5d commit 89ad419

774 files changed

Lines changed: 14646 additions & 6745 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/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md‎

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

99
```typescript
10-
FilterBar: React.ComponentClass<Pick<Props, "className" | "indexPatterns" | "filters" | "onFiltersUpdated">, any> & {
10+
FilterBar: React.ComponentClass<Pick<Props, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
1111
WrappedComponent: React.ComponentType<Props & ReactIntl.InjectedIntlProps>;
1212
}
1313
```

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

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

99
```typescript
10-
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
11-
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
10+
SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "filters" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
11+
WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
1212
}
1313
```

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"@elastic/charts": "^18.1.0",
119119
"@elastic/datemath": "5.0.2",
120120
"@elastic/ems-client": "7.7.0",
121-
"@elastic/eui": "20.0.2",
121+
"@elastic/eui": "21.0.1",
122122
"@elastic/filesaver": "1.1.2",
123123
"@elastic/good": "8.1.1-kibana2",
124124
"@elastic/numeral": "2.4.0",

‎packages/kbn-ui-shared-deps/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"devDependencies": {
1212
"abortcontroller-polyfill": "^1.4.0",
13-
"@elastic/eui": "20.0.2",
13+
"@elastic/eui": "21.0.1",
1414
"@kbn/babel-preset": "1.0.0",
1515
"@elastic/charts": "^18.1.0",
1616
"@kbn/dev-utils": "1.0.0",

‎src/legacy/core_plugins/telemetry/server/collection_manager.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import { encryptTelemetry } from './collectors';
2121
import { CallCluster } from '../../elasticsearch';
2222
import { UsageCollectionSetup } from '../../../../plugins/usage_collection/server';
23+
import { Cluster } from '../../elasticsearch';
2324
import { ESLicense } from './telemetry_collection/get_local_license';
2425

2526
export type EncryptedStatsGetterConfig = { unencrypted: false } & {
@@ -70,7 +71,7 @@ export type LicenseGetter = (
7071
interface CollectionConfig<T extends BasicStatsPayload> {
7172
title: string;
7273
priority: number;
73-
esCluster: string;
74+
esCluster: string | Cluster;
7475
statsGetter: StatsGetter<T>;
7576
clusterDetailsGetter: ClusterDetailsGetter;
7677
licenseGetter: LicenseGetter;
@@ -79,7 +80,7 @@ interface Collection {
7980
statsGetter: StatsGetter;
8081
licenseGetter: LicenseGetter;
8182
clusterDetailsGetter: ClusterDetailsGetter;
82-
esCluster: string;
83+
esCluster: string | Cluster;
8384
title: string;
8485
}
8586

@@ -135,9 +136,10 @@ export class TelemetryCollectionManager {
135136
): Promise<StatsCollectionConfig> => {
136137
const { start, end } = config;
137138
const server = config.unencrypted ? config.req.server : config.server;
138-
const { callWithRequest, callWithInternalUser } = server.plugins.elasticsearch.getCluster(
139-
collection.esCluster
140-
);
139+
const { callWithRequest, callWithInternalUser } =
140+
typeof collection.esCluster === 'string'
141+
? server.plugins.elasticsearch.getCluster(collection.esCluster)
142+
: collection.esCluster;
141143
const callCluster = config.unencrypted
142144
? (...args: any[]) => callWithRequest(config.req, ...args)
143145
: callWithInternalUser;

‎src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/legacy/server/status/constants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
* under the License.
1818
*/
1919

20-
export const KIBANA_STATS_TYPE = 'kibana_stats'; // kibana stats per 5s intervals
20+
export const KIBANA_STATS_TYPE = 'oss_kibana_stats'; // kibana stats per 5s intervals

‎src/plugins/advanced_settings/public/management_app/advanced_settings.tsx‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@
1919

2020
import React, { Component } from 'react';
2121
import { Subscription } from 'rxjs';
22-
import {
23-
Comparators,
24-
EuiFlexGroup,
25-
EuiFlexItem,
26-
EuiSpacer,
27-
// @ts-ignore
28-
Query,
29-
} from '@elastic/eui';
22+
import { Comparators, EuiFlexGroup, EuiFlexItem, EuiSpacer, Query } from '@elastic/eui';
3023

3124
import { useParams } from 'react-router-dom';
3225
import { CallOuts } from './components/call_outs';
@@ -38,7 +31,7 @@ import { ComponentRegistry } from '../';
3831

3932
import { getAriaName, toEditableConfig, DEFAULT_CATEGORY } from './lib';
4033

41-
import { FieldSetting, IQuery, SettingsChanges } from './types';
34+
import { FieldSetting, SettingsChanges } from './types';
4235

4336
interface AdvancedSettingsProps {
4437
enableSaving: boolean;
@@ -54,7 +47,7 @@ interface AdvancedSettingsComponentProps extends AdvancedSettingsProps {
5447

5548
interface AdvancedSettingsState {
5649
footerQueryMatched: boolean;
57-
query: IQuery;
50+
query: Query;
5851
filteredSettings: Record<string, FieldSetting[]>;
5952
}
6053

@@ -156,7 +149,7 @@ export class AdvancedSettingsComponent extends Component<
156149
}, {});
157150
}
158151

159-
onQueryChange = ({ query }: { query: IQuery }) => {
152+
onQueryChange = ({ query }: { query: Query }) => {
160153
this.setState({
161154
query,
162155
filteredSettings: this.mapSettings(Query.execute(query, this.settings)),

0 commit comments

Comments
 (0)