Skip to content

Commit

Permalink
Merge branch 'master' into task/rename
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jul 8, 2020
2 parents 9de9bae + 203fde9 commit a45f795
Show file tree
Hide file tree
Showing 75 changed files with 8,153 additions and 393 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,33 @@

```typescript
UI_SETTINGS: {
META_FIELDS: string;
DOC_HIGHLIGHT: string;
QUERY_STRING_OPTIONS: string;
QUERY_ALLOW_LEADING_WILDCARDS: string;
SEARCH_QUERY_LANGUAGE: string;
SORT_OPTIONS: string;
COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: string;
COURIER_SET_REQUEST_PREFERENCE: string;
COURIER_CUSTOM_REQUEST_PREFERENCE: string;
COURIER_MAX_CONCURRENT_SHARD_REQUESTS: string;
COURIER_BATCH_SEARCHES: string;
SEARCH_INCLUDE_FROZEN: string;
HISTOGRAM_BAR_TARGET: string;
HISTOGRAM_MAX_BARS: string;
HISTORY_LIMIT: string;
SHORT_DOTS_ENABLE: string;
FORMAT_DEFAULT_TYPE_MAP: string;
FORMAT_NUMBER_DEFAULT_PATTERN: string;
FORMAT_PERCENT_DEFAULT_PATTERN: string;
FORMAT_BYTES_DEFAULT_PATTERN: string;
FORMAT_CURRENCY_DEFAULT_PATTERN: string;
FORMAT_NUMBER_DEFAULT_LOCALE: string;
TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: string;
TIMEPICKER_QUICK_RANGES: string;
INDEXPATTERN_PLACEHOLDER: string;
FILTERS_PINNED_BY_DEFAULT: string;
FILTERS_EDITOR_SUGGEST_VALUES: string;
readonly META_FIELDS: "metaFields";
readonly DOC_HIGHLIGHT: "doc_table:highlight";
readonly QUERY_STRING_OPTIONS: "query:queryString:options";
readonly QUERY_ALLOW_LEADING_WILDCARDS: "query:allowLeadingWildcards";
readonly SEARCH_QUERY_LANGUAGE: "search:queryLanguage";
readonly SORT_OPTIONS: "sort:options";
readonly COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: "courier:ignoreFilterIfFieldNotInIndex";
readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";
readonly HISTOGRAM_MAX_BARS: "histogram:maxBars";
readonly HISTORY_LIMIT: "history:limit";
readonly SHORT_DOTS_ENABLE: "shortDots:enable";
readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap";
readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern";
readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern";
readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern";
readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern";
readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale";
readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults";
readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges";
readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults";
readonly INDEXPATTERN_PLACEHOLDER: "indexPattern:placeholder";
readonly FILTERS_PINNED_BY_DEFAULT: "filters:pinnedByDefault";
readonly FILTERS_EDITOR_SUGGEST_VALUES: "filterEditor:suggestValues";
}
```
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,33 @@

```typescript
UI_SETTINGS: {
META_FIELDS: string;
DOC_HIGHLIGHT: string;
QUERY_STRING_OPTIONS: string;
QUERY_ALLOW_LEADING_WILDCARDS: string;
SEARCH_QUERY_LANGUAGE: string;
SORT_OPTIONS: string;
COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: string;
COURIER_SET_REQUEST_PREFERENCE: string;
COURIER_CUSTOM_REQUEST_PREFERENCE: string;
COURIER_MAX_CONCURRENT_SHARD_REQUESTS: string;
COURIER_BATCH_SEARCHES: string;
SEARCH_INCLUDE_FROZEN: string;
HISTOGRAM_BAR_TARGET: string;
HISTOGRAM_MAX_BARS: string;
HISTORY_LIMIT: string;
SHORT_DOTS_ENABLE: string;
FORMAT_DEFAULT_TYPE_MAP: string;
FORMAT_NUMBER_DEFAULT_PATTERN: string;
FORMAT_PERCENT_DEFAULT_PATTERN: string;
FORMAT_BYTES_DEFAULT_PATTERN: string;
FORMAT_CURRENCY_DEFAULT_PATTERN: string;
FORMAT_NUMBER_DEFAULT_LOCALE: string;
TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: string;
TIMEPICKER_QUICK_RANGES: string;
INDEXPATTERN_PLACEHOLDER: string;
FILTERS_PINNED_BY_DEFAULT: string;
FILTERS_EDITOR_SUGGEST_VALUES: string;
readonly META_FIELDS: "metaFields";
readonly DOC_HIGHLIGHT: "doc_table:highlight";
readonly QUERY_STRING_OPTIONS: "query:queryString:options";
readonly QUERY_ALLOW_LEADING_WILDCARDS: "query:allowLeadingWildcards";
readonly SEARCH_QUERY_LANGUAGE: "search:queryLanguage";
readonly SORT_OPTIONS: "sort:options";
readonly COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: "courier:ignoreFilterIfFieldNotInIndex";
readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";
readonly HISTOGRAM_MAX_BARS: "histogram:maxBars";
readonly HISTORY_LIMIT: "history:limit";
readonly SHORT_DOTS_ENABLE: "shortDots:enable";
readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap";
readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern";
readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern";
readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern";
readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern";
readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale";
readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults";
readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges";
readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults";
readonly INDEXPATTERN_PLACEHOLDER: "indexPattern:placeholder";
readonly FILTERS_PINNED_BY_DEFAULT: "filters:pinnedByDefault";
readonly FILTERS_EDITOR_SUGGEST_VALUES: "filterEditor:suggestValues";
}
```
1 change: 1 addition & 0 deletions src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ export const storybookAliases = {
infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
security_solution: 'x-pack/plugins/security_solution/scripts/storybook.js',
ui_actions_enhanced: 'x-pack/plugins/ui_actions_enhanced/scripts/storybook.js',
observability: 'x-pack/plugins/observability/scripts/storybook.js',
};
3 changes: 2 additions & 1 deletion src/plugins/data/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ export const UI_SETTINGS = {
FORMAT_NUMBER_DEFAULT_LOCALE: 'format:number:defaultLocale',
TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: 'timepicker:refreshIntervalDefaults',
TIMEPICKER_QUICK_RANGES: 'timepicker:quickRanges',
TIMEPICKER_TIME_DEFAULTS: 'timepicker:timeDefaults',
INDEXPATTERN_PLACEHOLDER: 'indexPattern:placeholder',
FILTERS_PINNED_BY_DEFAULT: 'filters:pinnedByDefault',
FILTERS_EDITOR_SUGGEST_VALUES: 'filterEditor:suggestValues',
};
} as const;
55 changes: 28 additions & 27 deletions src/plugins/data/public/public.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -1906,33 +1906,34 @@ export interface TimeRange {
//
// @public (undocumented)
export const UI_SETTINGS: {
META_FIELDS: string;
DOC_HIGHLIGHT: string;
QUERY_STRING_OPTIONS: string;
QUERY_ALLOW_LEADING_WILDCARDS: string;
SEARCH_QUERY_LANGUAGE: string;
SORT_OPTIONS: string;
COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: string;
COURIER_SET_REQUEST_PREFERENCE: string;
COURIER_CUSTOM_REQUEST_PREFERENCE: string;
COURIER_MAX_CONCURRENT_SHARD_REQUESTS: string;
COURIER_BATCH_SEARCHES: string;
SEARCH_INCLUDE_FROZEN: string;
HISTOGRAM_BAR_TARGET: string;
HISTOGRAM_MAX_BARS: string;
HISTORY_LIMIT: string;
SHORT_DOTS_ENABLE: string;
FORMAT_DEFAULT_TYPE_MAP: string;
FORMAT_NUMBER_DEFAULT_PATTERN: string;
FORMAT_PERCENT_DEFAULT_PATTERN: string;
FORMAT_BYTES_DEFAULT_PATTERN: string;
FORMAT_CURRENCY_DEFAULT_PATTERN: string;
FORMAT_NUMBER_DEFAULT_LOCALE: string;
TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: string;
TIMEPICKER_QUICK_RANGES: string;
INDEXPATTERN_PLACEHOLDER: string;
FILTERS_PINNED_BY_DEFAULT: string;
FILTERS_EDITOR_SUGGEST_VALUES: string;
readonly META_FIELDS: "metaFields";
readonly DOC_HIGHLIGHT: "doc_table:highlight";
readonly QUERY_STRING_OPTIONS: "query:queryString:options";
readonly QUERY_ALLOW_LEADING_WILDCARDS: "query:allowLeadingWildcards";
readonly SEARCH_QUERY_LANGUAGE: "search:queryLanguage";
readonly SORT_OPTIONS: "sort:options";
readonly COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: "courier:ignoreFilterIfFieldNotInIndex";
readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";
readonly HISTOGRAM_MAX_BARS: "histogram:maxBars";
readonly HISTORY_LIMIT: "history:limit";
readonly SHORT_DOTS_ENABLE: "shortDots:enable";
readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap";
readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern";
readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern";
readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern";
readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern";
readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale";
readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults";
readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges";
readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults";
readonly INDEXPATTERN_PLACEHOLDER: "indexPattern:placeholder";
readonly FILTERS_PINNED_BY_DEFAULT: "filters:pinnedByDefault";
readonly FILTERS_EDITOR_SUGGEST_VALUES: "filterEditor:suggestValues";
};


Expand Down
55 changes: 28 additions & 27 deletions src/plugins/data/server/server.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -767,33 +767,34 @@ export type TStrategyTypes = typeof ES_SEARCH_STRATEGY | string;
//
// @public (undocumented)
export const UI_SETTINGS: {
META_FIELDS: string;
DOC_HIGHLIGHT: string;
QUERY_STRING_OPTIONS: string;
QUERY_ALLOW_LEADING_WILDCARDS: string;
SEARCH_QUERY_LANGUAGE: string;
SORT_OPTIONS: string;
COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: string;
COURIER_SET_REQUEST_PREFERENCE: string;
COURIER_CUSTOM_REQUEST_PREFERENCE: string;
COURIER_MAX_CONCURRENT_SHARD_REQUESTS: string;
COURIER_BATCH_SEARCHES: string;
SEARCH_INCLUDE_FROZEN: string;
HISTOGRAM_BAR_TARGET: string;
HISTOGRAM_MAX_BARS: string;
HISTORY_LIMIT: string;
SHORT_DOTS_ENABLE: string;
FORMAT_DEFAULT_TYPE_MAP: string;
FORMAT_NUMBER_DEFAULT_PATTERN: string;
FORMAT_PERCENT_DEFAULT_PATTERN: string;
FORMAT_BYTES_DEFAULT_PATTERN: string;
FORMAT_CURRENCY_DEFAULT_PATTERN: string;
FORMAT_NUMBER_DEFAULT_LOCALE: string;
TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: string;
TIMEPICKER_QUICK_RANGES: string;
INDEXPATTERN_PLACEHOLDER: string;
FILTERS_PINNED_BY_DEFAULT: string;
FILTERS_EDITOR_SUGGEST_VALUES: string;
readonly META_FIELDS: "metaFields";
readonly DOC_HIGHLIGHT: "doc_table:highlight";
readonly QUERY_STRING_OPTIONS: "query:queryString:options";
readonly QUERY_ALLOW_LEADING_WILDCARDS: "query:allowLeadingWildcards";
readonly SEARCH_QUERY_LANGUAGE: "search:queryLanguage";
readonly SORT_OPTIONS: "sort:options";
readonly COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX: "courier:ignoreFilterIfFieldNotInIndex";
readonly COURIER_SET_REQUEST_PREFERENCE: "courier:setRequestPreference";
readonly COURIER_CUSTOM_REQUEST_PREFERENCE: "courier:customRequestPreference";
readonly COURIER_MAX_CONCURRENT_SHARD_REQUESTS: "courier:maxConcurrentShardRequests";
readonly COURIER_BATCH_SEARCHES: "courier:batchSearches";
readonly SEARCH_INCLUDE_FROZEN: "search:includeFrozen";
readonly HISTOGRAM_BAR_TARGET: "histogram:barTarget";
readonly HISTOGRAM_MAX_BARS: "histogram:maxBars";
readonly HISTORY_LIMIT: "history:limit";
readonly SHORT_DOTS_ENABLE: "shortDots:enable";
readonly FORMAT_DEFAULT_TYPE_MAP: "format:defaultTypeMap";
readonly FORMAT_NUMBER_DEFAULT_PATTERN: "format:number:defaultPattern";
readonly FORMAT_PERCENT_DEFAULT_PATTERN: "format:percent:defaultPattern";
readonly FORMAT_BYTES_DEFAULT_PATTERN: "format:bytes:defaultPattern";
readonly FORMAT_CURRENCY_DEFAULT_PATTERN: "format:currency:defaultPattern";
readonly FORMAT_NUMBER_DEFAULT_LOCALE: "format:number:defaultLocale";
readonly TIMEPICKER_REFRESH_INTERVAL_DEFAULTS: "timepicker:refreshIntervalDefaults";
readonly TIMEPICKER_QUICK_RANGES: "timepicker:quickRanges";
readonly TIMEPICKER_TIME_DEFAULTS: "timepicker:timeDefaults";
readonly INDEXPATTERN_PLACEHOLDER: "indexPattern:placeholder";
readonly FILTERS_PINNED_BY_DEFAULT: "filters:pinnedByDefault";
readonly FILTERS_EDITOR_SUGGEST_VALUES: "filterEditor:suggestValues";
};


Expand Down
3 changes: 1 addition & 2 deletions x-pack/plugins/apm/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import { i18n } from '@kbn/i18n';
import { lazy } from 'react';
import { euiThemeVars as theme } from '@kbn/ui-shared-deps/theme';
import { ConfigSchema } from '.';
import { ObservabilityPluginSetup } from '../../observability/public';
import {
Expand Down Expand Up @@ -83,7 +82,7 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
plugins.observability.dashboard.register({
appName: 'apm',
fetchData: async (params) => {
return fetchLandingPageData(params, { theme });
return fetchLandingPageData(params);
},
hasData,
});
Expand Down
Loading

0 comments on commit a45f795

Please sign in to comment.