diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts index b2e8641cd62f2..5f4c07ee6067c 100644 --- a/packages/kbn-doc-links/src/get_doc_links.ts +++ b/packages/kbn-doc-links/src/get_doc_links.ts @@ -64,6 +64,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => { }, discover: { guide: `${KIBANA_DOCS}discover.html`, + fieldStatistics: `${KIBANA_DOCS}show-field-statistics.html`, }, filebeat: { base: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}`, @@ -234,6 +235,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => { asyncSearch: `${ELASTICSEARCH_DOCS}async-search-intro.html`, dataStreams: `${ELASTICSEARCH_DOCS}data-streams.html`, deprecationLogging: `${ELASTICSEARCH_DOCS}logging.html#deprecation-logging`, + frozenIndices: `${ELASTICSEARCH_DOCS}frozen-indices.html`, hiddenIndices: `${ELASTICSEARCH_DOCS}multi-index.html#hidden`, ilm: `${ELASTICSEARCH_DOCS}index-lifecycle-management.html`, ilmForceMerge: `${ELASTICSEARCH_DOCS}ilm-forcemerge.html`, diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts index 51dd883211620..ea6a7bc3446e3 100644 --- a/src/plugins/data/server/plugin.ts +++ b/src/plugins/data/server/plugin.ts @@ -94,7 +94,7 @@ export class DataServerPlugin this.autocompleteService.setup(core); this.kqlTelemetryService.setup(core, { usageCollection }); - core.uiSettings.register(getUiSettings()); + core.uiSettings.register(getUiSettings(core.docLinks)); const searchSetup = this.searchService.setup(core, { bfetch, diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts index 19ecde71e6a19..4783223e49869 100644 --- a/src/plugins/data/server/ui_settings.ts +++ b/src/plugins/data/server/ui_settings.ts @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; import { schema } from '@kbn/config-schema'; -import { UiSettingsParams } from 'kibana/server'; +import type { DocLinksServiceSetup, UiSettingsParams } from 'kibana/server'; import { DEFAULT_QUERY_LANGUAGE, UI_SETTINGS } from '../common'; const luceneQueryLanguageLabel = i18n.translate('data.advancedSettings.searchQueryLanguageLucene', { @@ -31,7 +31,9 @@ const requestPreferenceOptionLabels = { }), }; -export function getUiSettings(): Record> { +export function getUiSettings( + docLinks: DocLinksServiceSetup +): Record> { return { [UI_SETTINGS.META_FIELDS]: { name: i18n.translate('data.advancedSettings.metaFieldsTitle', { @@ -71,7 +73,7 @@ export function getUiSettings(): Record> { 'data.advancedSettings.query.queryStringOptionsText', values: { optionsLink: - '' + + `` + i18n.translate('data.advancedSettings.query.queryStringOptions.optionsLinkText', { defaultMessage: 'Options', }) + @@ -150,7 +152,7 @@ export function getUiSettings(): Record> { 'data.advancedSettings.sortOptionsText', values: { optionsLink: - '' + + `` + i18n.translate('data.advancedSettings.sortOptions.optionsLinkText', { defaultMessage: 'Options', }) + @@ -232,7 +234,7 @@ export function getUiSettings(): Record> { setRequestReferenceSetting: `${UI_SETTINGS.COURIER_SET_REQUEST_PREFERENCE}`, customSettingValue: '"custom"', requestPreferenceLink: - '' + + `` + i18n.translate( 'data.advancedSettings.courier.customRequestPreference.requestPreferenceLinkText', { @@ -256,7 +258,7 @@ export function getUiSettings(): Record> { 'Controls the {maxRequestsLink} setting used for _msearch requests sent by Kibana. ' + 'Set to 0 to disable this config and use the Elasticsearch default.', values: { - maxRequestsLink: `max_concurrent_shard_requests`, }, }), @@ -265,7 +267,7 @@ export function getUiSettings(): Record> { }, [UI_SETTINGS.SEARCH_INCLUDE_FROZEN]: { name: 'Search in frozen indices', - description: `Will include frozen indices in results if enabled. Searching through frozen indices might increase the search time.`, value: false, @@ -444,7 +446,7 @@ export function getUiSettings(): Record> { 'data.advancedSettings.timepicker.quickRanges.acceptedFormatsLinkText', values: { acceptedFormatsLink: - `` + i18n.translate('data.advancedSettings.timepicker.quickRanges.acceptedFormatsLinkText', { defaultMessage: 'accepted formats', @@ -495,7 +497,7 @@ export function getUiSettings(): Record> { 'Elasticsearch terms aggregation. {learnMoreLink}', values: { learnMoreLink: - '' + + `` + i18n.translate('data.advancedSettings.autocompleteValueSuggestionMethodLink', { defaultMessage: 'Learn more.', }) + @@ -517,7 +519,7 @@ export function getUiSettings(): Record> { 'Disable this property to get autocomplete suggestions from your full dataset, rather than from the current time range. {learnMoreLink}', values: { learnMoreLink: - '' + + `` + i18n.translate('data.advancedSettings.autocompleteValueSuggestionMethodLearnMoreLink', { defaultMessage: 'Learn more.', }) + diff --git a/src/plugins/discover/server/plugin.ts b/src/plugins/discover/server/plugin.ts index 27cb3cec8be41..879b75986365b 100644 --- a/src/plugins/discover/server/plugin.ts +++ b/src/plugins/discover/server/plugin.ts @@ -14,7 +14,7 @@ import { searchSavedObjectType } from './saved_objects'; export class DiscoverServerPlugin implements Plugin { public setup(core: CoreSetup) { core.capabilities.registerProvider(capabilitiesProvider); - core.uiSettings.register(getUiSettings()); + core.uiSettings.register(getUiSettings(core.docLinks)); core.savedObjects.registerType(searchSavedObjectType); return {}; diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts index f35212ba43618..c9c9692e6986b 100644 --- a/src/plugins/discover/server/ui_settings.ts +++ b/src/plugins/discover/server/ui_settings.ts @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n'; import { schema } from '@kbn/config-schema'; -import { UiSettingsParams } from 'kibana/server'; +import type { DocLinksServiceSetup, UiSettingsParams } from 'kibana/server'; import { METRIC_TYPE } from '@kbn/analytics'; import { DEFAULT_COLUMNS_SETTING, @@ -31,7 +31,9 @@ import { ROW_HEIGHT_OPTION, } from '../common'; -export const getUiSettings: () => Record = () => ({ +export const getUiSettings: (docLinks: DocLinksServiceSetup) => Record = ( + docLinks: DocLinksServiceSetup +) => ({ [DEFAULT_COLUMNS_SETTING]: { name: i18n.translate('discover.advancedSettings.defaultColumnsTitle', { defaultMessage: 'Default columns', @@ -215,7 +217,7 @@ export const getUiSettings: () => Record = () => ({ defaultMessage: `Enable the {fieldStatisticsDocs} to show details such as the minimum and maximum values of a numeric field or a map of a geo field. This functionality is in beta and is subject to change.`, values: { fieldStatisticsDocs: - `` + i18n.translate('discover.advancedSettings.discover.fieldStatisticsLinkText', { defaultMessage: 'Field statistics view', @@ -240,7 +242,7 @@ export const getUiSettings: () => Record = () => ({ defaultMessage: `Controls whether {multiFields} display in the expanded document view. In most cases, multi-fields are the same as the original field. This option is only available when \`searchFieldsFromSource\` is off.`, values: { multiFields: - `` + i18n.translate('discover.advancedSettings.discover.multiFieldsLinkText', { defaultMessage: 'multi-fields',