diff --git a/docs/apm/agent-configuration.asciidoc b/docs/apm/agent-configuration.asciidoc index aaaca867a5a01..2574d254ac14c 100644 --- a/docs/apm/agent-configuration.asciidoc +++ b/docs/apm/agent-configuration.asciidoc @@ -46,7 +46,7 @@ Go Agent:: {apm-go-ref}/configuration.html[Configuration reference] Java Agent:: {apm-java-ref}/configuration.html[Configuration reference] .NET Agent:: {apm-dotnet-ref}/configuration.html[Configuration reference] Node.js Agent:: {apm-node-ref}/configuration.html[Configuration reference] -PHP Agent:: _Not yet supported_ +PHP Agent:: {apm-php-ref}/configuration.html[Configuration reference] Python Agent:: {apm-py-ref}/configuration.html[Configuration reference] Ruby Agent:: {apm-ruby-ref}/configuration.html[Configuration reference] Real User Monitoring (RUM) Agent:: {apm-rum-ref}/configuration.html[Configuration reference] diff --git a/docs/developer/getting-started/index.asciidoc b/docs/developer/getting-started/index.asciidoc index bc191fa828b58..5ab0581201959 100644 --- a/docs/developer/getting-started/index.asciidoc +++ b/docs/developer/getting-started/index.asciidoc @@ -12,8 +12,11 @@ In order to support Windows development we currently require you to use one of t - https://git-scm.com/download/win[Git bash] (other bash emulators like https://cmder.net/[Cmder] could work but we did not test them) - https://docs.microsoft.com/en-us/windows/wsl/about[WSL] -Before running the steps listed below, please make sure you have installed Git bash or WSL and that -you are running the mentioned commands through one of them. +As well as installing https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015]. + +Before running the steps listed below, please make sure you have installed everything +that we require and listed above and that you are running the mentioned commands +through Git bash or WSL. [discrete] [[get-kibana-code]] diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index c7fffb09248e9..64a62e3656784 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -392,6 +392,10 @@ actitivies. |The features plugin enhance Kibana with a per-feature privilege system. +|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer] +|WARNING: Missing README. + + |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload] |WARNING: Missing README. diff --git a/docs/settings/fleet-settings.asciidoc b/docs/settings/fleet-settings.asciidoc index 2d330445d9ced..9c054fbc00222 100644 --- a/docs/settings/fleet-settings.asciidoc +++ b/docs/settings/fleet-settings.asciidoc @@ -37,12 +37,10 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information. [cols="2*<"] |=== -| `xpack.fleet.agents.kibana.host` - | The hostname used by {agent} for accessing {kib}. +| `xpack.fleet.agents.fleet_server.hosts` + | Hostnames used by {agent} for accessing {fleet-server}. | `xpack.fleet.agents.elasticsearch.host` | The hostname used by {agent} for accessing {es}. -| `xpack.fleet.agents.tlsCheckDisabled` - | Set to `true` to allow {fleet} to run on a {kib} instance without TLS enabled. |=== [NOTE] diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc index a7af590136355..1b027739169ad 100644 --- a/docs/setup/settings.asciidoc +++ b/docs/setup/settings.asciidoc @@ -8,9 +8,10 @@ default it is in `$KIBANA_HOME/config`. By default, with package distributions (Debian or RPM), it is in `/etc/kibana`. The config directory can be changed via the `KBN_PATH_CONF` environment variable: -``` +[source,text] +-- KBN_PATH_CONF=/home/kibana/config ./bin/kibana -``` +-- The default host and port settings configure {kib} to run on `localhost:5601`. To change this behavior and allow remote users to connect, you'll need to update your `kibana.yml` file. You can also enable SSL and set a variety of other options. Finally, environment variables can be injected into @@ -281,7 +282,7 @@ To reload the logging settings, send a SIGHUP signal to {kib}. |=== |[[logging-root]] `logging.root:` -| The {kibana-ref}/logging-service.html#logging-service[`root` logger] has a dedicated configuration node since this context name is special and is pre-configured for logging by default. +| The {kibana-ref}/logging-service.html#logging-service[`root` logger] has a dedicated configuration node since this context name is special and is pre-configured for logging by default. // TODO: add link to the advanced logging documentation. |[[logging-root-appenders]] `logging.root.appenders:` @@ -313,7 +314,7 @@ To reload the logging settings, send a SIGHUP signal to {kib}. | Allows you to specify a fileName to send log records to on disk. To send <>, add the file appender to `root.appenders`. | `logging.appenders.rolling-file:` -| Similar to Log4j's `RollingFileAppender`, this appender will log into a file and rotate if following a rolling strategy when the configured policy triggers. There are currently two policies supported: `size-limit` and `time-interval`. +| Similar to Log4j's `RollingFileAppender`, this appender will log into a file and rotate if following a rolling strategy when the configured policy triggers. There are currently two policies supported: `size-limit` and `time-interval`. The size limit policy will perform a rollover when the log file reaches a maximum `size`. *Default 100mb* @@ -504,49 +505,39 @@ deprecation warning at startup. This setting cannot end in a slash (`/`). proxy sitting in front of it. This determines whether HTTP compression may be used for responses, based on the request `Referer` header. This setting may not be used when <> is set to `false`. *Default: `none`* - -a| [[server-securityResponseHeaders-strictTransportSecurity]] ----- -server.securityResponseHeaders: - strictTransportSecurity: ----- +[[server-securityResponseHeaders-strictTransportSecurity]] +a| +`server.securityResponseHeaders:` +`strictTransportSecurity:` | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security[`Strict-Transport-Security`] header is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are any text value or `null`. To disable, set to `null`. *Default:* `null` -a| [[server-securityResponseHeaders-xContentTypeOptions]] ----- -server.securityResponseHeaders: - xContentTypeOptions: ----- +[[server-securityResponseHeaders-xContentTypeOptions]] +a| `server.securityResponseHeaders:` +`xContentTypeOptions:` | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Content-Type-Options[`X-Content-Type-Options`] header is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are `nosniff` or `null`. To disable, set to `null`. *Default:* `"nosniff"` -a| [[server-securityResponseHeaders-referrerPolicy]] ----- -server.securityResponseHeaders: - referrerPolicy: ----- +[[server-securityResponseHeaders-referrerPolicy]] +a|`server.securityResponseHeaders:` +`referrerPolicy:` | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy[`Referrer-Policy`] header is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are `no-referrer`, `no-referrer-when-downgrade`, `origin`, `origin-when-cross-origin`, `same-origin`, `strict-origin`, `strict-origin-when-cross-origin`, `unsafe-url`, or `null`. To disable, set to `null`. *Default:* `"no-referrer-when-downgrade"` -a| [[server-securityResponseHeaders-permissionsPolicy]] ----- -server.securityResponseHeaders: - permissionsPolicy: ----- +[[server-securityResponseHeaders-permissionsPolicy]] +a|`server.securityResponseHeaders:` +`permissionsPolicy:` | experimental[] Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Feature-Policy[`Permissions-Policy`] header is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are any text value or `null`. To disable, set to `null`. *Default:* `null` -a| [[server-securityResponseHeaders-disableEmbedding]] ----- -server.securityResponseHeaders: - disableEmbedding: ----- +[[server-securityResponseHeaders-disableEmbedding]] +a|`server.securityResponseHeaders:` +`disableEmbedding:` | Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy[`Content-Security-Policy`] and https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options[`X-Frame-Options`] headers are configured to disable embedding {kib} in other webpages using iframes. When set to `true`, secure headers are used to disable embedding, which adds the `frame-ancestors: @@ -557,6 +548,9 @@ SAMEORIGIN` response header. *Default:* `false` | Header names and values to send on all responses to the client from the {kib} server. *Default: `{}`* +|[[server-shutdownTimeout]] `server.shutdownTimeout:` +| Sets the grace period for {kib} to attempt to resolve any ongoing HTTP requests after receiving a `SIGTERM`/`SIGINT` signal, and before shutting down. Any new HTTP requests received during this period are rejected with a `503` response. *Default: `30s`* + |[[server-host]] `server.host:` | This setting specifies the host of the back end server. To allow remote users to connect, set the value to the IP address or DNS name of the {kib} server. *Default: `"localhost"`* diff --git a/package.json b/package.json index 73cfa96d3e575..01ac344158014 100644 --- a/package.json +++ b/package.json @@ -427,7 +427,7 @@ "@babel/runtime": "^7.12.5", "@babel/traverse": "^7.12.12", "@babel/types": "^7.12.12", - "@bazel/ibazel": "^0.14.0", + "@bazel/ibazel": "^0.15.10", "@bazel/typescript": "^3.2.3", "@cypress/snapshot": "^2.1.7", "@cypress/webpack-preprocessor": "^5.6.0", diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml index f42ca7451601b..1d19387494136 100644 --- a/packages/kbn-optimizer/limits.yml +++ b/packages/kbn-optimizer/limits.yml @@ -9,7 +9,7 @@ pageLoadAssetSize: charts: 195358 cloud: 21076 console: 46091 - core: 397521 + core: 413500 crossClusterReplication: 65408 dashboard: 374194 dashboardEnhanced: 65646 @@ -106,6 +106,7 @@ pageLoadAssetSize: indexPatternFieldEditor: 90489 osquery: 107090 fileUpload: 25664 + fileDataVisualizer: 27530 banners: 17946 mapsEms: 26072 timelines: 28613 diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index e6cdd52686656..c0afb92b859cd 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -48512,7 +48512,13 @@ async function runBazel(bazelArgs, offline = false, runOpts = {}) { await runBazelCommandWithRunner('bazel', bazelArgs, offline, runOpts); } async function runIBazel(bazelArgs, offline = false, runOpts = {}) { - await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts); + const extendedEnv = _objectSpread({ + IBAZEL_USE_LEGACY_WATCHER: '0' + }, runOpts === null || runOpts === void 0 ? void 0 : runOpts.env); + + await runBazelCommandWithRunner('ibazel', bazelArgs, offline, _objectSpread(_objectSpread({}, runOpts), {}, { + env: extendedEnv + })); } /***/ }), @@ -59743,7 +59749,7 @@ const WatchBazelCommand = { // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment - await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build'], runOffline); + await Object(_utils_bazel__WEBPACK_IMPORTED_MODULE_0__["runIBazel"])(['--run_output=false', 'build', '//packages:build', '--show_result=1'], runOffline); } }; diff --git a/packages/kbn-pm/src/commands/watch_bazel.ts b/packages/kbn-pm/src/commands/watch_bazel.ts index 1273562dd2511..6d57ce66854fd 100644 --- a/packages/kbn-pm/src/commands/watch_bazel.ts +++ b/packages/kbn-pm/src/commands/watch_bazel.ts @@ -20,6 +20,9 @@ export const WatchBazelCommand: ICommand = { // // Note: --run_output=false arg will disable the iBazel notifications about gazelle and buildozer when running it // Can also be solved by adding a root `.bazel_fix_commands.json` but its not needed at the moment - await runIBazel(['--run_output=false', 'build', '//packages:build'], runOffline); + await runIBazel( + ['--run_output=false', 'build', '//packages:build', '--show_result=1'], + runOffline + ); }, }; diff --git a/packages/kbn-pm/src/utils/bazel/run.ts b/packages/kbn-pm/src/utils/bazel/run.ts index 34718606db98e..7b20ea43982e6 100644 --- a/packages/kbn-pm/src/utils/bazel/run.ts +++ b/packages/kbn-pm/src/utils/bazel/run.ts @@ -71,5 +71,6 @@ export async function runIBazel( offline: boolean = false, runOpts: execa.Options = {} ) { - await runBazelCommandWithRunner('ibazel', bazelArgs, offline, runOpts); + const extendedEnv = { IBAZEL_USE_LEGACY_WATCHER: '0', ...runOpts?.env }; + await runBazelCommandWithRunner('ibazel', bazelArgs, offline, { ...runOpts, env: extendedEnv }); } diff --git a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap index d0374511515d1..801fa452e8332 100644 --- a/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap +++ b/src/core/public/i18n/__snapshots__/i18n_service.test.tsx.snap @@ -6,27 +6,57 @@ exports[`#start() returns \`Context\` component 1`] = ` i18n={ Object { "mapping": Object { + "euiAccordion.isLoading": "Loading", "euiBasicTable.selectAllRows": "Select all rows", "euiBasicTable.selectThisRow": "Select this row", - "euiBasicTable.tableDescription": [Function], - "euiBottomBar.screenReaderAnnouncement": "There is a new menu opening with page level controls at the end of the document.", - "euiBreadcrumbs.collapsedBadge.ariaLabel": "Show all breadcrumbs", + "euiBasicTable.tableAutoCaptionWithPagination": [Function], + "euiBasicTable.tableAutoCaptionWithoutPagination": [Function], + "euiBasicTable.tableCaptionWithPagination": [Function], + "euiBasicTable.tablePagination": [Function], + "euiBasicTable.tableSimpleAutoCaptionWithPagination": [Function], + "euiBottomBar.customScreenReaderAnnouncement": [Function], + "euiBottomBar.screenReaderAnnouncement": "There is a new region landmark with page level controls at the end of the document.", + "euiBottomBar.screenReaderHeading": "Page level controls", + "euiBreadcrumbs.collapsedBadge.ariaLabel": "Show collapsed breadcrumbs", "euiCardSelect.select": "Select", "euiCardSelect.selected": "Selected", "euiCardSelect.unavailable": "Unavailable", "euiCodeBlock.copyButton": "Copy", + "euiCodeBlock.fullscreenCollapse": "Collapse", + "euiCodeBlock.fullscreenExpand": "Expand", "euiCodeEditor.startEditing": "Press Enter to start editing.", "euiCodeEditor.startInteracting": "Press Enter to start interacting with the code.", "euiCodeEditor.stopEditing": "When you're done, press Escape to stop editing.", "euiCodeEditor.stopInteracting": "When you're done, press Escape to stop interacting with the code.", "euiCollapsedItemActions.allActions": "All actions", + "euiCollapsibleNav.closeButtonLabel": "close", + "euiColorPicker.alphaLabel": "Alpha channel (opacity) value", + "euiColorPicker.closeLabel": "Press the down key to open a popover containing color options", + "euiColorPicker.colorErrorMessage": "Invalid color value", + "euiColorPicker.colorLabel": "Color value", + "euiColorPicker.openLabel": "Press the escape key to close the popover", "euiColorPicker.screenReaderAnnouncement": "A popup with a range of selectable colors opened. Tab forward to cycle through colors choices or press escape to close this popup.", "euiColorPicker.swatchAriaLabel": [Function], + "euiColorPicker.transparent": "Transparent", + "euiColorStopThumb.buttonAriaLabel": "Press the Enter key to modify this stop. Press Escape to focus the group", + "euiColorStopThumb.buttonTitle": "Click to edit, drag to reposition", "euiColorStopThumb.removeLabel": "Remove this stop", "euiColorStopThumb.screenReaderAnnouncement": "A popup with a color stop edit form opened. Tab forward to cycle through form controls or press escape to close this popup.", + "euiColorStopThumb.stopErrorMessage": "Value is out of range", + "euiColorStopThumb.stopLabel": "Stop value", "euiColorStops.screenReaderAnnouncement": [Function], + "euiColumnActions.moveLeft": "Move left", + "euiColumnActions.moveRight": "Move right", + "euiColumnActions.sort": [Function], + "euiColumnSelector.button": "Columns", + "euiColumnSelector.buttonActivePlural": [Function], + "euiColumnSelector.buttonActiveSingular": [Function], "euiColumnSelector.hideAll": "Hide all", + "euiColumnSelector.search": "Search", + "euiColumnSelector.searchcolumns": "Search columns", "euiColumnSelector.selectAll": "Show all", + "euiColumnSorting.button": "Sort fields", + "euiColumnSorting.buttonActive": "fields sorted", "euiColumnSorting.clearAll": "Clear sorting", "euiColumnSorting.emptySorting": "Currently no fields are sorted", "euiColumnSorting.pickFields": "Pick fields to sort by", @@ -39,15 +69,25 @@ exports[`#start() returns \`Context\` component 1`] = ` "euiComboBoxOptionsList.allOptionsSelected": "You've selected all available options", "euiComboBoxOptionsList.alreadyAdded": [Function], "euiComboBoxOptionsList.createCustomOption": [Function], + "euiComboBoxOptionsList.delimiterMessage": [Function], "euiComboBoxOptionsList.loadingOptions": "Loading options", "euiComboBoxOptionsList.noAvailableOptions": "There aren't any options available", "euiComboBoxOptionsList.noMatchingOptions": [Function], "euiComboBoxPill.removeSelection": [Function], "euiCommonlyUsedTimeRanges.legend": "Commonly used", + "euiDataGrid.ariaLabel": [Function], + "euiDataGrid.ariaLabelGridPagination": [Function], + "euiDataGrid.ariaLabelledBy": [Function], + "euiDataGrid.ariaLabelledByGridPagination": "Pagination for preceding grid", + "euiDataGrid.fullScreenButton": "Full screen", + "euiDataGrid.fullScreenButtonActive": "Exit full screen", "euiDataGrid.screenReaderNotice": "Cell contains interactive content.", - "euiDataGridCell.expandButtonTitle": "Click or hit enter to interact with cell content", - "euiDataGridSchema.booleanSortTextAsc": "True-False", - "euiDataGridSchema.booleanSortTextDesc": "False-True", + "euiDataGridCell.column": "Column", + "euiDataGridCell.row": "Row", + "euiDataGridCellButtons.expandButtonTitle": "Click or hit enter to interact with cell content", + "euiDataGridHeaderCell.headerActions": "Header actions", + "euiDataGridSchema.booleanSortTextAsc": "False-True", + "euiDataGridSchema.booleanSortTextDesc": "True-False", "euiDataGridSchema.currencySortTextAsc": "Low-High", "euiDataGridSchema.currencySortTextDesc": "High-Low", "euiDataGridSchema.dateSortTextAsc": "New-Old", @@ -56,22 +96,56 @@ exports[`#start() returns \`Context\` component 1`] = ` "euiDataGridSchema.jsonSortTextDesc": "Large-Small", "euiDataGridSchema.numberSortTextAsc": "Low-High", "euiDataGridSchema.numberSortTextDesc": "High-Low", + "euiFieldPassword.maskPassword": "Mask password", + "euiFieldPassword.showPassword": "Show password as plain text. Note: this will visually expose your password on the screen.", + "euiFilePicker.clearSelectedFiles": "Clear selected files", + "euiFilePicker.filesSelected": "files selected", "euiFilterButton.filterBadge": [Function], - "euiForm.addressFormErrors": "Please address the errors in your form.", + "euiFlyout.closeAriaLabel": "Close this dialog", + "euiForm.addressFormErrors": "Please address the highlighted errors.", "euiFormControlLayoutClearButton.label": "Clear input", "euiHeaderAlert.dismiss": "Dismiss", - "euiHeaderLinks.appNavigation": "App navigation", - "euiHeaderLinks.openNavigationMenu": "Open navigation menu", + "euiHeaderLinks.appNavigation": "App menu", + "euiHeaderLinks.openNavigationMenu": "Open menu", "euiHue.label": "Select the HSV color mode \\"hue\\" value", "euiImage.closeImage": [Function], "euiImage.openImage": [Function], "euiLink.external.ariaLabel": "External link", + "euiLink.newTarget.screenReaderOnlyText": "(opens in a new tab or window)", + "euiMarkdownEditorFooter.closeButton": "Close", + "euiMarkdownEditorFooter.descriptionPrefix": "This editor uses", + "euiMarkdownEditorFooter.descriptionSuffix": "You can also utilize these additional syntax plugins to add rich content to your text.", + "euiMarkdownEditorFooter.errorsTitle": "Errors", + "euiMarkdownEditorFooter.openUploadModal": "Open upload files modal", + "euiMarkdownEditorFooter.showMarkdownHelp": "Show markdown help", + "euiMarkdownEditorFooter.showSyntaxErrors": "Show errors", + "euiMarkdownEditorFooter.supportedFileTypes": [Function], + "euiMarkdownEditorFooter.syntaxTitle": "Syntax help", + "euiMarkdownEditorFooter.unsupportedFileType": "File type not supported", + "euiMarkdownEditorFooter.uploadingFiles": "Click to upload files", + "euiMarkdownEditorToolbar.editor": "Editor", + "euiMarkdownEditorToolbar.previewMarkdown": "Preview", "euiModal.closeModal": "Closes this modal window", - "euiPagination.jumpToLastPage": [Function], - "euiPagination.nextPage": "Next page", - "euiPagination.pageOfTotal": [Function], - "euiPagination.previousPage": "Previous page", + "euiNotificationEventMessages.accordionAriaLabelButtonText": [Function], + "euiNotificationEventMessages.accordionButtonText": [Function], + "euiNotificationEventMessages.accordionHideText": "hide", + "euiNotificationEventMeta.contextMenuButton": [Function], + "euiNotificationEventReadButton.markAsRead": "Mark as read", + "euiNotificationEventReadButton.markAsReadAria": [Function], + "euiNotificationEventReadButton.markAsUnread": "Mark as unread", + "euiNotificationEventReadButton.markAsUnreadAria": [Function], + "euiPagination.disabledNextPage": "Next page", + "euiPagination.disabledPreviousPage": "Previous page", + "euiPagination.firstRangeAriaLabel": [Function], + "euiPagination.lastRangeAriaLabel": [Function], + "euiPagination.nextPage": [Function], + "euiPagination.previousPage": [Function], + "euiPaginationButton.longPageString": [Function], + "euiPaginationButton.shortPageString": [Function], + "euiPinnableListGroup.pinExtraActionLabel": "Pin item", + "euiPinnableListGroup.pinnedExtraActionLabel": "Unpin item", "euiPopover.screenReaderAnnouncement": "You are in a dialog. To close this dialog, hit escape.", + "euiProgress.valueText": [Function], "euiQuickSelect.applyButton": "Apply", "euiQuickSelect.fullDescription": [Function], "euiQuickSelect.legendText": "Quick select a time range", @@ -81,27 +155,54 @@ exports[`#start() returns \`Context\` component 1`] = ` "euiQuickSelect.tenseLabel": "Time tense", "euiQuickSelect.unitLabel": "Time unit", "euiQuickSelect.valueLabel": "Time value", + "euiRecentlyUsed.legend": "Recently used date ranges", "euiRefreshInterval.fullDescription": [Function], "euiRefreshInterval.legend": "Refresh every", "euiRefreshInterval.start": "Start", "euiRefreshInterval.stop": "Stop", "euiRelativeTab.fullDescription": [Function], + "euiRelativeTab.numberInputError": "Must be >= 0", + "euiRelativeTab.numberInputLabel": "Time span amount", "euiRelativeTab.relativeDate": [Function], "euiRelativeTab.roundingLabel": [Function], "euiRelativeTab.unitInputLabel": "Relative time span", + "euiResizableButton.horizontalResizerAriaLabel": "Press left or right to adjust panels size", + "euiResizableButton.verticalResizerAriaLabel": "Press up or down to adjust panels size", + "euiResizablePanel.toggleButtonAriaLabel": "Press to toggle this panel", "euiSaturation.roleDescription": "HSV color mode saturation and value selection", "euiSaturation.screenReaderAnnouncement": "Use the arrow keys to navigate the square color gradient. The coordinates resulting from each key press will be used to calculate HSV color mode \\"saturation\\" and \\"value\\" numbers, in the range of 0 to 1. Left and right decrease and increase (respectively) the \\"saturation\\" value. Up and down decrease and increase (respectively) the \\"value\\" value.", "euiSelectable.loadingOptions": "Loading options", "euiSelectable.noAvailableOptions": "There aren't any options available", "euiSelectable.noMatchingOptions": [Function], + "euiSelectable.placeholderName": "Filter options", + "euiSelectableListItem.excludedOption": "Excluded option.", + "euiSelectableListItem.excludedOptionInstructions": "To deselect this option, press enter", + "euiSelectableListItem.includedOption": "Included option.", + "euiSelectableListItem.includedOptionInstructions": "To exclude this option, press enter.", + "euiSelectableTemplateSitewide.loadingResults": "Loading results", + "euiSelectableTemplateSitewide.noResults": "No results available", + "euiSelectableTemplateSitewide.onFocusBadgeGoTo": "Go to", + "euiSelectableTemplateSitewide.searchPlaceholder": "Search for anything...", "euiStat.loadingText": "Statistic is loading", - "euiStep.ariaLabel": [Function], - "euiStepHorizontal.buttonTitle": [Function], - "euiStepHorizontal.step": "Step", - "euiStepNumber.hasErrors": "has errors", - "euiStepNumber.hasWarnings": "has warnings", - "euiStepNumber.isComplete": "complete", + "euiStepStrings.complete": [Function], + "euiStepStrings.disabled": [Function], + "euiStepStrings.errors": [Function], + "euiStepStrings.incomplete": [Function], + "euiStepStrings.loading": [Function], + "euiStepStrings.simpleComplete": [Function], + "euiStepStrings.simpleDisabled": [Function], + "euiStepStrings.simpleErrors": [Function], + "euiStepStrings.simpleIncomplete": [Function], + "euiStepStrings.simpleLoading": [Function], + "euiStepStrings.simpleStep": [Function], + "euiStepStrings.simpleWarning": [Function], + "euiStepStrings.step": [Function], + "euiStepStrings.warning": [Function], + "euiStyleSelector.buttonLegend": "Select the display density for the data grid", "euiStyleSelector.buttonText": "Density", + "euiStyleSelector.labelCompact": "Compact density", + "euiStyleSelector.labelExpanded": "Expanded density", + "euiStyleSelector.labelNormal": "Normal density", "euiSuperDatePicker.showDatesButtonLabel": "Show dates", "euiSuperSelect.screenReaderAnnouncement": [Function], "euiSuperSelectControl.selectAnOption": [Function], @@ -110,12 +211,23 @@ exports[`#start() returns \`Context\` component 1`] = ` "euiSuperUpdateButton.refreshButtonLabel": "Refresh", "euiSuperUpdateButton.updateButtonLabel": "Update", "euiSuperUpdateButton.updatingButtonLabel": "Updating", + "euiTableHeaderCell.clickForAscending": "Click to sort in ascending order", + "euiTableHeaderCell.clickForDescending": "Click to sort in descending order", + "euiTableHeaderCell.clickForUnsort": "Click to unsort", + "euiTableHeaderCell.titleTextWithSort": [Function], "euiTablePagination.rowsPerPage": "Rows per page", "euiTablePagination.rowsPerPageOption": [Function], "euiTableSortMobile.sorting": "Sorting", "euiToast.dismissToast": "Dismiss toast", "euiToast.newNotification": "A new notification appears", "euiToast.notification": "Notification", + "euiTour.closeTour": "Close tour", + "euiTour.endTour": "End tour", + "euiTour.skipTour": "Skip tour", + "euiTourStepIndicator.ariaLabel": [Function], + "euiTourStepIndicator.isActive": "active", + "euiTourStepIndicator.isComplete": "complete", + "euiTourStepIndicator.isIncomplete": "incomplete", "euiTreeView.ariaLabel": [Function], "euiTreeView.listNavigationInstructions": "You can quickly navigate this list using arrow keys.", }, diff --git a/src/core/public/i18n/i18n_eui_mapping.tsx b/src/core/public/i18n/i18n_eui_mapping.tsx index 1ef033289e542..1cccc4d94a78d 100644 --- a/src/core/public/i18n/i18n_eui_mapping.tsx +++ b/src/core/public/i18n/i18n_eui_mapping.tsx @@ -16,6 +16,9 @@ interface EuiValues { export const getEuiContextMapping = () => { const euiContextMapping = { + 'euiAccordion.isLoading': i18n.translate('core.euiAccordion.isLoading', { + defaultMessage: 'Loading', + }), 'euiBasicTable.selectAllRows': i18n.translate('core.euiBasicTable.selectAllRows', { defaultMessage: 'Select all rows', description: 'ARIA and displayed label on a checkbox to select all table rows', @@ -24,25 +27,71 @@ export const getEuiContextMapping = () => { defaultMessage: 'Select this row', description: 'ARIA and displayed label on a checkbox to select a single table row', }), - 'euiBasicTable.tableDescription': ({ itemCount }: EuiValues) => - i18n.translate('core.euiBasicTable.tableDescription', { - defaultMessage: 'Below is a table of {itemCount} items.', + 'euiBasicTable.tableCaptionWithPagination': ({ tableCaption, page, pageCount }: EuiValues) => + i18n.translate('core.euiBasicTable.tableCaptionWithPagination', { + defaultMessage: '{tableCaption}; Page {page} of {pageCount}.', + values: { tableCaption, page, pageCount }, + description: 'Screen reader text to describe the size of a paginated table', + }), + 'euiBasicTable.tableAutoCaptionWithPagination': ({ + itemCount, + totalItemCount, + page, + pageCount, + }: EuiValues) => + i18n.translate('core.euiBasicTable.tableDescriptionWithoutPagination', { + defaultMessage: + 'This table contains {itemCount} rows out of {totalItemCount} rows; Page {page} of {pageCount}.', + values: { itemCount, totalItemCount, page, pageCount }, + description: 'Screen reader text to describe the size of a paginated table', + }), + 'euiBasicTable.tableSimpleAutoCaptionWithPagination': ({ + itemCount, + page, + pageCount, + }: EuiValues) => + i18n.translate('core.euiBasicTable.tableSimpleAutoCaptionWithPagination', { + defaultMessage: 'This table contains {itemCount} rows; Page {page} of {pageCount}.', + values: { itemCount, page, pageCount }, + description: 'Screen reader text to describe the size of a paginated table', + }), + 'euiBasicTable.tableAutoCaptionWithoutPagination': ({ itemCount }: EuiValues) => + i18n.translate('core.euiBasicTable.tableAutoCaptionWithoutPagination', { + defaultMessage: 'This table contains {itemCount} rows.', values: { itemCount }, description: 'Screen reader text to describe the size of a table', }), + 'euiBasicTable.tablePagination': ({ tableCaption }: EuiValues) => + i18n.translate('core.euiBasicTable.tablePagination', { + defaultMessage: 'Pagination for preceding table: {tableCaption}', + values: { tableCaption }, + description: 'Screen reader text to describe the pagination controls', + }), + 'euiBottomBar.customScreenReaderAnnouncement': ({ landmarkHeading }: EuiValues) => + i18n.translate('core.euiBottomBar.customScreenReaderAnnouncement', { + defaultMessage: + 'There is a new region landmark called {landmarkHeading} with page level controls at the end of the document.', + values: { landmarkHeading }, + description: + 'Screen reader announcement that functionality is available in the page document', + }), 'euiBottomBar.screenReaderAnnouncement': i18n.translate( 'core.euiBottomBar.screenReaderAnnouncement', { defaultMessage: - 'There is a new menu opening with page level controls at the end of the document.', + 'There is a new region landmark with page level controls at the end of the document.', description: 'Screen reader announcement that functionality is available in the page document', } ), + 'euiBottomBar.screenReaderHeading': i18n.translate('core.euiBottomBar.screenReaderHeading', { + defaultMessage: 'Page level controls', + description: 'Screen reader announcement about heading controls', + }), 'euiBreadcrumbs.collapsedBadge.ariaLabel': i18n.translate( 'core.euiBreadcrumbs.collapsedBadge.ariaLabel', { - defaultMessage: 'Show all breadcrumbs', + defaultMessage: 'Show collapsed breadcrumbs', description: 'Displayed when one or more breadcrumbs are hidden.', } ), @@ -62,17 +111,29 @@ export const getEuiContextMapping = () => { defaultMessage: 'Copy', description: 'ARIA label for a button that copies source code text to the clipboard', }), + 'euiCodeBlock.fullscreenCollapse': i18n.translate('core.euiCodeBlock.fullscreenCollapse', { + defaultMessage: 'Collapse', + description: 'ARIA label for a button that exits fullscreen view', + }), + 'euiCodeBlock.fullscreenExpand': i18n.translate('core.euiCodeBlock.fullscreenExpand', { + defaultMessage: 'Expand', + description: 'ARIA label for a button that enters fullscreen view', + }), 'euiCodeEditor.startEditing': i18n.translate('core.euiCodeEditor.startEditing', { defaultMessage: 'Press Enter to start editing.', + description: 'Screen reader text to prompt editing', }), 'euiCodeEditor.startInteracting': i18n.translate('core.euiCodeEditor.startInteracting', { defaultMessage: 'Press Enter to start interacting with the code.', + description: 'Screen reader text to prompt interaction', }), 'euiCodeEditor.stopEditing': i18n.translate('core.euiCodeEditor.stopEditing', { defaultMessage: "When you're done, press Escape to stop editing.", + description: 'Screen reader text to describe ending editing', }), 'euiCodeEditor.stopInteracting': i18n.translate('core.euiCodeEditor.stopInteracting', { defaultMessage: "When you're done, press Escape to stop interacting with the code.", + description: 'Screen reader text to describe ending interactions', }), 'euiCollapsedItemActions.allActions': i18n.translate( 'core.euiCollapsedItemActions.allActions', @@ -82,6 +143,12 @@ export const getEuiContextMapping = () => { 'ARIA label and tooltip content describing a button that expands an actions menu', } ), + 'euiCollapsibleNav.closeButtonLabel': i18n.translate( + 'core.euiCollapsibleNav.closeButtonLabel', + { + defaultMessage: 'close', + } + ), 'euiColorPicker.screenReaderAnnouncement': i18n.translate( 'core.euiColorPicker.screenReaderAnnouncement', { @@ -98,6 +165,27 @@ export const getEuiContextMapping = () => { description: 'Screen reader text to describe the action and hex value of the selectable option', }), + 'euiColorPicker.alphaLabel': i18n.translate('core.euiColorPicker.alphaLabel', { + defaultMessage: 'Alpha channel (opacity) value', + description: 'Label describing color alpha channel', + }), + 'euiColorPicker.colorLabel': i18n.translate('core.euiColorPicker.colorLabel', { + defaultMessage: 'Color value', + }), + 'euiColorPicker.colorErrorMessage': i18n.translate('core.euiColorPicker.colorErrorMessage', { + defaultMessage: 'Invalid color value', + }), + 'euiColorPicker.transparent': i18n.translate('core.euiColorPicker.transparent', { + defaultMessage: 'Transparent', + }), + 'euiColorPicker.openLabel': i18n.translate('core.euiColorPicker.openLabel', { + defaultMessage: 'Press the escape key to close the popover', + description: 'Screen reader text to describe how to close the picker', + }), + 'euiColorPicker.closeLabel': i18n.translate('core.euiColorPicker.closeLabel', { + defaultMessage: 'Press the down key to open a popover containing color options', + description: 'Screen reader text to describe how to open the picker', + }), 'euiColorStopThumb.removeLabel': i18n.translate('core.euiColorStopThumb.removeLabel', { defaultMessage: 'Remove this stop', description: 'Label accompanying a button whose action will remove the color stop', @@ -111,6 +199,23 @@ export const getEuiContextMapping = () => { 'Message when the color picker popover has opened for an individual color stop thumb.', } ), + 'euiColorStopThumb.buttonAriaLabel': i18n.translate('core.euiColorStopThumb.buttonAriaLabel', { + defaultMessage: 'Press the Enter key to modify this stop. Press Escape to focus the group', + description: 'Screen reader text to describe picker interaction', + }), + 'euiColorStopThumb.buttonTitle': i18n.translate('core.euiColorStopThumb.buttonTitle', { + defaultMessage: 'Click to edit, drag to reposition', + description: 'Screen reader text to describe button interaction', + }), + 'euiColorStopThumb.stopLabel': i18n.translate('core.euiColorStopThumb.stopLabel', { + defaultMessage: 'Stop value', + }), + 'euiColorStopThumb.stopErrorMessage': i18n.translate( + 'core.euiColorStopThumb.stopErrorMessage', + { + defaultMessage: 'Value is out of range', + } + ), 'euiColorStops.screenReaderAnnouncement': ({ label, readOnly, disabled }: EuiValues) => i18n.translate('core.euiColorStops.screenReaderAnnouncement', { defaultMessage: @@ -119,12 +224,42 @@ export const getEuiContextMapping = () => { description: 'Screen reader text to describe the composite behavior of the color stops component.', }), + 'euiColumnActions.sort': ({ schemaLabel }: EuiValues) => + i18n.translate('core.euiColumnActions.sort', { + defaultMessage: 'Sort {schemaLabel}', + values: { schemaLabel }, + }), + 'euiColumnActions.moveLeft': i18n.translate('core.euiColumnActions.moveLeft', { + defaultMessage: 'Move left', + }), + 'euiColumnActions.moveRight': i18n.translate('core.euiColumnActions.moveRight', { + defaultMessage: 'Move right', + }), 'euiColumnSelector.hideAll': i18n.translate('core.euiColumnSelector.hideAll', { defaultMessage: 'Hide all', }), 'euiColumnSelector.selectAll': i18n.translate('core.euiColumnSelector.selectAll', { defaultMessage: 'Show all', }), + 'euiColumnSelector.button': i18n.translate('core.euiColumnSelector.button', { + defaultMessage: 'Columns', + }), + 'euiColumnSelector.search': i18n.translate('core.euiColumnSelector.search', { + defaultMessage: 'Search', + }), + 'euiColumnSelector.searchcolumns': i18n.translate('core.euiColumnSelector.searchcolumns', { + defaultMessage: 'Search columns', + }), + 'euiColumnSelector.buttonActiveSingular': ({ numberOfHiddenFields }: EuiValues) => + i18n.translate('core.euiColumnSelector.buttonActiveSingular', { + defaultMessage: '{numberOfHiddenFields} column hidden', + values: { numberOfHiddenFields }, + }), + 'euiColumnSelector.buttonActivePlural': ({ numberOfHiddenFields }: EuiValues) => + i18n.translate('core.euiColumnSelector.buttonActivePlural', { + defaultMessage: '{numberOfHiddenFields} columns hidden', + values: { numberOfHiddenFields }, + }), 'euiColumnSorting.clearAll': i18n.translate('core.euiColumnSorting.clearAll', { defaultMessage: 'Clear sorting', }), @@ -140,6 +275,12 @@ export const getEuiContextMapping = () => { defaultMessage: 'Sort by:', } ), + 'euiColumnSorting.button': i18n.translate('core.euiColumnSorting.button', { + defaultMessage: 'Sort fields', + }), + 'euiColumnSorting.buttonActive': i18n.translate('core.euiColumnSorting.buttonActive', { + defaultMessage: 'fields sorted', + }), 'euiColumnSortingDraggable.activeSortLabel': i18n.translate( 'core.euiColumnSortingDraggable.activeSortLabel', { @@ -185,11 +326,11 @@ export const getEuiContextMapping = () => { values={{ label }} /> ), - 'euiComboBoxOptionsList.createCustomOption': ({ key, searchValue }: EuiValues) => ( + 'euiComboBoxOptionsList.createCustomOption': ({ searchValue }: EuiValues) => ( ), 'euiComboBoxOptionsList.loadingOptions': i18n.translate( @@ -212,6 +353,12 @@ export const getEuiContextMapping = () => { values={{ searchValue }} /> ), + 'euiComboBoxOptionsList.delimiterMessage': ({ delimiter }: EuiValues) => + i18n.translate('core.euiComboBoxOptionsList.delimiterMessage', { + defaultMessage: 'Add each item separated by {delimiter}', + values: { delimiter }, + description: 'Screen reader text describing adding delimited options', + }), 'euiComboBoxPill.removeSelection': ({ children }: EuiValues) => i18n.translate('core.euiComboBoxPill.removeSelection', { defaultMessage: 'Remove {children} from selection in this group', @@ -224,20 +371,69 @@ export const getEuiContextMapping = () => { 'euiDataGrid.screenReaderNotice': i18n.translate('core.euiDataGrid.screenReaderNotice', { defaultMessage: 'Cell contains interactive content.', }), - 'euiDataGridCell.expandButtonTitle': i18n.translate('core.euiDataGridCell.expandButtonTitle', { - defaultMessage: 'Click or hit enter to interact with cell content', + 'euiDataGrid.ariaLabelGridPagination': ({ label }: EuiValues) => + i18n.translate('core.euiDataGrid.ariaLabelGridPagination', { + defaultMessage: 'Pagination for preceding grid: {label}', + values: { label }, + description: 'Screen reader text to describe the pagination controls', + }), + 'euiDataGrid.ariaLabelledByGridPagination': i18n.translate( + 'core.euiDataGrid.ariaLabelledByGridPagination', + { + defaultMessage: 'Pagination for preceding grid', + description: 'Screen reader text to describe the pagination controls', + } + ), + 'euiDataGrid.ariaLabel': ({ label, page, pageCount }: EuiValues) => + i18n.translate('core.euiDataGrid.ariaLabel', { + defaultMessage: '{label}; Page {page} of {pageCount}.', + values: { label, page, pageCount }, + description: 'Screen reader text to describe the size of the data grid', + }), + 'euiDataGrid.ariaLabelledBy': ({ page, pageCount }: EuiValues) => + i18n.translate('core.euiDataGrid.ariaLabelledBy', { + defaultMessage: 'Page {page} of {pageCount}.', + values: { page, pageCount }, + description: 'Screen reader text to describe the size of the data grid', + }), + 'euiDataGrid.fullScreenButton': i18n.translate('core.euiDataGrid.fullScreenButton', { + defaultMessage: 'Full screen', }), + 'euiDataGrid.fullScreenButtonActive': i18n.translate( + 'core.euiDataGrid.fullScreenButtonActive', + { + defaultMessage: 'Exit full screen', + } + ), + 'euiDataGridCell.row': i18n.translate('core.euiDataGridCell.row', { + defaultMessage: 'Row', + }), + 'euiDataGridCell.column': i18n.translate('core.euiDataGridCell.column', { + defaultMessage: 'Column', + }), + 'euiDataGridCellButtons.expandButtonTitle': i18n.translate( + 'core.euiDataGridCellButtons.expandButtonTitle', + { + defaultMessage: 'Click or hit enter to interact with cell content', + } + ), + 'euiDataGridHeaderCell.headerActions': i18n.translate( + 'core.euiDataGridHeaderCell.headerActions', + { + defaultMessage: 'Header actions', + } + ), 'euiDataGridSchema.booleanSortTextAsc': i18n.translate( 'core.euiDataGridSchema.booleanSortTextAsc', { - defaultMessage: 'True-False', + defaultMessage: 'False-True', description: 'Ascending boolean label', } ), 'euiDataGridSchema.booleanSortTextDesc': i18n.translate( 'core.euiDataGridSchema.booleanSortTextDesc', { - defaultMessage: 'False-True', + defaultMessage: 'True-False', description: 'Descending boolean label', } ), @@ -291,13 +487,29 @@ export const getEuiContextMapping = () => { description: 'Descending size label', } ), + 'euiFieldPassword.showPassword': i18n.translate('core.euiFieldPassword.showPassword', { + defaultMessage: + 'Show password as plain text. Note: this will visually expose your password on the screen.', + }), + 'euiFieldPassword.maskPassword': i18n.translate('core.euiFieldPassword.maskPassword', { + defaultMessage: 'Mask password', + }), + 'euiFilePicker.clearSelectedFiles': i18n.translate('core.euiFilePicker.clearSelectedFiles', { + defaultMessage: 'Clear selected files', + }), + 'euiFilePicker.filesSelected': i18n.translate('core.euiFilePicker.filesSelected', { + defaultMessage: 'files selected', + }), 'euiFilterButton.filterBadge': ({ count, hasActiveFilters }: EuiValues) => i18n.translate('core.euiFilterButton.filterBadge', { defaultMessage: '${count} ${filterCountLabel} filters', values: { count, filterCountLabel: hasActiveFilters ? 'active' : 'available' }, }), + 'euiFlyout.closeAriaLabel': i18n.translate('core.euiFlyout.closeAriaLabel', { + defaultMessage: 'Close this dialog', + }), 'euiForm.addressFormErrors': i18n.translate('core.euiForm.addressFormErrors', { - defaultMessage: 'Please address the errors in your form.', + defaultMessage: 'Please address the highlighted errors.', }), 'euiFormControlLayoutClearButton.label': i18n.translate( 'core.euiFormControlLayoutClearButton.label', @@ -311,11 +523,11 @@ export const getEuiContextMapping = () => { description: 'ARIA label on a button that dismisses/removes a notification', }), 'euiHeaderLinks.appNavigation': i18n.translate('core.euiHeaderLinks.appNavigation', { - defaultMessage: 'App navigation', + defaultMessage: 'App menu', description: 'ARIA label on a `nav` element', }), 'euiHeaderLinks.openNavigationMenu': i18n.translate('core.euiHeaderLinks.openNavigationMenu', { - defaultMessage: 'Open navigation menu', + defaultMessage: 'Open menu', }), 'euiHue.label': i18n.translate('core.euiHue.label', { defaultMessage: 'Select the HSV color mode "hue" value', @@ -333,31 +545,200 @@ export const getEuiContextMapping = () => { 'euiLink.external.ariaLabel': i18n.translate('core.euiLink.external.ariaLabel', { defaultMessage: 'External link', }), + 'euiLink.newTarget.screenReaderOnlyText': i18n.translate( + 'core.euiLink.newTarget.screenReaderOnlyText', + { + defaultMessage: '(opens in a new tab or window)', + } + ), + 'euiMarkdownEditorFooter.closeButton': i18n.translate( + 'core.euiMarkdownEditorFooter.closeButton', + { + defaultMessage: 'Close', + } + ), + 'euiMarkdownEditorFooter.uploadingFiles': i18n.translate( + 'core.euiMarkdownEditorFooter.uploadingFiles', + { + defaultMessage: 'Click to upload files', + } + ), + 'euiMarkdownEditorFooter.openUploadModal': i18n.translate( + 'core.euiMarkdownEditorFooter.openUploadModal', + { + defaultMessage: 'Open upload files modal', + } + ), + 'euiMarkdownEditorFooter.unsupportedFileType': i18n.translate( + 'core.euiMarkdownEditorFooter.unsupportedFileType', + { + defaultMessage: 'File type not supported', + } + ), + 'euiMarkdownEditorFooter.supportedFileTypes': ({ supportedFileTypes }: EuiValues) => + i18n.translate('core.euiMarkdownEditorFooter.supportedFileTypes', { + defaultMessage: 'Supported files: {supportedFileTypes}', + values: { supportedFileTypes }, + }), + 'euiMarkdownEditorFooter.showSyntaxErrors': i18n.translate( + 'core.euiMarkdownEditorFooter.showSyntaxErrors', + { + defaultMessage: 'Show errors', + } + ), + 'euiMarkdownEditorFooter.showMarkdownHelp': i18n.translate( + 'core.euiMarkdownEditorFooter.showMarkdownHelp', + { + defaultMessage: 'Show markdown help', + } + ), + 'euiMarkdownEditorFooter.errorsTitle': i18n.translate( + 'core.euiMarkdownEditorFooter.errorsTitle', + { + defaultMessage: 'Errors', + } + ), + 'euiMarkdownEditorFooter.syntaxTitle': i18n.translate( + 'core.euiMarkdownEditorFooter.syntaxTitle', + { + defaultMessage: 'Syntax help', + } + ), + 'euiMarkdownEditorFooter.descriptionPrefix': i18n.translate( + 'core.euiMarkdownEditorFooter.descriptionPrefix', + { + defaultMessage: 'This editor uses', + } + ), + 'euiMarkdownEditorFooter.descriptionSuffix': i18n.translate( + 'core.euiMarkdownEditorFooter.descriptionSuffix', + { + defaultMessage: + 'You can also utilize these additional syntax plugins to add rich content to your text.', + } + ), + 'euiMarkdownEditorToolbar.editor': i18n.translate('core.euiMarkdownEditorToolbar.editor', { + defaultMessage: 'Editor', + }), + 'euiMarkdownEditorToolbar.previewMarkdown': i18n.translate( + 'core.euiMarkdownEditorToolbar.previewMarkdown', + { + defaultMessage: 'Preview', + } + ), 'euiModal.closeModal': i18n.translate('core.euiModal.closeModal', { defaultMessage: 'Closes this modal window', }), - 'euiPagination.jumpToLastPage': ({ pageCount }: EuiValues) => - i18n.translate('core.euiPagination.jumpToLastPage', { - defaultMessage: 'Jump to the last page, number {pageCount}', - values: { pageCount }, + 'euiNotificationEventMessages.accordionButtonText': ({ + messagesLength, + eventName, + }: EuiValues) => + i18n.translate('core.euiNotificationEventMessages.accordionButtonText', { + defaultMessage: '+ {messagesLength} messages for {eventName}', + values: { messagesLength, eventName }, + }), + 'euiNotificationEventMessages.accordionAriaLabelButtonText': ({ messagesLength }: EuiValues) => + i18n.translate('core.euiNotificationEventMessages.accordionAriaLabelButtonText', { + defaultMessage: '+ {messagesLength} more', + values: { messagesLength }, + }), + 'euiNotificationEventMeta.contextMenuButton': ({ eventName }: EuiValues) => + i18n.translate('core.euiNotificationEventMeta.contextMenuButton', { + defaultMessage: 'Menu for {eventName}', + values: { eventName }, + }), + 'euiNotificationEventReadButton.markAsReadAria': ({ eventName }: EuiValues) => + i18n.translate('core.euiNotificationEventReadButton.markAsReadAria', { + defaultMessage: 'Mark {eventName} as read', + values: { eventName }, + }), + 'euiNotificationEventReadButton.markAsUnreadAria': ({ eventName }: EuiValues) => + i18n.translate('core.euiNotificationEventReadButton.markAsUnreadAria', { + defaultMessage: 'Mark {eventName} as unread', + values: { eventName }, + }), + 'euiNotificationEventReadButton.markAsRead': i18n.translate( + 'core.euiNotificationEventReadButton.markAsRead', + { + defaultMessage: 'Mark as read', + } + ), + 'euiNotificationEventReadButton.markAsUnread': i18n.translate( + 'core.euiNotificationEventReadButton.markAsUnread', + { + defaultMessage: 'Mark as unread', + } + ), + 'euiNotificationEventMessages.accordionHideText': i18n.translate( + 'core.euiNotificationEventMessages.accordionHideText', + { + defaultMessage: 'hide', + } + ), + 'euiPagination.nextPage': ({ page }: EuiValues) => + i18n.translate('core.euiPagination.nextPage', { + defaultMessage: 'Next page, {page}', + values: { page }, }), - 'euiPagination.nextPage': i18n.translate('core.euiPagination.nextPage', { + 'euiPagination.previousPage': ({ page }: EuiValues) => + i18n.translate('core.euiPagination.previousPage', { + defaultMessage: 'Previous page, {page}', + values: { page }, + }), + 'euiPagination.disabledPreviousPage': i18n.translate( + 'core.euiPagination.disabledPreviousPage', + { + defaultMessage: 'Previous page', + } + ), + 'euiPagination.disabledNextPage': i18n.translate('core.euiPagination.disabledNextPage', { defaultMessage: 'Next page', }), - 'euiPagination.pageOfTotal': ({ page, total }: EuiValues) => - i18n.translate('core.euiPagination.pageOfTotal', { - defaultMessage: 'Page {page} of {total}', - values: { page, total }, + 'euiPagination.firstRangeAriaLabel': ({ lastPage }: EuiValues) => + i18n.translate('core.euiPagination.firstRangeAriaLabel', { + defaultMessage: 'Skipping pages 2 to {lastPage}', + values: { lastPage }, }), - 'euiPagination.previousPage': i18n.translate('core.euiPagination.previousPage', { - defaultMessage: 'Previous page', - }), + 'euiPagination.lastRangeAriaLabel': ({ firstPage, lastPage }: EuiValues) => + i18n.translate('core.euiPagination.lastRangeAriaLabel', { + defaultMessage: 'Skipping pages {firstPage} to {lastPage}', + values: { firstPage, lastPage }, + }), + 'euiPaginationButton.longPageString': ({ page, totalPages }: EuiValues) => + i18n.translate('core.euiPaginationButton.longPageString', { + defaultMessage: 'Page {page} of {totalPages}', + values: { page, totalPages }, + description: 'Text to describe the size of a paginated section', + }), + 'euiPaginationButton.shortPageString': ({ page }: EuiValues) => + i18n.translate('core.euiPaginationButton.shortPageString', { + defaultMessage: 'Page {page}', + values: { page }, + description: 'Text to describe the current page of a paginated section', + }), + 'euiPinnableListGroup.pinExtraActionLabel': i18n.translate( + 'core.euiPinnableListGroup.pinExtraActionLabel', + { + defaultMessage: 'Pin item', + } + ), + 'euiPinnableListGroup.pinnedExtraActionLabel': i18n.translate( + 'core.euiPinnableListGroup.pinnedExtraActionLabel', + { + defaultMessage: 'Unpin item', + } + ), 'euiPopover.screenReaderAnnouncement': i18n.translate( 'core.euiPopover.screenReaderAnnouncement', { defaultMessage: 'You are in a dialog. To close this dialog, hit escape.', } ), + 'euiProgress.valueText': ({ value }: EuiValues) => + i18n.translate('core.euiProgress.valueText', { + defaultMessage: '{value}%', + values: { value }, + }), 'euiQuickSelect.applyButton': i18n.translate('core.euiQuickSelect.applyButton', { defaultMessage: 'Apply', }), @@ -387,9 +768,12 @@ export const getEuiContextMapping = () => { 'euiQuickSelect.valueLabel': i18n.translate('core.euiQuickSelect.valueLabel', { defaultMessage: 'Time value', }), + 'euiRecentlyUsed.legend': i18n.translate('core.euiRecentlyUsed.legend', { + defaultMessage: 'Recently used date ranges', + }), 'euiRefreshInterval.fullDescription': ({ optionValue, optionText }: EuiValues) => i18n.translate('core.euiRefreshInterval.fullDescription', { - defaultMessage: 'Currently set to {optionValue} {optionText}.', + defaultMessage: 'Refresh interval currently set to {optionValue} {optionText}.', values: { optionValue, optionText }, }), 'euiRefreshInterval.legend': i18n.translate('core.euiRefreshInterval.legend', { @@ -419,6 +803,30 @@ export const getEuiContextMapping = () => { 'euiRelativeTab.unitInputLabel': i18n.translate('core.euiRelativeTab.unitInputLabel', { defaultMessage: 'Relative time span', }), + 'euiRelativeTab.numberInputError': i18n.translate('core.euiRelativeTab.numberInputError', { + defaultMessage: 'Must be >= 0', + }), + 'euiRelativeTab.numberInputLabel': i18n.translate('core.euiRelativeTab.numberInputLabel', { + defaultMessage: 'Time span amount', + }), + 'euiResizableButton.horizontalResizerAriaLabel': i18n.translate( + 'core.euiResizableButton.horizontalResizerAriaLabel', + { + defaultMessage: 'Press left or right to adjust panels size', + } + ), + 'euiResizableButton.verticalResizerAriaLabel': i18n.translate( + 'core.euiResizableButton.verticalResizerAriaLabel', + { + defaultMessage: 'Press up or down to adjust panels size', + } + ), + 'euiResizablePanel.toggleButtonAriaLabel': i18n.translate( + 'core.euiResizablePanel.toggleButtonAriaLabel', + { + defaultMessage: 'Press to toggle this panel', + } + ), 'euiSaturation.roleDescription': i18n.translate('core.euiSaturation.roleDescription', { defaultMessage: 'HSV color mode saturation and value selection', }), @@ -443,46 +851,145 @@ export const getEuiContextMapping = () => { values={{ searchValue }} /> ), + 'euiSelectable.placeholderName': i18n.translate('core.euiSelectable.placeholderName', { + defaultMessage: 'Filter options', + }), + 'euiSelectableListItem.includedOption': i18n.translate( + 'core.euiSelectableListItem.includedOption', + { + defaultMessage: 'Included option.', + } + ), + 'euiSelectableListItem.includedOptionInstructions': i18n.translate( + 'core.euiSelectableListItem.includedOptionInstructions', + { + defaultMessage: 'To exclude this option, press enter.', + } + ), + 'euiSelectableListItem.excludedOption': i18n.translate( + 'core.euiSelectableListItem.excludedOption', + { + defaultMessage: 'Excluded option.', + } + ), + 'euiSelectableListItem.excludedOptionInstructions': i18n.translate( + 'core.euiSelectableListItem.excludedOptionInstructions', + { + defaultMessage: 'To deselect this option, press enter', + } + ), + 'euiSelectableTemplateSitewide.loadingResults': i18n.translate( + 'core.euiSelectableTemplateSitewide.loadingResults', + { + defaultMessage: 'Loading results', + } + ), + 'euiSelectableTemplateSitewide.noResults': i18n.translate( + 'core.euiSelectableTemplateSitewide.noResults', + { + defaultMessage: 'No results available', + } + ), + 'euiSelectableTemplateSitewide.onFocusBadgeGoTo': i18n.translate( + 'core.euiSelectableTemplateSitewide.onFocusBadgeGoTo', + { + defaultMessage: 'Go to', + } + ), + 'euiSelectableTemplateSitewide.searchPlaceholder': i18n.translate( + 'core.euiSelectableTemplateSitewide.searchPlaceholder', + { + defaultMessage: 'Search for anything...', + } + ), 'euiStat.loadingText': i18n.translate('core.euiStat.loadingText', { defaultMessage: 'Statistic is loading', }), - 'euiStep.ariaLabel': ({ status }: EuiValues) => - i18n.translate('core.euiStep.ariaLabel', { - defaultMessage: '{stepStatus}', - values: { stepStatus: status === 'incomplete' ? 'Incomplete Step' : 'Step' }, - }), - 'euiStepHorizontal.buttonTitle': ({ step, title, disabled, isComplete }: EuiValues) => { - return i18n.translate('core.euiStepHorizontal.buttonTitle', { - defaultMessage: 'Step {step}: {title}{titleAppendix}', - values: { - step, - title, - titleAppendix: disabled ? ' is disabled' : isComplete ? ' is complete' : '', - }, - }); - }, - 'euiStepHorizontal.step': i18n.translate('core.euiStepHorizontal.step', { - defaultMessage: 'Step', - description: 'Screen reader text announcing information about a step in some process', - }), - 'euiStepNumber.hasErrors': i18n.translate('core.euiStepNumber.hasErrors', { - defaultMessage: 'has errors', - description: - 'Used as the title attribute on an image or svg icon to indicate a given process step has errors', - }), - 'euiStepNumber.hasWarnings': i18n.translate('core.euiStepNumber.hasWarnings', { - defaultMessage: 'has warnings', - description: - 'Used as the title attribute on an image or svg icon to indicate a given process step has warnings', - }), - 'euiStepNumber.isComplete': i18n.translate('core.euiStepNumber.isComplete', { - defaultMessage: 'complete', - description: - 'Used as the title attribute on an image or svg icon to indicate a given process step is complete', - }), + 'euiStepStrings.step': ({ number, title }: EuiValues) => + i18n.translate('core.euiStepStrings.step', { + defaultMessage: 'Step {number}: {title}', + values: { number, title }, + }), + 'euiStepStrings.simpleStep': ({ number }: EuiValues) => + i18n.translate('core.euiStepStrings.simpleStep', { + defaultMessage: 'Step {number}', + values: { number }, + }), + 'euiStepStrings.complete': ({ number, title }: EuiValues) => + i18n.translate('core.euiStepStrings.complete', { + defaultMessage: 'Step {number}: {title} is complete', + values: { number, title }, + }), + 'euiStepStrings.simpleComplete': ({ number }: EuiValues) => + i18n.translate('core.euiStepStrings.simpleComplete', { + defaultMessage: 'Step {number} is complete', + values: { number }, + }), + 'euiStepStrings.warning': ({ number, title }: EuiValues) => + i18n.translate('core.euiStepStrings.warning', { + defaultMessage: 'Step {number}: {title} has warnings', + values: { number, title }, + }), + 'euiStepStrings.simpleWarning': ({ number }: EuiValues) => + i18n.translate('core.euiStepStrings.simpleWarning', { + defaultMessage: 'Step {number} has warnings', + values: { number }, + }), + 'euiStepStrings.errors': ({ number, title }: EuiValues) => + i18n.translate('core.euiStepStrings.errors', { + defaultMessage: 'Step {number}: {title} has errors', + values: { number, title }, + }), + 'euiStepStrings.simpleErrors': ({ number }: EuiValues) => + i18n.translate('core.euiStepStrings.simpleErrors', { + defaultMessage: 'Step {number} has errors', + values: { number }, + }), + 'euiStepStrings.incomplete': ({ number, title }: EuiValues) => + i18n.translate('core.euiStepStrings.incomplete', { + defaultMessage: 'Step {number}: {title} is incomplete', + values: { number, title }, + }), + 'euiStepStrings.simpleIncomplete': ({ number }: EuiValues) => + i18n.translate('core.euiStepStrings.simpleIncomplete', { + defaultMessage: 'Step {number} is incomplete', + values: { number }, + }), + 'euiStepStrings.disabled': ({ number, title }: EuiValues) => + i18n.translate('core.euiStepStrings.disabled', { + defaultMessage: 'Step {number}: {title} is disabled', + values: { number, title }, + }), + 'euiStepStrings.simpleDisabled': ({ number }: EuiValues) => + i18n.translate('core.euiStepStrings.simpleDisabled', { + defaultMessage: 'Step {number} is disabled', + values: { number }, + }), + 'euiStepStrings.loading': ({ number, title }: EuiValues) => + i18n.translate('core.euiStepStrings.loading', { + defaultMessage: 'Step {number}: {title} is loading', + values: { number, title }, + }), + 'euiStepStrings.simpleLoading': ({ number }: EuiValues) => + i18n.translate('core.euiStepStrings.simpleLoading', { + defaultMessage: 'Step {number} is loading', + values: { number }, + }), 'euiStyleSelector.buttonText': i18n.translate('core.euiStyleSelector.buttonText', { defaultMessage: 'Density', }), + 'euiStyleSelector.buttonLegend': i18n.translate('core.euiStyleSelector.buttonLegend', { + defaultMessage: 'Select the display density for the data grid', + }), + 'euiStyleSelector.labelExpanded': i18n.translate('core.euiStyleSelector.labelExpanded', { + defaultMessage: 'Expanded density', + }), + 'euiStyleSelector.labelNormal': i18n.translate('core.euiStyleSelector.labelNormal', { + defaultMessage: 'Normal density', + }), + 'euiStyleSelector.labelCompact': i18n.translate('core.euiStyleSelector.labelCompact', { + defaultMessage: 'Compact density', + }), 'euiSuperDatePicker.showDatesButtonLabel': i18n.translate( 'core.euiSuperDatePicker.showDatesButtonLabel', { @@ -536,6 +1043,30 @@ export const getEuiContextMapping = () => { description: 'Displayed in a button that updates based on date picked', } ), + 'euiTableHeaderCell.clickForAscending': i18n.translate( + 'core.euiTableHeaderCell.clickForAscending', + { + defaultMessage: 'Click to sort in ascending order', + description: 'Displayed in a button that toggles a table sorting', + } + ), + 'euiTableHeaderCell.clickForDescending': i18n.translate( + 'core.euiTableHeaderCell.clickForDescending', + { + defaultMessage: 'Click to sort in descending order', + description: 'Displayed in a button that toggles a table sorting', + } + ), + 'euiTableHeaderCell.clickForUnsort': i18n.translate('core.euiTableHeaderCell.clickForUnsort', { + defaultMessage: 'Click to unsort', + description: 'Displayed in a button that toggles a table sorting', + }), + 'euiTableHeaderCell.titleTextWithSort': ({ innerText, ariaSortValue }: EuiValues) => + i18n.translate('core.euiTableHeaderCell.titleTextWithSort', { + defaultMessage: '{innerText}; Sorted in {ariaSortValue} order', + values: { innerText, ariaSortValue }, + description: 'Text describing the table sort order', + }), 'euiTablePagination.rowsPerPage': i18n.translate('core.euiTablePagination.rowsPerPage', { defaultMessage: 'Rows per page', description: 'Displayed in a button that toggles a table pagination menu', @@ -560,6 +1091,33 @@ export const getEuiContextMapping = () => { defaultMessage: 'Notification', description: 'ARIA label on an element containing a notification', }), + 'euiTour.endTour': i18n.translate('core.euiTour.endTour', { + defaultMessage: 'End tour', + }), + 'euiTour.skipTour': i18n.translate('core.euiTour.skipTour', { + defaultMessage: 'Skip tour', + }), + 'euiTour.closeTour': i18n.translate('core.euiTour.closeTour', { + defaultMessage: 'Close tour', + }), + 'euiTourStepIndicator.isActive': i18n.translate('core.euiTourStepIndicator.isActive', { + defaultMessage: 'active', + description: 'Text for an active tour step', + }), + 'euiTourStepIndicator.isComplete': i18n.translate('core.euiTourStepIndicator.isComplete', { + defaultMessage: 'complete', + description: 'Text for a completed tour step', + }), + 'euiTourStepIndicator.isIncomplete': i18n.translate('core.euiTourStepIndicator.isIncomplete', { + defaultMessage: 'incomplete', + description: 'Text for an incomplete tour step', + }), + 'euiTourStepIndicator.ariaLabel': ({ status, number }: EuiValues) => + i18n.translate('core.euiTourStepIndicator.ariaLabel', { + defaultMessage: 'Step {number} {status}', + values: { status, number }, + description: 'Screen reader text describing the state of a tour step', + }), 'euiTreeView.ariaLabel': ({ nodeLabel, ariaLabel }: EuiValues) => i18n.translate('core.euiTreeView.ariaLabel', { defaultMessage: '{nodeLabel} child of {ariaLabel}', diff --git a/src/plugins/discover/public/application/angular/discover_state.test.ts b/src/plugins/discover/public/application/angular/discover_state.test.ts index e7322a8588631..ddb4e874ccc64 100644 --- a/src/plugins/discover/public/application/angular/discover_state.test.ts +++ b/src/plugins/discover/public/application/angular/discover_state.test.ts @@ -79,6 +79,48 @@ describe('Test discover state', () => { expect(state.getPreviousAppState()).toEqual(stateA); }); }); +describe('Test discover initial state sort handling', () => { + test('Non-empty sort in URL should not fallback to state defaults', async () => { + history = createBrowserHistory(); + history.push('/#?_a=(sort:!(!(order_date,desc)))'); + + state = getState({ + getStateDefaults: () => ({ sort: [['fallback', 'desc']] }), + history, + uiSettings: uiSettingsMock, + }); + await state.replaceUrlAppState({}); + await state.startSync(); + expect(state.appStateContainer.getState().sort).toMatchInlineSnapshot(` + Array [ + Array [ + "order_date", + "desc", + ], + ] + `); + }); + test('Empty sort in URL should allow fallback state defaults', async () => { + history = createBrowserHistory(); + history.push('/#?_a=(sort:!())'); + + state = getState({ + getStateDefaults: () => ({ sort: [['fallback', 'desc']] }), + history, + uiSettings: uiSettingsMock, + }); + await state.replaceUrlAppState({}); + await state.startSync(); + expect(state.appStateContainer.getState().sort).toMatchInlineSnapshot(` + Array [ + Array [ + "fallback", + "desc", + ], + ] + `); + }); +}); describe('Test discover state with legacy migration', () => { test('migration of legacy query ', async () => { diff --git a/src/plugins/discover/public/application/angular/discover_state.ts b/src/plugins/discover/public/application/angular/discover_state.ts index 9ebeff69d7542..f71e3ac651f53 100644 --- a/src/plugins/discover/public/application/angular/discover_state.ts +++ b/src/plugins/discover/public/application/angular/discover_state.ts @@ -170,6 +170,12 @@ export function getState({ appStateFromUrl.query = migrateLegacyQuery(appStateFromUrl.query); } + if (appStateFromUrl?.sort && !appStateFromUrl.sort.length) { + // If there's an empty array given in the URL, the sort prop should be removed + // This allows the sort prop to be overwritten with the default sorting + delete appStateFromUrl.sort; + } + let initialAppState = handleSourceColumnState( { ...defaultAppState, @@ -177,6 +183,7 @@ export function getState({ }, uiSettings ); + // todo filter source depending on fields fetching flag (if no columns remain and source fetching is enabled, use default columns) let previousAppState: AppState; const appStateContainer = createStateContainer(initialAppState); diff --git a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts index f16c1c7104417..1fa19189b8c84 100644 --- a/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts +++ b/src/plugins/home/server/services/sample_data/data_sets/flights/saved_objects.ts @@ -438,10 +438,10 @@ export const getSavedObjects = (): SavedObject[] => [ attributes: { title: 'kibana_sample_data_flights', timeFieldName: 'timestamp', - fields: - '[{"name":"hour_of_day","type":"number","count":0,"scripted":true,"script":"doc[\'timestamp\'].value.hourOfDay","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]', fieldFormatMap: '{"hour_of_day":{"id":"number","params":{"pattern":"00"}},"AvgTicketPrice":{"id":"number","params":{"pattern":"$0,0.[00]"}}}', + runtimeFieldMap: + '{"hour_of_day":{"type":"long","script":{"source":"emit(doc[\'timestamp\'].value.hourOfDay);"}}}', }, references: [], }, diff --git a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts index 8a3469fe4f3c0..a68d6bfe9cc58 100644 --- a/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts +++ b/src/plugins/home/server/services/sample_data/data_sets/logs/saved_objects.ts @@ -275,9 +275,9 @@ export const getSavedObjects = (): SavedObject[] => [ attributes: { title: 'kibana_sample_data_logs', timeFieldName: 'timestamp', - fields: - '[{"name":"hour_of_day","type":"number","count":0,"scripted":true,"script":"doc[\'timestamp\'].value.getHour()","lang":"painless","searchable":true,"aggregatable":true,"readFromDocValues":false}]', fieldFormatMap: '{"hour_of_day":{}}', + runtimeFieldMap: + '{"hour_of_day":{"type":"long","script":{"source":"emit(doc[\'timestamp\'].value.getHour());"}}}', }, references: [], }, diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap index e9bf6cf9002a9..f4eb2a0e74089 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/__snapshots__/header.test.tsx.snap @@ -91,7 +91,7 @@ exports[`Header should render normally 1`] = ` /> @@ -108,7 +108,7 @@ exports[`Header should render normally 1`] = ` } > - Scripted fields are deprecated, + Scripted fields are deprecated. Use @@ -118,17 +118,17 @@ exports[`Header should render normally 1`] = ` type="button" > - use runtime fields instead + runtime fields - . + instead.

diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx index 96445b985e34c..22da83b179652 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/header/header.tsx @@ -36,13 +36,13 @@ export const Header = withRouter(({ indexPatternId, history }: HeaderProps) => { ), diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap index b29d2dd120fed..31c01b1c45e25 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap +++ b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap @@ -12,7 +12,7 @@ exports[`ScriptingWarningCallOut should render normally 1`] = ` >

- Please familiarize yourself with + Familiarize yourself with @@ -96,7 +96,7 @@ exports[`ScriptingWarningCallOut should render normally 1`] = ` iconType="alert" title={ - Scripted fields are deprecated. + Scripted fields are deprecated @@ -151,7 +151,7 @@ exports[`ScriptingWarningCallOut should render normally 1`] = ` >

@@ -168,7 +168,7 @@ exports[`ScriptingWarningCallOut should render normally 1`] = ` } > - For greater flexibility and Painless script support, + For greater flexibility and Painless script support, use @@ -178,12 +178,12 @@ exports[`ScriptingWarningCallOut should render normally 1`] = ` type="button" > - use runtime fields + runtime fields diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx index dc4409d35b378..d992a3fc5c192 100644 --- a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx +++ b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/warning_call_out.tsx @@ -27,7 +27,7 @@ export const ScriptingWarningCallOut = ({ isVisible = false }: ScriptingWarningC

} @@ -67,13 +67,13 @@ export const ScriptingWarningCallOut = ({ isVisible = false }: ScriptingWarningC

), diff --git a/src/plugins/maps_ems/common/ems_defaults.ts b/src/plugins/maps_ems/common/ems_defaults.ts index 6d99f2041484c..d29d47fb19dbb 100644 --- a/src/plugins/maps_ems/common/ems_defaults.ts +++ b/src/plugins/maps_ems/common/ems_defaults.ts @@ -12,3 +12,7 @@ export const DEFAULT_EMS_TILE_API_URL = 'https://tiles.maps.elastic.co'; export const DEFAULT_EMS_LANDING_PAGE_URL = 'https://maps.elastic.co/v7.12'; export const DEFAULT_EMS_FONT_LIBRARY_URL = 'https://tiles.maps.elastic.co/fonts/{fontstack}/{range}.pbf'; + +export const DEFAULT_EMS_ROADMAP_ID = 'road_map'; +export const DEFAULT_EMS_ROADMAP_DESATURATED_ID = 'road_map_desaturated'; +export const DEFAULT_EMS_DARKMAP_ID = 'dark_map'; diff --git a/src/plugins/maps_ems/config.ts b/src/plugins/maps_ems/config.ts index e74a8f5cec29c..1deff36a10e45 100644 --- a/src/plugins/maps_ems/config.ts +++ b/src/plugins/maps_ems/config.ts @@ -13,6 +13,9 @@ import { DEFAULT_EMS_LANDING_PAGE_URL, DEFAULT_EMS_TILE_API_URL, DEFAULT_EMS_FILE_API_URL, + DEFAULT_EMS_ROADMAP_ID, + DEFAULT_EMS_ROADMAP_DESATURATED_ID, + DEFAULT_EMS_DARKMAP_ID, } from './common'; const tileMapConfigOptionsSchema = schema.object({ @@ -77,9 +80,9 @@ export const emsConfigSchema = schema.object({ defaultValue: DEFAULT_EMS_FONT_LIBRARY_URL, }), emsTileLayerId: schema.object({ - bright: schema.string({ defaultValue: 'road_map' }), - desaturated: schema.string({ defaultValue: 'road_map_desaturated' }), - dark: schema.string({ defaultValue: 'dark_map' }), + bright: schema.string({ defaultValue: DEFAULT_EMS_ROADMAP_ID }), + desaturated: schema.string({ defaultValue: DEFAULT_EMS_ROADMAP_DESATURATED_ID }), + dark: schema.string({ defaultValue: DEFAULT_EMS_DARKMAP_ID }), }), }); diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json index dc653062931c2..842496815c15c 100644 --- a/src/plugins/telemetry/schema/oss_plugins.json +++ b/src/plugins/telemetry/schema/oss_plugins.json @@ -4084,7 +4084,7 @@ } } } - }, + }, "security_account": { "properties": { "appId": { diff --git a/test/functional/apps/discover/_shared_links.ts b/test/functional/apps/discover/_shared_links.ts index 2893102367b04..9522b665dd649 100644 --- a/test/functional/apps/discover/_shared_links.ts +++ b/test/functional/apps/discover/_shared_links.ts @@ -19,6 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const browser = getService('browser'); const toasts = getService('toasts'); const deployment = getService('deployment'); + const dataGrid = getService('dataGrid'); describe('shared links', function describeIndexTests() { let baseUrl: string; @@ -110,6 +111,32 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { const actualUrl = await PageObjects.share.getSharedUrl(); expect(actualUrl).to.be(expectedUrl); }); + + it('should load snapshot URL with empty sort param correctly', async function () { + const expectedUrl = + baseUrl + + '/app/discover?_t=1453775307251#' + + '/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time' + + ":(from:'2015-09-19T06:31:44.000Z',to:'2015-09" + + "-23T18:31:44.000Z'))&_a=(columns:!(),filters:!(),index:'logstash-" + + "*',interval:auto,query:(language:kuery,query:'')" + + ',sort:!())'; + await browser.navigateTo(expectedUrl); + await PageObjects.discover.waitUntilSearchingHasFinished(); + await retry.waitFor('url to contain default sorting', async () => { + // url fallback default sort should have been pushed to URL + const url = await browser.getCurrentUrl(); + return url.includes('sort:!(!(%27@timestamp%27,desc))'); + }); + + const row = await dataGrid.getRow({ rowIndex: 0 }); + const firstRowText = await Promise.all( + row.map(async (cell) => await cell.getVisibleText()) + ); + + // sorting requested by ES should be correct + expect(firstRowText).to.contain('Sep 22, 2015 @ 23:50:13.253'); + }); }); }); diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index 3fee52ff55857..4a03478800fc8 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -20,6 +20,7 @@ "xpack.endpoint": "plugins/endpoint", "xpack.enterpriseSearch": "plugins/enterprise_search", "xpack.features": "plugins/features", + "xpack.fileDataVisualizer": "plugins/file_data_visualizer", "xpack.fileUpload": "plugins/file_upload", "xpack.globalSearch": ["plugins/global_search"], "xpack.globalSearchBar": ["plugins/global_search_bar"], diff --git a/x-pack/plugins/apm/common/__snapshots__/apm_telemetry.test.ts.snap b/x-pack/plugins/apm/common/__snapshots__/apm_telemetry.test.ts.snap index 14343bd8d52c4..d7fc8e6442f12 100644 --- a/x-pack/plugins/apm/common/__snapshots__/apm_telemetry.test.ts.snap +++ b/x-pack/plugins/apm/common/__snapshots__/apm_telemetry.test.ts.snap @@ -28,6 +28,9 @@ exports[`APM telemetry helpers getApmTelemetry generates a JSON object with the "nodejs": { "type": "long" }, + "php": { + "type": "long" + }, "python": { "type": "long" }, @@ -344,6 +347,60 @@ exports[`APM telemetry helpers getApmTelemetry generates a JSON object with the } } }, + "php": { + "properties": { + "agent": { + "properties": { + "version": { + "type": "keyword" + } + } + }, + "service": { + "properties": { + "framework": { + "properties": { + "name": { + "type": "keyword" + }, + "version": { + "type": "keyword" + }, + "composite": { + "type": "keyword" + } + } + }, + "language": { + "properties": { + "name": { + "type": "keyword" + }, + "version": { + "type": "keyword" + }, + "composite": { + "type": "keyword" + } + } + }, + "runtime": { + "properties": { + "name": { + "type": "keyword" + }, + "version": { + "type": "keyword" + }, + "composite": { + "type": "keyword" + } + } + } + } + } + } + }, "python": { "properties": { "agent": { diff --git a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap index cc1b6688daa46..67cf7977974d7 100644 --- a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap +++ b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap @@ -23,8 +23,14 @@ Object { } `; +exports[`Error CLOUD_ACCOUNT_ID 1`] = `undefined`; + exports[`Error CLOUD_AVAILABILITY_ZONE 1`] = `"europe-west1-c"`; +exports[`Error CLOUD_INSTANCE_ID 1`] = `undefined`; + +exports[`Error CLOUD_INSTANCE_NAME 1`] = `undefined`; + exports[`Error CLOUD_MACHINE_TYPE 1`] = `undefined`; exports[`Error CLOUD_PROVIDER 1`] = `"gcp"`; @@ -258,8 +264,14 @@ Object { } `; +exports[`Span CLOUD_ACCOUNT_ID 1`] = `undefined`; + exports[`Span CLOUD_AVAILABILITY_ZONE 1`] = `"europe-west1-c"`; +exports[`Span CLOUD_INSTANCE_ID 1`] = `undefined`; + +exports[`Span CLOUD_INSTANCE_NAME 1`] = `undefined`; + exports[`Span CLOUD_MACHINE_TYPE 1`] = `undefined`; exports[`Span CLOUD_PROVIDER 1`] = `"gcp"`; @@ -485,8 +497,14 @@ Object { } `; +exports[`Transaction CLOUD_ACCOUNT_ID 1`] = `undefined`; + exports[`Transaction CLOUD_AVAILABILITY_ZONE 1`] = `"europe-west1-c"`; +exports[`Transaction CLOUD_INSTANCE_ID 1`] = `undefined`; + +exports[`Transaction CLOUD_INSTANCE_NAME 1`] = `undefined`; + exports[`Transaction CLOUD_MACHINE_TYPE 1`] = `undefined`; exports[`Transaction CLOUD_PROVIDER 1`] = `"gcp"`; diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts index 1e18fe663ef20..0e565e1d88030 100644 --- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts +++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts @@ -26,7 +26,7 @@ export const generalSettings: RawSettingDefinition[] = [ 'The maximum total compressed size of the request body which is sent to the APM Server intake api via a chunked encoding (HTTP streaming).\nNote that a small overshoot is possible.\n\nAllowed byte units are `b`, `kb` and `mb`. `1kb` is equal to `1024b`.', } ), - excludeAgents: ['js-base', 'rum-js', 'dotnet', 'go', 'nodejs'], + excludeAgents: ['js-base', 'rum-js', 'dotnet', 'go', 'nodejs', 'php'], }, // API Request Time @@ -44,7 +44,7 @@ export const generalSettings: RawSettingDefinition[] = [ "Maximum time to keep an HTTP request to the APM Server open for.\n\nNOTE: This value has to be lower than the APM Server's `read_timeout` setting.", } ), - excludeAgents: ['js-base', 'rum-js', 'dotnet', 'go', 'nodejs'], + excludeAgents: ['js-base', 'rum-js', 'dotnet', 'go', 'nodejs', 'php'], }, // Capture body @@ -69,7 +69,7 @@ export const generalSettings: RawSettingDefinition[] = [ { text: 'transactions', value: 'transactions' }, { text: 'all', value: 'all' }, ], - excludeAgents: ['js-base', 'rum-js'], + excludeAgents: ['js-base', 'rum-js', 'php'], }, // Capture headers @@ -87,7 +87,7 @@ export const generalSettings: RawSettingDefinition[] = [ 'If set to `true`, the agent will capture HTTP request and response headers (including cookies), as well as message headers/properties when using messaging frameworks (like Kafka).\n\nNOTE: Setting this to `false` reduces network bandwidth, disk space and object allocations.', } ), - excludeAgents: ['js-base', 'rum-js', 'nodejs'], + excludeAgents: ['js-base', 'rum-js', 'nodejs', 'php'], }, // LOG_LEVEL @@ -111,7 +111,7 @@ export const generalSettings: RawSettingDefinition[] = [ { text: 'critical', value: 'critical' }, { text: 'off', value: 'off' }, ], - includeAgents: ['dotnet', 'ruby', 'java', 'python', 'nodejs', 'go'], + includeAgents: ['dotnet', 'ruby', 'java', 'python', 'nodejs', 'go', 'php'], }, // Recording @@ -163,7 +163,7 @@ export const generalSettings: RawSettingDefinition[] = [ 'In its default settings, the APM agent will collect a stack trace with every recorded span.\nWhile this is very helpful to find the exact place in your code that causes the span, collecting this stack trace does have some overhead. \nWhen setting this option to a negative value, like `-1ms`, stack traces will be collected for all spans. Setting it to a positive value, e.g. `5ms`, will limit stack trace collection to spans with durations equal to or longer than the given value, e.g. 5 milliseconds.\n\nTo disable stack trace collection for spans completely, set the value to `0ms`.', } ), - excludeAgents: ['js-base', 'rum-js', 'nodejs'], + excludeAgents: ['js-base', 'rum-js', 'nodejs', 'php'], }, // STACK_TRACE_LIMIT diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts index a4560eb2ae17d..0ffa21cbd4a4d 100644 --- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts +++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts @@ -157,9 +157,17 @@ describe('filterByAgent', () => { ]); }); + it('php', () => { + expect(getSettingKeysForAgent('php')).toEqual([ + 'log_level', + 'recording', + 'transaction_max_spans', + 'transaction_sample_rate', + ]); + }); + it('"All" services (no agent name)', () => { expect(getSettingKeysForAgent(undefined)).toEqual([ - 'capture_body', 'transaction_max_spans', 'transaction_sample_rate', ]); diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts index ffd05b281208d..4b77a88e54007 100644 --- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts +++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts @@ -10,6 +10,9 @@ export const CLOUD_AVAILABILITY_ZONE = 'cloud.availability_zone'; export const CLOUD_PROVIDER = 'cloud.provider'; export const CLOUD_REGION = 'cloud.region'; export const CLOUD_MACHINE_TYPE = 'cloud.machine.type'; +export const CLOUD_ACCOUNT_ID = 'cloud.account.id'; +export const CLOUD_INSTANCE_ID = 'cloud.instance.id'; +export const CLOUD_INSTANCE_NAME = 'cloud.instance.name'; export const SERVICE = 'service'; export const SERVICE_NAME = 'service.name'; diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.tsx b/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.tsx index 7dde7ed3d145d..f7bed4e09a696 100644 --- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.tsx @@ -30,13 +30,13 @@ const cloudIcons: Record = { azure: 'logoAzure', }; -function getCloudIcon(provider?: string) { +export function getCloudIcon(provider?: string) { if (provider) { return cloudIcons[provider]; } } -function getContainerIcon(container?: ContainerType) { +export function getContainerIcon(container?: ContainerType) { if (!container) { return; } diff --git a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx index 78c8f151b82d9..cd1ced1830123 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx @@ -119,7 +119,7 @@ export function ServiceOverview({ {!isRumAgent && ( diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx index f52c2b083330f..4da5ba5a4ae64 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx @@ -5,11 +5,16 @@ * 2.0. */ -import { EuiBasicTableColumn } from '@elastic/eui'; +import { + EuiBasicTableColumn, + EuiButtonIcon, + RIGHT_ALIGNMENT, +} from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import React from 'react'; -import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types'; +import React, { ReactNode } from 'react'; +import { ActionMenu } from '../../../../../../observability/public'; import { isJavaAgentName } from '../../../../../common/agent_name'; +import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types'; import { getServiceNodeName, SERVICE_NODE_NAME_MISSING, @@ -26,6 +31,7 @@ import { MetricOverviewLink } from '../../../shared/Links/apm/MetricOverviewLink import { ServiceNodeMetricOverviewLink } from '../../../shared/Links/apm/ServiceNodeMetricOverviewLink'; import { TruncateWithTooltip } from '../../../shared/truncate_with_tooltip'; import { getLatencyColumnLabel } from '../get_latency_column_label'; +import { InstanceActionsMenu } from './instance_actions_menu'; import { MainStatsServiceInstanceItem } from '../service_overview_instances_chart_and_table'; type ServiceInstanceDetailedStatistics = APIReturnType<'GET /api/apm/services/{serviceName}/service_overview_instances/detailed_statistics'>; @@ -36,12 +42,20 @@ export function getColumns({ latencyAggregationType, detailedStatsData, comparisonEnabled, + toggleRowDetails, + itemIdToExpandedRowMap, + toggleRowActionMenu, + itemIdToOpenActionMenuRowMap, }: { serviceName: string; agentName?: string; latencyAggregationType?: LatencyAggregationType; detailedStatsData?: ServiceInstanceDetailedStatistics; comparisonEnabled?: boolean; + toggleRowDetails: (selectedServiceNodeName: string) => void; + itemIdToExpandedRowMap: Record; + toggleRowActionMenu: (selectedServiceNodeName: string) => void; + itemIdToOpenActionMenuRowMap: Record; }): Array> { return [ { @@ -82,7 +96,7 @@ export function getColumns({ sortable: true, }, { - field: 'latencyValue', + field: 'latency', name: getLatencyColumnLabel(latencyAggregationType), width: px(unit * 10), render: (_, { serviceNodeName, latency }) => { @@ -104,7 +118,7 @@ export function getColumns({ sortable: true, }, { - field: 'throughputValue', + field: 'throughput', name: i18n.translate( 'xpack.apm.serviceOverview.instancesTableColumnThroughput', { defaultMessage: 'Throughput' } @@ -130,7 +144,7 @@ export function getColumns({ sortable: true, }, { - field: 'errorRateValue', + field: 'errorRate', name: i18n.translate( 'xpack.apm.serviceOverview.instancesTableColumnErrorRate', { defaultMessage: 'Error rate' } @@ -156,7 +170,7 @@ export function getColumns({ sortable: true, }, { - field: 'cpuUsageValue', + field: 'cpuUsage', name: i18n.translate( 'xpack.apm.serviceOverview.instancesTableColumnCpuUsage', { defaultMessage: 'CPU usage (avg.)' } @@ -182,7 +196,7 @@ export function getColumns({ sortable: true, }, { - field: 'memoryUsageValue', + field: 'memoryUsage', name: i18n.translate( 'xpack.apm.serviceOverview.instancesTableColumnMemoryUsage', { defaultMessage: 'Memory usage (avg.)' } @@ -207,5 +221,56 @@ export function getColumns({ }, sortable: true, }, + { + width: '40px', + render: (instanceItem: MainStatsServiceInstanceItem) => { + return ( + + toggleRowActionMenu(instanceItem.serviceNodeName) + } + isOpen={itemIdToOpenActionMenuRowMap[instanceItem.serviceNodeName]} + anchorPosition="leftCenter" + button={ + + toggleRowActionMenu(instanceItem.serviceNodeName) + } + /> + } + > + toggleRowActionMenu(instanceItem.serviceNodeName)} + /> + + ); + }, + }, + { + align: RIGHT_ALIGNMENT, + width: '40px', + isExpander: true, + render: (instanceItem: MainStatsServiceInstanceItem) => { + return ( + toggleRowDetails(instanceItem.serviceNodeName)} + aria-label={ + itemIdToExpandedRowMap[instanceItem.serviceNodeName] + ? 'Collapse' + : 'Expand' + } + iconType={ + itemIdToExpandedRowMap[instanceItem.serviceNodeName] + ? 'arrowUp' + : 'arrowDown' + } + /> + ); + }, + }, ]; } diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx index 1bab5e45bcc52..fe367896c4652 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx @@ -12,7 +12,7 @@ import { EuiTitle, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import React from 'react'; +import React, { ReactNode, useEffect, useState } from 'react'; import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context'; import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; import { FETCH_STATUS } from '../../../../hooks/use_fetcher'; @@ -26,6 +26,7 @@ import { } from '../service_overview_instances_chart_and_table'; import { ServiceOverviewTableContainer } from '../service_overview_table_container'; import { getColumns } from './get_columns'; +import { InstanceDetails } from './intance_details'; type ServiceInstanceDetailedStatistics = APIReturnType<'GET /api/apm/services/{serviceName}/service_overview_instances/detailed_statistics'>; @@ -65,15 +66,58 @@ export function ServiceOverviewInstancesTable({ urlParams: { latencyAggregationType, comparisonEnabled }, } = useUrlParams(); + const [ + itemIdToOpenActionMenuRowMap, + setItemIdToOpenActionMenuRowMap, + ] = useState>({}); + + const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState< + Record + >({}); + + useEffect(() => { + // Closes any open rows when fetching new items + setItemIdToExpandedRowMap({}); + }, [status]); + const { pageIndex, sort } = tableOptions; const { direction, field } = sort; + const toggleRowActionMenu = (selectedServiceNodeName: string) => { + const actionMenuRowMapValues = { ...itemIdToOpenActionMenuRowMap }; + if (actionMenuRowMapValues[selectedServiceNodeName]) { + delete actionMenuRowMapValues[selectedServiceNodeName]; + } else { + actionMenuRowMapValues[selectedServiceNodeName] = true; + } + setItemIdToOpenActionMenuRowMap(actionMenuRowMapValues); + }; + + const toggleRowDetails = (selectedServiceNodeName: string) => { + const expandedRowMapValues = { ...itemIdToExpandedRowMap }; + if (expandedRowMapValues[selectedServiceNodeName]) { + delete expandedRowMapValues[selectedServiceNodeName]; + } else { + expandedRowMapValues[selectedServiceNodeName] = ( + + ); + } + setItemIdToExpandedRowMap(expandedRowMapValues); + }; + const columns = getColumns({ agentName, serviceName, latencyAggregationType, detailedStatsData, comparisonEnabled, + toggleRowDetails, + itemIdToExpandedRowMap, + toggleRowActionMenu, + itemIdToOpenActionMenuRowMap, }); const pagination = { @@ -106,6 +150,8 @@ export function ServiceOverviewInstancesTable({ pagination={pagination} sorting={{ sort: { field, direction } }} onChange={onChangeTableOptions} + itemId="serviceNodeName" + itemIdToExpandedRowMap={itemIdToExpandedRowMap} /> diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx new file mode 100644 index 0000000000000..f03c2b2fc9091 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx @@ -0,0 +1,131 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import { EuiLoadingSpinner } from '@elastic/eui'; +import React from 'react'; +import { useHistory } from 'react-router-dom'; +import { + ActionMenuDivider, + Section, + SectionLink, + SectionLinks, + SectionSubtitle, + SectionTitle, +} from '../../../../../../../observability/public'; +import { isJavaAgentName } from '../../../../../../common/agent_name'; +import { SERVICE_NODE_NAME } from '../../../../../../common/elasticsearch_fieldnames'; +import { useApmPluginContext } from '../../../../../context/apm_plugin/use_apm_plugin_context'; +import { useUrlParams } from '../../../../../context/url_params_context/use_url_params'; +import { FETCH_STATUS } from '../../../../../hooks/use_fetcher'; +import { px } from '../../../../../style/variables'; +import { pushNewItemToKueryBar } from '../../../../shared/KueryBar/utils'; +import { useMetricOverviewHref } from '../../../../shared/Links/apm/MetricOverviewLink'; +import { useServiceNodeMetricOverviewHref } from '../../../../shared/Links/apm/ServiceNodeMetricOverviewLink'; +import { useInstanceDetailsFetcher } from '../use_instance_details_fetcher'; +import { getMenuSections } from './menu_sections'; + +interface Props { + serviceName: string; + serviceNodeName: string; + onClose: () => void; +} + +const POPOVER_WIDTH = px(305); + +export function InstanceActionsMenu({ + serviceName, + serviceNodeName, + onClose, +}: Props) { + const { core } = useApmPluginContext(); + const { data, status } = useInstanceDetailsFetcher({ + serviceName, + serviceNodeName, + }); + const serviceNodeMetricOverviewHref = useServiceNodeMetricOverviewHref({ + serviceName, + serviceNodeName, + }); + const metricOverviewHref = useMetricOverviewHref(serviceName); + const history = useHistory(); + const { + urlParams: { kuery }, + } = useUrlParams(); + + if ( + status === FETCH_STATUS.LOADING || + status === FETCH_STATUS.NOT_INITIATED + ) { + return ( +

+ +
+ ); + } + + if (!data) { + return null; + } + + const handleFilterByInstanceClick = () => { + onClose(); + pushNewItemToKueryBar({ + kuery, + history, + key: SERVICE_NODE_NAME, + value: serviceNodeName, + }); + }; + + const metricsHref = isJavaAgentName(data.agent?.name) + ? serviceNodeMetricOverviewHref + : metricOverviewHref; + + const sections = getMenuSections({ + instanceDetails: data, + basePath: core.http.basePath, + onFilterByInstanceClick: handleFilterByInstanceClick, + metricsHref, + }); + + return ( +
+ {sections.map((section, idx) => { + const isLastSection = idx !== sections.length - 1; + return ( +
+ {section.map((item) => ( +
+ {item.title && {item.title}} + {item.subtitle && ( + {item.subtitle} + )} + + {item.actions.map((action) => ( + + ))} + +
+ ))} + {isLastSection && } +
+ ); + })} +
+ ); +} diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts new file mode 100644 index 0000000000000..30995fbd13397 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts @@ -0,0 +1,203 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { i18n } from '@kbn/i18n'; +import { IBasePath } from 'kibana/public'; +import { isEmpty } from 'lodash'; +import moment from 'moment'; +import { APIReturnType } from '../../../../../services/rest/createCallApmApi'; +import { getInfraHref } from '../../../../shared/Links/InfraLink'; + +type InstaceDetails = APIReturnType<'GET /api/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}'>; + +interface Action { + key: string; + label: string; + href?: string; + onClick?: () => void; + condition: boolean; +} + +interface Section { + key: string; + title?: string; + subtitle?: string; + actions: Action[]; +} + +type SectionRecord = Record; + +function getInfraMetricsQuery(timestamp?: string) { + if (!timestamp) { + return { from: 0, to: 0 }; + } + const timeInMilliseconds = new Date(timestamp).getTime(); + const fiveMinutes = moment.duration(5, 'minutes').asMilliseconds(); + + return { + from: timeInMilliseconds - fiveMinutes, + to: timeInMilliseconds + fiveMinutes, + }; +} + +export function getMenuSections({ + instanceDetails, + basePath, + onFilterByInstanceClick, + metricsHref, +}: { + instanceDetails: InstaceDetails; + basePath: IBasePath; + onFilterByInstanceClick: () => void; + metricsHref: string; +}) { + const podId = instanceDetails.kubernetes?.pod?.uid; + const containerId = instanceDetails.container?.id; + const time = instanceDetails['@timestamp'] + ? new Date(instanceDetails['@timestamp']).valueOf() + : undefined; + const infraMetricsQuery = getInfraMetricsQuery(instanceDetails['@timestamp']); + + const podActions: Action[] = [ + { + key: 'podLogs', + label: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.podLogs', + { defaultMessage: 'Pod logs' } + ), + href: getInfraHref({ + app: 'logs', + basePath, + path: `/link-to/pod-logs/${podId}`, + query: { time }, + }), + condition: !!podId, + }, + { + key: 'podMetrics', + label: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.podMetrics', + { defaultMessage: 'Pod metrics' } + ), + href: getInfraHref({ + app: 'metrics', + basePath, + path: `/link-to/pod-detail/${podId}`, + query: infraMetricsQuery, + }), + condition: !!podId, + }, + ]; + + const containerActions: Action[] = [ + { + key: 'containerLogs', + label: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.containerLogs', + { defaultMessage: 'Container logs' } + ), + href: getInfraHref({ + app: 'logs', + basePath, + path: `/link-to/container-logs/${containerId}`, + query: { time }, + }), + condition: !!containerId, + }, + { + key: 'containerMetrics', + label: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.containerMetrics', + { defaultMessage: 'Container metrics' } + ), + href: getInfraHref({ + app: 'metrics', + basePath, + path: `/link-to/container-detail/${containerId}`, + query: infraMetricsQuery, + }), + condition: !!containerId, + }, + ]; + + const apmActions: Action[] = [ + { + key: 'filterByInstance', + label: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.filterByInstance', + { + defaultMessage: 'Filter overview by instance', + } + ), + onClick: onFilterByInstanceClick, + condition: true, + }, + { + key: 'analyzeRuntimeMetric', + label: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.metrics', + { + defaultMessage: 'Metrics', + } + ), + href: metricsHref, + condition: true, + }, + ]; + + const sectionRecord: SectionRecord = { + observability: [ + { + key: 'podDetails', + title: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.pod.title', + { + defaultMessage: 'Pod details', + } + ), + subtitle: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.pod.subtitle', + { + defaultMessage: + 'View logs and metrics for this pod to get further details.', + } + ), + actions: podActions, + }, + { + key: 'containerDetails', + title: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.container.title', + { + defaultMessage: 'Container details', + } + ), + subtitle: i18n.translate( + 'xpack.apm.serviceOverview.instancesTable.actionMenus.container.subtitle', + { + defaultMessage: + 'View logs and metrics for this container to get further details.', + } + ), + actions: containerActions, + }, + ], + apm: [{ key: 'apm', actions: apmActions }], + }; + + // Filter out actions that shouldnt be shown and sections without any actions. + return Object.values(sectionRecord) + .map((sections) => + sections + .map((section) => ({ + ...section, + actions: section.actions.filter((action) => action.condition), + })) + .filter((section) => !isEmpty(section.actions)) + ) + .filter((sections) => !isEmpty(sections)); +} diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx new file mode 100644 index 0000000000000..f50d02bb15454 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx @@ -0,0 +1,144 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiLoadingContent } from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { get } from 'lodash'; +import React from 'react'; +import { useHistory } from 'react-router-dom'; +import { + CLOUD_AVAILABILITY_ZONE, + CLOUD_INSTANCE_ID, + CLOUD_INSTANCE_NAME, + CLOUD_MACHINE_TYPE, + CLOUD_PROVIDER, + CONTAINER_ID, + HOST_NAME, + POD_NAME, + SERVICE_NODE_NAME, + SERVICE_RUNTIME_NAME, + SERVICE_RUNTIME_VERSION, + SERVICE_VERSION, +} from '../../../../../common/elasticsearch_fieldnames'; +import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; +import { FETCH_STATUS } from '../../../../hooks/use_fetcher'; +import { useTheme } from '../../../../hooks/use_theme'; +import { APIReturnType } from '../../../../services/rest/createCallApmApi'; +import { pct } from '../../../../style/variables'; +import { getAgentIcon } from '../../../shared/AgentIcon/get_agent_icon'; +import { KeyValueFilterList } from '../../../shared/key_value_filter_list'; +import { pushNewItemToKueryBar } from '../../../shared/KueryBar/utils'; +import { + getCloudIcon, + getContainerIcon, +} from '../../service_details/service_icons'; +import { useInstanceDetailsFetcher } from './use_instance_details_fetcher'; + +type ServiceInstanceDetails = APIReturnType<'GET /api/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}'>; + +interface Props { + serviceName: string; + serviceNodeName: string; +} + +function toKeyValuePairs(keys: string[], data: ServiceInstanceDetails) { + return keys.map((key) => ({ key, value: get(data, key) })); +} + +const serviceDetailsKeys = [ + SERVICE_NODE_NAME, + SERVICE_VERSION, + SERVICE_RUNTIME_NAME, + SERVICE_RUNTIME_VERSION, +]; +const containerDetailsKeys = [CONTAINER_ID, HOST_NAME, POD_NAME]; +const cloudDetailsKeys = [ + CLOUD_AVAILABILITY_ZONE, + CLOUD_INSTANCE_ID, + CLOUD_INSTANCE_NAME, + CLOUD_MACHINE_TYPE, + CLOUD_PROVIDER, +]; + +export function InstanceDetails({ serviceName, serviceNodeName }: Props) { + const theme = useTheme(); + const history = useHistory(); + const { + urlParams: { kuery }, + } = useUrlParams(); + + const { data, status } = useInstanceDetailsFetcher({ + serviceName, + serviceNodeName, + }); + + if ( + status === FETCH_STATUS.LOADING || + status === FETCH_STATUS.NOT_INITIATED + ) { + return ( +
+ +
+ ); + } + + if (!data) { + return null; + } + + const addKueryBarFilter = ({ key, value }: { key: string; value: any }) => { + pushNewItemToKueryBar({ kuery, history, key, value }); + }; + + const serviceDetailsKeyValuePairs = toKeyValuePairs(serviceDetailsKeys, data); + const containerDetailsKeyValuePairs = toKeyValuePairs( + containerDetailsKeys, + data + ); + const cloudDetailsKeyValuePairs = toKeyValuePairs(cloudDetailsKeys, data); + + const containerType = data.kubernetes?.pod?.name ? 'Kubernetes' : 'Docker'; + return ( + + + + + + + + + + + + ); +} diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/use_instance_details_fetcher.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/use_instance_details_fetcher.tsx new file mode 100644 index 0000000000000..7a5da7e3e462b --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/use_instance_details_fetcher.tsx @@ -0,0 +1,52 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context'; +import { useFetcher } from '../../../../hooks/use_fetcher'; +import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; + +export function useInstanceDetailsFetcher({ + serviceName, + serviceNodeName, +}: { + serviceName: string; + serviceNodeName: string; +}) { + const { + urlParams: { start, end, kuery, environment }, + } = useUrlParams(); + const { transactionType } = useApmServiceContext(); + + const { data, status } = useFetcher( + (callApmApi) => { + if (!start || !end || !transactionType) { + return; + } + return callApmApi({ + endpoint: + 'GET /api/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}', + params: { + path: { + serviceName, + serviceNodeName, + }, + query: { start, end, transactionType, environment, kuery }, + }, + }); + }, + [ + serviceName, + serviceNodeName, + start, + end, + transactionType, + environment, + kuery, + ] + ); + + return { data, status }; +} diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_table_container.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_table_container.tsx index 738ff0d7c735f..64b6943e73260 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_table_container.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_table_container.tsx @@ -32,7 +32,7 @@ const ServiceOverviewTableContainerDiv = euiStyled.div<{ shouldUseMobileLayout ? '' : ` - height: ${tableHeight}px; + min-height: ${tableHeight}px; display: flex; flex-direction: column; diff --git a/x-pack/plugins/apm/public/components/shared/KueryBar/utils.ts b/x-pack/plugins/apm/public/components/shared/KueryBar/utils.ts new file mode 100644 index 0000000000000..56aed1227b1e0 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/KueryBar/utils.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { History } from 'history'; +import { isEmpty } from 'lodash'; +import { push } from '../Links/url_helpers'; + +export function pushNewItemToKueryBar({ + kuery, + history, + key, + value, +}: { + kuery?: string; + history: History; + key: string; + value: any; +}) { + const newItem = `${key} :"${value}"`; + const nextKuery = isEmpty(kuery) ? newItem : `${kuery} and ${newItem}`; + push(history, { + query: { kuery: encodeURIComponent(nextKuery) }, + }); +} diff --git a/x-pack/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx b/x-pack/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx index 7ad7f18b425cd..aad5756b70e7e 100644 --- a/x-pack/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx +++ b/x-pack/plugins/apm/public/components/shared/Links/apm/ServiceNodeMetricOverviewLink.tsx @@ -5,40 +5,46 @@ * 2.0. */ +import { EuiLink } from '@elastic/eui'; import React from 'react'; -import { APMLink, APMLinkExtendProps } from './APMLink'; -import { useUrlParams } from '../../../../context/url_params_context/use_url_params'; -import { pickKeys } from '../../../../../common/utils/pick_keys'; +import { APMQueryParams } from '../url_helpers'; +import { APMLinkExtendProps, useAPMHref } from './APMLink'; interface Props extends APMLinkExtendProps { serviceName: string; serviceNodeName: string; } -function ServiceNodeMetricOverviewLink({ +const persistedFilters: Array = [ + 'host', + 'containerId', + 'podName', + 'serviceVersion', +]; + +export function useServiceNodeMetricOverviewHref({ + serviceName, + serviceNodeName, +}: { + serviceName: string; + serviceNodeName: string; +}) { + return useAPMHref({ + path: `/services/${serviceName}/nodes/${encodeURIComponent( + serviceNodeName + )}/metrics`, + persistedFilters, + }); +} + +export function ServiceNodeMetricOverviewLink({ serviceName, serviceNodeName, ...rest }: Props) { - const { urlParams } = useUrlParams(); - - const persistedFilters = pickKeys( - urlParams, - 'host', - 'containerId', - 'podName', - 'serviceVersion' - ); - - return ( - - ); + const href = useServiceNodeMetricOverviewHref({ + serviceName, + serviceNodeName, + }); + return ; } - -export { ServiceNodeMetricOverviewLink }; diff --git a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/index.tsx b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/index.tsx new file mode 100644 index 0000000000000..c836919a8a6ab --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/index.tsx @@ -0,0 +1,147 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import { + EuiAccordion, + EuiButtonEmpty, + EuiDescriptionList, + EuiDescriptionListDescription, + EuiDescriptionListTitle, + EuiFlexGroup, + EuiFlexItem, + EuiIcon, + EuiText, + EuiToolTip, +} from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import React, { Fragment } from 'react'; +import styled from 'styled-components'; +import { px, units } from '../../../style/variables'; + +interface KeyValue { + key: string; + value: any | undefined; +} + +const StyledEuiAccordion = styled(EuiAccordion)` + width: 100%; + .buttonContentContainer .euiIEFlexWrapFix { + width: 100%; + } +`; + +const StyledEuiDescriptionList = styled(EuiDescriptionList)` + margin: ${px(units.half)} ${px(units.half)} 0 ${px(units.half)}; + .descriptionList__title, + .descriptionList__description { + border-bottom: ${({ theme }) => theme.eui.euiBorderThin}; + margin-top: 0; + align-items: center; + display: flex; +`; + +const ValueContainer = styled.div` + display: flex; + align-items: center; +`; + +function removeEmptyValues(items: KeyValue[]) { + return items.filter(({ value }) => value !== undefined); +} + +export function KeyValueFilterList({ + icon, + title, + keyValueList, + initialIsOpen = false, + onClickFilter, +}: { + title: string; + keyValueList: KeyValue[]; + initialIsOpen?: boolean; + icon?: string; + onClickFilter: (filter: { key: string; value: any }) => void; +}) { + if (!keyValueList.length) { + return null; + } + + return ( + } + buttonClassName="buttonContentContainer" + > + + {removeEmptyValues(keyValueList).map(({ key, value }) => { + return ( + + + + {key} + + + + + { + onClickFilter({ key, value }); + }} + data-test-subj={`filter_by_${key}`} + > + + + + + {value} + + + + ); + })} + + + ); +} + +function AccordionButtonContent({ + icon, + title, +}: { + icon?: string; + title: string; +}) { + return ( + + {icon && ( + + + + )} + + {title} + + + ); +} diff --git a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx new file mode 100644 index 0000000000000..78a7698259e7a --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx @@ -0,0 +1,90 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import React from 'react'; +import { KeyValueFilterList } from './'; +import { + expectTextsInDocument, + renderWithTheme, +} from '../../../utils/testHelpers'; +import { fireEvent } from '@testing-library/react'; + +describe('KeyValueFilterList', () => { + it('hides accordion when key value list is empty', () => { + const { container } = renderWithTheme( + + ); + expect(container).toBeEmptyDOMElement(); + }); + it('shows list of key value pairs', () => { + const component = renderWithTheme( + + ); + expectTextsInDocument(component, [ + 'title', + 'foo', + 'foo value', + 'bar', + 'bar value', + ]); + }); + it('shows icon and title on accordion', () => { + const component = renderWithTheme( + + ); + expect(component.getByTestId('accordion_title_icon')).toBeInTheDocument(); + expectTextsInDocument(component, ['title']); + }); + it('hides icon and only shows title on accordion', () => { + const component = renderWithTheme( + + ); + expect(component.queryAllByTestId('accordion_title_icon')).toEqual([]); + expectTextsInDocument(component, ['title']); + }); + it('returns selected key value when the filter button is clicked', () => { + const mockFilter = jest.fn(); + const component = renderWithTheme( + + ); + + fireEvent.click(component.getByTestId('filter_by_foo')); + expect(mockFilter).toHaveBeenCalledWith({ key: 'foo', value: 'foo value' }); + }); +}); diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts index 565e437504ee5..0b1bc3d50d4c1 100644 --- a/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts +++ b/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts @@ -78,6 +78,7 @@ const apmPerAgentSchema: Pick< java: long, 'js-base': long, nodejs: long, + php: long, python: long, ruby: long, 'rum-js': long, @@ -99,6 +100,7 @@ const apmPerAgentSchema: Pick< java: agentSchema, 'js-base': agentSchema, nodejs: agentSchema, + php: agentSchema, python: agentSchema, ruby: agentSchema, 'rum-js': agentSchema, diff --git a/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts b/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts index ec96b5225d617..8de2e4e1cca42 100644 --- a/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts +++ b/x-pack/plugins/apm/server/lib/rum_client/has_rum_data.ts @@ -49,11 +49,16 @@ export async function hasRumData({ setup }: { setup: Setup & SetupTimeRange }) { const response = await apmEventClient.search(params); return { + indices: setup.indices['apm_oss.transactionIndices']!, hasData: response.hits.total.value > 0, serviceName: response.aggregations?.services?.mostTraffic?.buckets?.[0]?.key, }; } catch (e) { - return { hasData: false, serviceName: undefined }; + return { + hasData: false, + serviceName: undefined, + indices: setup.indices['apm_oss.transactionIndices']!, + }; } } diff --git a/x-pack/plugins/apm/server/lib/services/get_service_instance_metadata_details.ts b/x-pack/plugins/apm/server/lib/services/get_service_instance_metadata_details.ts new file mode 100644 index 0000000000000..25935bcc37dff --- /dev/null +++ b/x-pack/plugins/apm/server/lib/services/get_service_instance_metadata_details.ts @@ -0,0 +1,84 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { + SERVICE_NAME, + SERVICE_NODE_NAME, + TRANSACTION_TYPE, +} from '../../../common/elasticsearch_fieldnames'; +import { environmentQuery, kqlQuery, rangeQuery } from '../../utils/queries'; +import { withApmSpan } from '../../utils/with_apm_span'; +import { getProcessorEventForAggregatedTransactions } from '../helpers/aggregated_transactions'; +import { Setup, SetupTimeRange } from '../helpers/setup_request'; + +export interface KeyValue { + key: string; + value: any | undefined; +} + +export async function getServiceInstanceMetadataDetails({ + serviceName, + serviceNodeName, + setup, + searchAggregatedTransactions, + transactionType, + environment, + kuery, +}: { + serviceName: string; + serviceNodeName: string; + setup: Setup & SetupTimeRange; + searchAggregatedTransactions: boolean; + transactionType: string; + environment?: string; + kuery?: string; +}) { + return withApmSpan('get_service_instance_metadata_details', async () => { + const { start, end, apmEventClient } = setup; + const filter = [ + { term: { [SERVICE_NAME]: serviceName } }, + { term: { [SERVICE_NODE_NAME]: serviceNodeName } }, + { term: { [TRANSACTION_TYPE]: transactionType } }, + ...rangeQuery(start, end), + ...environmentQuery(environment), + ...kqlQuery(kuery), + ]; + + const response = await apmEventClient.search({ + apm: { + events: [ + getProcessorEventForAggregatedTransactions( + searchAggregatedTransactions + ), + ], + }, + body: { + terminate_after: 1, + size: 1, + query: { bool: { filter } }, + }, + }); + + const sample = response.hits.hits[0]?._source; + + if (!sample) { + return {}; + } + + const { agent, service, container, kubernetes, host, cloud } = sample; + + return { + '@timestamp': sample['@timestamp'], + agent, + service, + container, + kubernetes, + host, + cloud, + }; + }); +} diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts index 30aa4cce45d04..a27c7d5ba38d2 100644 --- a/x-pack/plugins/apm/server/routes/services.ts +++ b/x-pack/plugins/apm/server/routes/services.ts @@ -18,6 +18,7 @@ import { getServices } from '../lib/services/get_services'; import { getServiceAgentName } from '../lib/services/get_service_agent_name'; import { getServiceAlerts } from '../lib/services/get_service_alerts'; import { getServiceDependencies } from '../lib/services/get_service_dependencies'; +import { getServiceInstanceMetadataDetails } from '../lib/services/get_service_instance_metadata_details'; import { getServiceErrorGroupPeriods } from '../lib/services/get_service_error_groups/get_service_error_group_detailed_statistics'; import { getServiceErrorGroupMainStatistics } from '../lib/services/get_service_error_groups/get_service_error_group_main_statistics'; import { getServiceInstancesDetailedStatisticsPeriods } from '../lib/services/get_service_instances/detailed_statistics'; @@ -551,7 +552,44 @@ const serviceInstancesDetailedStatisticsRoute = createApmServerRoute({ }, }); -const serviceDependenciesRoute = createApmServerRoute({ +export const serviceInstancesMetadataDetails = createApmServerRoute({ + endpoint: + 'GET /api/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}', + params: t.type({ + path: t.type({ + serviceName: t.string, + serviceNodeName: t.string, + }), + query: t.intersection([ + t.type({ transactionType: t.string }), + environmentRt, + kueryRt, + rangeRt, + ]), + }), + options: { tags: ['access:apm'] }, + handler: async (resources) => { + const setup = await setupRequest(resources); + const { serviceName, serviceNodeName } = resources.params.path; + const { transactionType, environment, kuery } = resources.params.query; + + const searchAggregatedTransactions = await getSearchAggregatedTransactions( + setup + ); + + return await getServiceInstanceMetadataDetails({ + searchAggregatedTransactions, + setup, + serviceName, + serviceNodeName, + transactionType, + environment, + kuery, + }); + }, +}); + +export const serviceDependenciesRoute = createApmServerRoute({ endpoint: 'GET /api/apm/services/{serviceName}/dependencies', params: t.type({ path: t.type({ @@ -724,6 +762,7 @@ export const serviceRouteRepository = createApmServerRouteRepository() .add(serviceAnnotationsCreateRoute) .add(serviceErrorGroupsMainStatisticsRoute) .add(serviceErrorGroupsDetailedStatisticsRoute) + .add(serviceInstancesMetadataDetails) .add(serviceThroughputRoute) .add(serviceInstancesMainStatisticsRoute) .add(serviceInstancesDetailedStatisticsRoute) diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/metric_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/metric_raw.ts index c79a35093df52..d7d015fd21da5 100644 --- a/x-pack/plugins/apm/typings/es_schemas/raw/metric_raw.ts +++ b/x-pack/plugins/apm/typings/es_schemas/raw/metric_raw.ts @@ -6,14 +6,22 @@ */ import { APMBaseDoc } from './apm_base_doc'; +import { Cloud } from './fields/cloud'; import { Container } from './fields/container'; +import { Host } from './fields/host'; import { Kubernetes } from './fields/kubernetes'; +import { Service } from './fields/service'; type BaseMetric = APMBaseDoc & { processor: { name: 'metric'; event: 'metric'; }; + cloud?: Cloud; + container?: Container; + kubernetes?: Kubernetes; + service?: Service; + host?: Host; }; type BaseBreakdownMetric = BaseMetric & { @@ -86,8 +94,6 @@ type TransactionDurationMetric = BaseMetric & { environment?: string; version?: string; }; - container?: Container; - kubernetes?: Kubernetes; }; export type SpanDestinationMetric = BaseMetric & { diff --git a/x-pack/plugins/apm/typings/es_schemas/ui/fields/agent.ts b/x-pack/plugins/apm/typings/es_schemas/ui/fields/agent.ts index 29f11e638f195..6bc18ed8b1575 100644 --- a/x-pack/plugins/apm/typings/es_schemas/ui/fields/agent.ts +++ b/x-pack/plugins/apm/typings/es_schemas/ui/fields/agent.ts @@ -13,7 +13,8 @@ export type ElasticAgentName = | 'nodejs' | 'python' | 'dotnet' - | 'ruby'; + | 'ruby' + | 'php'; export type OpenTelemetryAgentName = | 'otlp' diff --git a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts index 144d77df064c7..18cfe1a3df56c 100644 --- a/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts +++ b/x-pack/plugins/canvas/server/collectors/custom_element_collector.ts @@ -34,13 +34,41 @@ export interface CustomElementTelemetry { export const customElementSchema: MakeSchemaFrom = { custom_elements: { - count: { type: 'long' }, + count: { + type: 'long', + _meta: { + description: 'The total number of custom Canvas elements', + }, + }, elements: { - min: { type: 'long' }, - max: { type: 'long' }, - avg: { type: 'float' }, + min: { + type: 'long', + _meta: { + description: 'The minimum number of elements used across all Canvas Custom Elements', + }, + }, + max: { + type: 'long', + _meta: { + description: 'The maximum number of elements used across all Canvas Custom Elements', + }, + }, + avg: { + type: 'float', + _meta: { + description: 'The average number of elements used in Canvas Custom Element', + }, + }, + }, + functions_in_use: { + type: 'array', + items: { + type: 'keyword', + _meta: { + description: 'The functions in use by Canvas Custom Elements', + }, + }, }, - functions_in_use: { type: 'array', items: { type: 'keyword' } }, }, }; diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts index 0e132047b2bbd..a82a0d45fa896 100644 --- a/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts +++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts @@ -8,6 +8,7 @@ import { cloneDeep } from 'lodash'; import { summarizeWorkpads } from './workpad_collector'; import { workpads } from '../../__fixtures__/workpads'; +import moment from 'moment'; describe('usage collector handle es response data', () => { it('should summarize workpads, pages, and elements', () => { @@ -49,6 +50,8 @@ describe('usage collector handle es response data', () => { 'image', 'shape', ], + in_use_30d: [], + in_use_90d: [], }, variables: { total: 7, @@ -71,7 +74,13 @@ describe('usage collector handle es response data', () => { workpads: { total: 1 }, pages: { total: 1, per_workpad: { avg: 1, min: 1, max: 1 } }, elements: { total: 1, per_page: { avg: 1, min: 1, max: 1 } }, - functions: { total: 1, in_use: ['toast'], per_element: { avg: 1, min: 1, max: 1 } }, + functions: { + total: 1, + in_use: ['toast'], + in_use_30d: [], + in_use_90d: [], + per_element: { avg: 1, min: 1, max: 1 }, + }, variables: { total: 1, per_workpad: { avg: 1, min: 1, max: 1 } }, }); }); @@ -116,6 +125,8 @@ describe('usage collector handle es response data', () => { 'plot', 'seriesStyle', ], + in_use_30d: [], + in_use_90d: [], per_element: { avg: 7, min: 7, max: 7 }, }, variables: { total: 0, per_workpad: { avg: 0, min: 0, max: 0 } }, // Variables still possible even with no pages @@ -126,4 +137,42 @@ describe('usage collector handle es response data', () => { const usage = summarizeWorkpads([]); expect(usage).toEqual({}); }); + + describe('functions', () => { + it('collects funtions used in the most recent 30d and 90d', () => { + const thirtyDayFunction = '30d'; + const ninetyDayFunction = '90d'; + const otherFunction = '180d'; + + const workpad30d = cloneDeep(workpads[0]); + const workpad90d = cloneDeep(workpads[0]); + const workpad180d = cloneDeep(workpads[0]); + + const now = moment(); + + workpad30d['@timestamp'] = now.subtract(1, 'day').toDate().toISOString(); + workpad90d['@timestamp'] = now.subtract(80, 'day').toDate().toISOString(); + workpad180d['@timestamp'] = now.subtract(180, 'day').toDate().toISOString(); + + workpad30d.pages[0].elements[0].expression = `${thirtyDayFunction}`; + workpad90d.pages[0].elements[0].expression = `${ninetyDayFunction}`; + workpad180d.pages[0].elements[0].expression = `${otherFunction}`; + + const mockWorkpads = [workpad30d, workpad90d, workpad180d]; + const usage = summarizeWorkpads(mockWorkpads); + + expect(usage.functions?.in_use_30d).toHaveLength(1); + expect(usage.functions?.in_use_30d).toEqual(expect.arrayContaining([thirtyDayFunction])); + + expect(usage.functions?.in_use_90d).toHaveLength(2); + expect(usage.functions?.in_use_90d).toEqual( + expect.arrayContaining([thirtyDayFunction, ninetyDayFunction]) + ); + + expect(usage.functions?.in_use).toHaveLength(3); + expect(usage.functions?.in_use).toEqual( + expect.arrayContaining([thirtyDayFunction, ninetyDayFunction, otherFunction]) + ); + }); + }); }); diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts index 7342cb5d40357..427c8c8a6571f 100644 --- a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts +++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts @@ -6,6 +6,7 @@ */ import { sum as arraySum, min as arrayMin, max as arrayMax, get } from 'lodash'; +import moment from 'moment'; import { MakeSchemaFrom } from 'src/plugins/usage_collection/server'; import { CANVAS_TYPE } from '../../common/lib/constants'; import { collectFns } from './collector_helpers'; @@ -39,6 +40,8 @@ export interface WorkpadTelemetry { functions?: { total: number; in_use: string[]; + in_use_30d: string[]; + in_use_90d: string[]; per_element: { avg: number; min: number; @@ -56,38 +59,156 @@ export interface WorkpadTelemetry { } export const workpadSchema: MakeSchemaFrom = { - workpads: { total: { type: 'long' } }, + workpads: { + total: { + type: 'long', + _meta: { + description: 'The total number of Canvas Workpads in the cluster', + }, + }, + }, pages: { - total: { type: 'long' }, + total: { + type: 'long', + _meta: { + description: 'The total number of pages across all Canvas Workpads', + }, + }, per_workpad: { - avg: { type: 'float' }, - min: { type: 'long' }, - max: { type: 'long' }, + avg: { + type: 'float', + _meta: { + description: 'The average number of pages across all Canvas Workpads', + }, + }, + min: { + type: 'long', + _meta: { + description: 'The minimum number of pages found in a Canvas Workpad', + }, + }, + max: { + type: 'long', + _meta: { + description: 'The maximum number of pages found in a Canvas Workpad', + }, + }, }, }, elements: { - total: { type: 'long' }, + total: { + type: 'long', + _meta: { + description: 'The total number of elements across all Canvas Workpads', + }, + }, per_page: { - avg: { type: 'float' }, - min: { type: 'long' }, - max: { type: 'long' }, + avg: { + type: 'float', + _meta: { + description: 'The average number of elements per page across all Canvas Workpads', + }, + }, + min: { + type: 'long', + _meta: { + description: 'The minimum number of elements on a page across all Canvas Workpads', + }, + }, + max: { + type: 'long', + _meta: { + description: 'The maximum number of elements on a page across all Canvas Workpads', + }, + }, }, }, functions: { - total: { type: 'long' }, - in_use: { type: 'array', items: { type: 'keyword' } }, + total: { + type: 'long', + _meta: { + description: 'The total number of functions in use across all Canvas Workpads', + }, + }, + in_use: { + type: 'array', + items: { + type: 'keyword', + _meta: { + description: 'A function in use in any Canvas Workpad', + }, + }, + }, + in_use_30d: { + type: 'array', + items: { + type: 'keyword', + _meta: { + description: + 'A function in use in a Canvas Workpad that has been modified in the last 30 days', + }, + }, + }, + in_use_90d: { + type: 'array', + items: { + type: 'keyword', + _meta: { + description: + 'A function in use in a Canvas Workpad that has been modified in the last 90 days', + }, + }, + }, per_element: { - avg: { type: 'float' }, - min: { type: 'long' }, - max: { type: 'long' }, + avg: { + type: 'float', + _meta: { + description: 'Average number of functions used per element across all Canvas Workpads', + }, + }, + min: { + type: 'long', + _meta: { + description: + 'The minimum number of functions used in an element across all Canvas Workpads', + }, + }, + max: { + type: 'long', + _meta: { + description: + 'The maximum number of functions used in an element across all Canvas Workpads', + }, + }, }, }, variables: { - total: { type: 'long' }, + total: { + type: 'long', + _meta: { + description: 'The total number of variables defined across all Canvas Workpads', + }, + }, + per_workpad: { - avg: { type: 'float' }, - min: { type: 'long' }, - max: { type: 'long' }, + avg: { + type: 'float', + _meta: { + description: 'The average number of variables set per Canvas Workpad', + }, + }, + min: { + type: 'long', + _meta: { + description: 'The minimum number variables set across all Canvas Workpads', + }, + }, + max: { + type: 'long', + _meta: { + description: 'The maximum number of variables set across all Canvas Workpads', + }, + }, }, }, }; @@ -98,6 +219,11 @@ export const workpadSchema: MakeSchemaFrom = { @returns Workpad Telemetry Data */ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetry { + const functionCollection = { + all: new Set(), + '30d': new Set(), + '90d': new Set(), + }; const functionSet = new Set(); if (workpadDocs.length === 0) { @@ -106,6 +232,21 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr // make a summary of info about each workpad const workpadsInfo = workpadDocs.map((workpad) => { + let this30Days = false; + let this90Days = false; + + if (workpad['@timestamp'] !== undefined) { + const lastReadDaysAgo = moment().diff(moment(workpad['@timestamp']), 'days'); + + if (lastReadDaysAgo < 30) { + this30Days = true; + } + + if (lastReadDaysAgo < 90) { + this90Days = true; + } + } + let pages = { count: 0 }; try { pages = { count: workpad.pages.length }; @@ -121,6 +262,16 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr return page.elements.map((element) => { const ast = parseExpression(element.expression); collectFns(ast, (cFunction) => { + functionCollection.all.add(cFunction); + + if (this30Days) { + functionCollection['30d'].add(cFunction); + } + + if (this90Days) { + functionCollection['90d'].add(cFunction); + } + functionSet.add(cFunction); }); return ast.chain.length; // get the number of parts in the expression @@ -203,7 +354,9 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr elementsTotal > 0 ? { total: functionsTotal, - in_use: Array.from(functionSet), + in_use: Array.from(functionCollection.all), + in_use_30d: Array.from(functionCollection['30d']), + in_use_90d: Array.from(functionCollection['90d']), per_element: { avg: functionsTotal / functionCounts.length, min: arrayMin(functionCounts) || 0, diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.tsx index a878d87af09e4..87ee108f21c73 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/layout/account_header/account_header.tsx @@ -97,7 +97,7 @@ export const AccountHeader: React.FC = () => { > - + {ACCOUNT_NAV.SEARCH} diff --git a/x-pack/plugins/file_data_visualizer/common/constants.ts b/x-pack/plugins/file_data_visualizer/common/constants.ts new file mode 100644 index 0000000000000..819549a7eb4e6 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/constants.ts @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export const UI_SETTING_MAX_FILE_SIZE = 'fileUpload:maxFileSize'; + +export const MB = Math.pow(2, 20); +export const MAX_FILE_SIZE = '100MB'; +export const MAX_FILE_SIZE_BYTES = 104857600; // 100MB + +export const ABSOLUTE_MAX_FILE_SIZE_BYTES = 1073741274; // 1GB +export const FILE_SIZE_DISPLAY_FORMAT = '0,0.[0] b'; + +// Value to use in the Elasticsearch index mapping meta data to identify the +// index as having been created by the File Data Visualizer. +export const INDEX_META_DATA_CREATED_BY = 'file-data-visualizer'; + +export const JOB_FIELD_TYPES = { + BOOLEAN: 'boolean', + DATE: 'date', + GEO_POINT: 'geo_point', + GEO_SHAPE: 'geo_shape', + IP: 'ip', + KEYWORD: 'keyword', + NUMBER: 'number', + TEXT: 'text', + UNKNOWN: 'unknown', +} as const; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/index.ts b/x-pack/plugins/file_data_visualizer/common/index.ts similarity index 72% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/index.ts rename to x-pack/plugins/file_data_visualizer/common/index.ts index cbefc12833d2d..f4d74984a7d78 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/index.ts +++ b/x-pack/plugins/file_data_visualizer/common/index.ts @@ -5,4 +5,5 @@ * 2.0. */ -export { createUrlOverrides, processResults, readFile, DEFAULT_LINES_TO_SAMPLE } from './utils'; +export * from './constants'; +export * from './types'; diff --git a/x-pack/plugins/file_data_visualizer/common/types.ts b/x-pack/plugins/file_data_visualizer/common/types.ts new file mode 100644 index 0000000000000..edfe8b3575c8d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/common/types.ts @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { JOB_FIELD_TYPES } from './constants'; + +export type InputData = any[]; + +export type JobFieldType = typeof JOB_FIELD_TYPES[keyof typeof JOB_FIELD_TYPES]; + +export interface DataVisualizerTableState { + pageSize: number; + pageIndex: number; + sortField: string; + sortDirection: string; + visibleFieldTypes: string[]; + visibleFieldNames: string[]; + showDistributions: boolean; +} diff --git a/x-pack/plugins/file_data_visualizer/jest.config.js b/x-pack/plugins/file_data_visualizer/jest.config.js new file mode 100644 index 0000000000000..90d4cfb81f11f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/jest.config.js @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +module.exports = { + preset: '@kbn/test', + rootDir: '../../..', + roots: ['/x-pack/plugins/file_data_visualizer'], +}; diff --git a/x-pack/plugins/file_data_visualizer/kibana.json b/x-pack/plugins/file_data_visualizer/kibana.json new file mode 100644 index 0000000000000..721352cff7c95 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/kibana.json @@ -0,0 +1,27 @@ +{ + "id": "fileDataVisualizer", + "version": "8.0.0", + "kibanaVersion": "kibana", + "server": true, + "ui": true, + "requiredPlugins": [ + "data", + "usageCollection", + "embeddable", + "share", + "discover", + "fileUpload" + ], + "optionalPlugins": [ + "security", + "maps" + ], + "requiredBundles": [ + "kibanaReact", + "maps", + "esUiShared" + ], + "extraPublicDirs": [ + "common" + ] +} diff --git a/x-pack/plugins/file_data_visualizer/public/api/index.ts b/x-pack/plugins/file_data_visualizer/public/api/index.ts new file mode 100644 index 0000000000000..13efd80133349 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/api/index.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { lazyLoadModules } from '../lazy_load_bundle'; +import { FileDataVisualizer } from '../application'; + +export async function getFileDataVisualizerComponent(): Promise { + const modules = await lazyLoadModules(); + return modules.FileDataVisualizer; +} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/_about_panel.scss b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_about_panel.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/_about_panel.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_about_panel.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/about_panel.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx similarity index 93% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/about_panel.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx index c768a422cfa5a..e4f59c492fa1c 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/about_panel.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx @@ -43,7 +43,7 @@ export const AboutPanel: FC = ({ onFilePickerChange }) => { {

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/about_panel/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/welcome_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx similarity index 78% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/welcome_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx index 2c441e42dea2f..684b6dadcb290 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/about_panel/welcome_content.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx @@ -21,26 +21,22 @@ import { import { ExperimentalBadge } from '../experimental_badge'; -import { useMlKibana } from '../../../../contexts/kibana'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; export const WelcomeContent: FC = () => { const toolTipContent = i18n.translate( - 'xpack.ml.fileDatavisualizer.welcomeContent.experimentalFeatureTooltip', + 'xpack.fileDataVisualizer.welcomeContent.experimentalFeatureTooltip', { defaultMessage: "Experimental feature. We'd love to hear your feedback.", } ); const { - services: { fileUpload }, - } = useMlKibana(); - - if (fileUpload === undefined) { - // eslint-disable-next-line no-console - console.error('File upload plugin not available'); - return null; - } - const maxFileSize = fileUpload.getMaxBytesFormatted(); + services: { + fileUpload: { getMaxBytesFormatted }, + }, + } = useFileDataVisualizerKibana(); + const maxFileSize = getMaxBytesFormatted(); return ( @@ -51,7 +47,7 @@ export const WelcomeContent: FC = () => {

, @@ -63,7 +59,7 @@ export const WelcomeContent: FC = () => {

@@ -73,7 +69,7 @@ export const WelcomeContent: FC = () => {

@@ -87,7 +83,7 @@ export const WelcomeContent: FC = () => {

@@ -103,7 +99,7 @@ export const WelcomeContent: FC = () => {

@@ -119,7 +115,7 @@ export const WelcomeContent: FC = () => {

@@ -130,7 +126,7 @@ export const WelcomeContent: FC = () => {

@@ -140,7 +136,7 @@ export const WelcomeContent: FC = () => {

= ({ results }) => { const items = createDisplayItems(results); @@ -19,7 +19,7 @@ export const AnalysisSummary: FC<{ results: FindFileStructureResponse }> = ({ re

@@ -37,7 +37,7 @@ function createDisplayItems(results: FindFileStructureResponse) { { title: ( ), @@ -53,7 +53,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -64,7 +64,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -74,7 +74,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -87,7 +87,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -99,7 +99,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( ), @@ -111,7 +111,7 @@ function createDisplayItems(results: FindFileStructureResponse) { items.push({ title: ( = ({ mode, onChangeMode, onCancel, di content={ disableImport ? ( ) : null @@ -52,7 +52,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di data-test-subj="mlFileDataVisOpenImportPageButton" > @@ -61,7 +61,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di onCancel()}> @@ -76,7 +76,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di onChangeMode(DATAVISUALIZER_MODE.READ)}> @@ -84,7 +84,7 @@ export const BottomBar: FC = ({ mode, onChangeMode, onCancel, di onCancel()}> diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/bottom_bar/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/bottom_bar/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_field_label.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_field_label.tsx similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_field_label.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_field_label.tsx diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_fields_form.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx similarity index 87% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_fields_form.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx index 02ead5c26f959..fddab3edc3ec0 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_fields_form.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx @@ -29,13 +29,13 @@ import { removeCombinedFieldsFromMappings, removeCombinedFieldsFromPipeline, } from './utils'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; interface Props { mappingsString: string; pipelineString: string; - onMappingsStringChange(): void; - onPipelineStringChange(): void; + onMappingsStringChange(mappings: string): void; + onPipelineStringChange(pipeline: string): void; combinedFields: CombinedField[]; onCombinedFieldsChange(combinedFields: CombinedField[]): void; results: FindFileStructureResponse; @@ -72,11 +72,9 @@ export class CombinedFieldsForm extends Component { const pipeline = this.parsePipeline(); this.props.onMappingsStringChange( - // @ts-expect-error JSON.stringify(addCombinedFieldsToMappings(mappings, [combinedField]), null, 2) ); this.props.onPipelineStringChange( - // @ts-expect-error JSON.stringify(addCombinedFieldsToPipeline(pipeline, [combinedField]), null, 2) ); this.props.onCombinedFieldsChange([...this.props.combinedFields, combinedField]); @@ -99,11 +97,9 @@ export class CombinedFieldsForm extends Component { const removedCombinedFields = updatedCombinedFields.splice(index, 1); this.props.onMappingsStringChange( - // @ts-expect-error JSON.stringify(removeCombinedFieldsFromMappings(mappings, removedCombinedFields), null, 2) ); this.props.onPipelineStringChange( - // @ts-expect-error JSON.stringify(removeCombinedFieldsFromPipeline(pipeline, removedCombinedFields), null, 2) ); this.props.onCombinedFieldsChange(updatedCombinedFields); @@ -114,7 +110,7 @@ export class CombinedFieldsForm extends Component { return JSON.parse(this.props.mappingsString); } catch (error) { throw new Error( - i18n.translate('xpack.ml.fileDatavisualizer.combinedFieldsForm.mappingsParseError', { + i18n.translate('xpack.fileDataVisualizer.combinedFieldsForm.mappingsParseError', { defaultMessage: 'Error parsing mappings: {error}', values: { error: error.message }, }) @@ -127,7 +123,7 @@ export class CombinedFieldsForm extends Component { return JSON.parse(this.props.pipelineString); } catch (error) { throw new Error( - i18n.translate('xpack.ml.fileDatavisualizer.combinedFieldsForm.pipelineParseError', { + i18n.translate('xpack.fileDataVisualizer.combinedFieldsForm.pipelineParseError', { defaultMessage: 'Error parsing pipeline: {error}', values: { error: error.message }, }) @@ -153,7 +149,7 @@ export class CombinedFieldsForm extends Component { }; render() { - const geoPointLabel = i18n.translate('xpack.ml.fileDatavisualizer.geoPointCombinedFieldLabel', { + const geoPointLabel = i18n.translate('xpack.fileDataVisualizer.geoPointCombinedFieldLabel', { defaultMessage: 'Add geo point field', }); const panels = [ @@ -180,7 +176,7 @@ export class CombinedFieldsForm extends Component { ]; return ( @@ -196,11 +192,11 @@ export class CombinedFieldsForm extends Component { iconType="trash" color="danger" onClick={this.removeCombinedField.bind(null, idx)} - title={i18n.translate('xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel', { + title={i18n.translate('xpack.fileDataVisualizer.removeCombinedFieldsLabel', { defaultMessage: 'Remove combined field', })} aria-label={i18n.translate( - 'xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel', + 'xpack.fileDataVisualizer.removeCombinedFieldsLabel', { defaultMessage: 'Remove combined field', } @@ -220,7 +216,7 @@ export class CombinedFieldsForm extends Component { isDisabled={this.props.isDisabled} > diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_fields_read_only_form.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx similarity index 83% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_fields_read_only_form.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx index dc8e839b7defe..978383f8e5e10 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/combined_fields_read_only_form.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx @@ -20,10 +20,10 @@ export function CombinedFieldsReadOnlyForm({ }) { return combinedFields.length ? ( diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/geo_point.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx similarity index 90% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/geo_point.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx index 5ae2e5de681c3..578d22384be33 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/geo_point.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx @@ -29,7 +29,7 @@ import { getFieldNames, getNameCollisionMsg, } from './utils'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; interface Props { addCombinedField: (combinedField: CombinedField) => void; @@ -119,7 +119,7 @@ export class GeoPointForm extends Component { return ( @@ -131,7 +131,7 @@ export class GeoPointForm extends Component { @@ -143,7 +143,7 @@ export class GeoPointForm extends Component { { onChange={this.onGeoPointFieldChange} isInvalid={this.state.geoPointFieldError !== ''} aria-label={i18n.translate( - 'xpack.ml.fileDatavisualizer.geoPointForm.geoPointFieldAriaLabel', + 'xpack.fileDataVisualizer.geoPointForm.geoPointFieldAriaLabel', { defaultMessage: 'Geo point field, required field', } @@ -179,7 +179,7 @@ export class GeoPointForm extends Component { onClick={this.onSubmit} > diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/types.ts b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/types.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/types.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/types.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/utils.test.ts b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.test.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/utils.test.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.test.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts similarity index 97% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts index ab08398fcda02..efd166d4821c5 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/combined_fields/utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts @@ -13,7 +13,7 @@ import { FindFileStructureResponse, IngestPipeline, Mappings, -} from '../../../../../../../file_upload/common'; +} from '../../../../../file_upload/common'; const COMMON_LAT_NAMES = ['latitude', 'lat']; const COMMON_LON_NAMES = ['longitude', 'long', 'lon']; @@ -127,7 +127,7 @@ export function createGeoPointCombinedField( } export function getNameCollisionMsg(name: string) { - return i18n.translate('xpack.ml.fileDatavisualizer.nameCollisionMsg', { + return i18n.translate('xpack.fileDataVisualizer.nameCollisionMsg', { defaultMessage: '"{name}" already exists, please provide a unique name', values: { name }, }); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap similarity index 96% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap index 6ab89fe3e4b2d..00dd652457daf 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/__snapshots__/overrides.test.js.snap +++ b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap @@ -13,7 +13,7 @@ exports[`Overrides render overrides 1`] = ` label={ } @@ -33,7 +33,7 @@ exports[`Overrides render overrides 1`] = ` label={ } @@ -94,7 +94,7 @@ exports[`Overrides render overrides 1`] = ` label={ } @@ -335,7 +335,7 @@ exports[`Overrides render overrides 1`] = ` label={ } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/_edit_flyout.scss b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_edit_flyout.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/_edit_flyout.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_edit_flyout.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/edit_flyout.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js similarity index 91% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/edit_flyout.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js index c26e504087b46..7cdee6f823bd6 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/edit_flyout.js +++ b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js @@ -69,7 +69,7 @@ export class EditFlyout extends Component {

@@ -96,7 +96,7 @@ export class EditFlyout extends Component { @@ -108,7 +108,7 @@ export class EditFlyout extends Component { fill > diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/index.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/index.js similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/index.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/index.js diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/options/index.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/index.js similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/options/index.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/index.js diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/options/option_lists.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/option_lists.js similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/options/option_lists.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/option_lists.js diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/options/options.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/options.js similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/options/options.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/options.js diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js similarity index 90% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js index 23c7b869f5e6f..cb0839b335a97 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.js +++ b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js @@ -31,7 +31,7 @@ import { // getCharsetOptions, } from './options'; import { isTimestampFormatValid } from './overrides_validation'; -import { withKibana } from '../../../../../../../../../src/plugins/kibana_react/public'; +import { withKibana } from '../../../../../../../src/plugins/kibana_react/public'; import { TIMESTAMP_OPTIONS, CUSTOM_DROPDOWN_OPTION } from './options/option_lists'; @@ -52,7 +52,7 @@ class OverridesUI extends Component { } linesToSampleErrors = i18n.translate( - 'xpack.ml.fileDatavisualizer.editFlyout.overrides.linesToSampleErrorMessage', + 'xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleErrorMessage', { defaultMessage: 'Value must be greater than {min} and less than or equal to {max}', values: { @@ -63,7 +63,7 @@ class OverridesUI extends Component { ); customTimestampFormatErrors = i18n.translate( - 'xpack.ml.fileDatavisualizer.editFlyout.overrides.customTimestampFormatErrorMessage', + 'xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatErrorMessage', { defaultMessage: `Timestamp format must be a combination of these Java date/time formats: yy, yyyy, M, MM, MMM, MMMM, d, dd, EEE, EEEE, H, HH, h, mm, ss, S through SSSSSSSSS, a, XX, XXX, zzz`, @@ -274,12 +274,9 @@ class OverridesUI extends Component { const timestampFormatHelp = ( - {i18n.translate( - 'xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampFormatHelpText', - { - defaultMessage: 'See more on accepted formats', - } - )} + {i18n.translate('xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatHelpText', { + defaultMessage: 'See more on accepted formats', + })} ); @@ -291,7 +288,7 @@ class OverridesUI extends Component { isInvalid={linesToSampleValid === false} label={ } @@ -306,7 +303,7 @@ class OverridesUI extends Component { } @@ -324,7 +321,7 @@ class OverridesUI extends Component { } @@ -341,7 +338,7 @@ class OverridesUI extends Component { } @@ -353,7 +350,7 @@ class OverridesUI extends Component { } @@ -372,7 +369,7 @@ class OverridesUI extends Component { id={'hasHeaderRow'} label={ } @@ -386,7 +383,7 @@ class OverridesUI extends Component { id={'shouldTrimFields'} label={ } @@ -401,7 +398,7 @@ class OverridesUI extends Component { } @@ -418,7 +415,7 @@ class OverridesUI extends Component { helpText={timestampFormatHelp} label={ } @@ -437,7 +434,7 @@ class OverridesUI extends Component { isInvalid={timestampFormatValid === false} label={ } @@ -453,7 +450,7 @@ class OverridesUI extends Component { } @@ -483,7 +480,7 @@ class OverridesUI extends Component {

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.test.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js similarity index 94% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.test.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js index 764ae6fb2b536..8e11d5150359d 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides.test.js +++ b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js @@ -10,7 +10,7 @@ import React from 'react'; import { Overrides } from './overrides'; -jest.mock('../../../../../../../../../src/plugins/kibana_react/public', () => ({ +jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({ withKibana: (comp) => { return comp; }, diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides_validation.js b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js similarity index 84% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides_validation.js rename to x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js index 79a44bd8b5ac6..c833d55351b6d 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/edit_flyout/overrides_validation.js +++ b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js @@ -41,7 +41,7 @@ export function isTimestampFormatValid(timestampFormat) { if (timestampFormat.indexOf('?') >= 0) { result.isValid = false; result.errorMessage = i18n.translate( - 'xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage', + 'xpack.fileDataVisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage', { defaultMessage: 'Timestamp format {timestampFormat} not supported because it contains a question mark character ({fieldPlaceholder})', @@ -86,7 +86,7 @@ export function isTimestampFormatValid(timestampFormat) { result.isValid = false; result.errorMessage = i18n.translate( - 'xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage', + 'xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage', { defaultMessage: 'Letter { length, plural, one { {lg} } other { group {lg} } } in {format} is not supported', @@ -101,9 +101,10 @@ export function isTimestampFormatValid(timestampFormat) { if (curChar === 'S') { // disable exceeds maximum line length error so i18n check passes result.errorMessage = i18n.translate( - 'xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage', + 'xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage', { - defaultMessage: 'Letter { length, plural, one { {lg} } other { group {lg} } } in {format} is not supported because it is not preceded by ss and a separator from {sep}', // eslint-disable-line + defaultMessage: + 'Letter { length, plural, one { {lg} } other { group {lg} } } in {format} is not supported because it is not preceded by ss and a separator from {sep}', // eslint-disable-line values: { length, lg: letterGroup, @@ -127,7 +128,7 @@ export function isTimestampFormatValid(timestampFormat) { if (prevLetterGroup == null) { result.isValid = false; result.errorMessage = i18n.translate( - 'xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage', + 'xpack.fileDataVisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage', { defaultMessage: 'No time format letter groups in timestamp format {timestampFormat}', values: { diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_embedded_map.scss b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_embedded_map.scss new file mode 100644 index 0000000000000..99ee60f62bb21 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_embedded_map.scss @@ -0,0 +1,8 @@ +.embeddedMapContent { + width: 100%; + height: 100%; + display: flex; + flex: 1 1 100%; + z-index: 1; + min-height: 0; // Absolute must for Firefox to scroll contents +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_index.scss new file mode 100644 index 0000000000000..5b3c6b4990ff1 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_index.scss @@ -0,0 +1 @@ +@import 'embedded_map'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx new file mode 100644 index 0000000000000..42bc5ebf61227 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx @@ -0,0 +1,155 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { useEffect, useRef, useState } from 'react'; + +import { htmlIdGenerator } from '@elastic/eui'; +import { LayerDescriptor } from '../../../../../maps/common/descriptor_types'; +import { INITIAL_LOCATION } from '../../../../../maps/common/constants'; +import { + MapEmbeddable, + MapEmbeddableInput, + MapEmbeddableOutput, + // eslint-disable-next-line @kbn/eslint/no-restricted-paths +} from '../../../../../maps/public/embeddable'; +import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '../../../../../maps/public'; +import { + EmbeddableFactory, + ErrorEmbeddable, + isErrorEmbeddable, + ViewMode, +} from '../../../../../../../src/plugins/embeddable/public'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; + +export function EmbeddedMapComponent({ + layerList, + mapEmbeddableInput, + renderTooltipContent, +}: { + layerList: LayerDescriptor[]; + mapEmbeddableInput?: MapEmbeddableInput; + renderTooltipContent?: (params: RenderTooltipContentParams) => JSX.Element; +}) { + const [embeddable, setEmbeddable] = useState(); + + const embeddableRoot: React.RefObject = useRef(null); + const baseLayers = useRef(); + + const { + services: { embeddable: embeddablePlugin, maps: mapsPlugin }, + } = useFileDataVisualizerKibana(); + + const factory: + | EmbeddableFactory + | undefined = embeddablePlugin + ? embeddablePlugin.getEmbeddableFactory(MAP_SAVED_OBJECT_TYPE) + : undefined; + + // Update the layer list with updated geo points upon refresh + useEffect(() => { + async function updateIndexPatternSearchLayer() { + if ( + embeddable && + !isErrorEmbeddable(embeddable) && + Array.isArray(layerList) && + Array.isArray(baseLayers.current) + ) { + embeddable.setLayerList([...baseLayers.current, ...layerList]); + } + } + updateIndexPatternSearchLayer(); + }, [embeddable, layerList]); + + useEffect(() => { + async function setupEmbeddable() { + if (!factory) { + // eslint-disable-next-line no-console + console.error('Map embeddable not found.'); + return; + } + const input: MapEmbeddableInput = { + id: htmlIdGenerator()(), + attributes: { title: '' }, + filters: [], + hidePanelTitles: true, + refreshConfig: { + value: 0, + pause: false, + }, + viewMode: ViewMode.VIEW, + isLayerTOCOpen: false, + hideFilterActions: true, + // can use mapSettings to center map on anomalies + mapSettings: { + disableInteractive: false, + hideToolbarOverlay: false, + hideLayerControl: false, + hideViewControl: false, + initialLocation: INITIAL_LOCATION.AUTO_FIT_TO_BOUNDS, // this will startup based on data-extent + autoFitToDataBounds: true, // this will auto-fit when there are changes to the filter and/or query + }, + }; + + const embeddableObject = await factory.create(input); + + if (embeddableObject && !isErrorEmbeddable(embeddableObject)) { + const basemapLayerDescriptor = mapsPlugin + ? await mapsPlugin.createLayerDescriptors.createBasemapLayerDescriptor() + : null; + + if (basemapLayerDescriptor) { + baseLayers.current = [basemapLayerDescriptor]; + await embeddableObject.setLayerList(baseLayers.current); + } + } + + setEmbeddable(embeddableObject); + } + + setupEmbeddable(); + // we want this effect to execute exactly once after the component mounts + // eslint-disable-next-line + }, []); + + useEffect(() => { + if (embeddable && !isErrorEmbeddable(embeddable) && mapEmbeddableInput !== undefined) { + embeddable.updateInput(mapEmbeddableInput); + } + }, [embeddable, mapEmbeddableInput]); + + useEffect(() => { + if (embeddable && !isErrorEmbeddable(embeddable) && renderTooltipContent !== undefined) { + embeddable.setRenderTooltipContent(renderTooltipContent); + } + }, [embeddable, renderTooltipContent]); + + // We can only render after embeddable has already initialized + useEffect(() => { + if (embeddableRoot.current && embeddable) { + embeddable.render(embeddableRoot.current); + } + }, [embeddable, embeddableRoot]); + + if (!embeddablePlugin) { + // eslint-disable-next-line no-console + console.error('Embeddable start plugin not found'); + return null; + } + if (!mapsPlugin) { + // eslint-disable-next-line no-console + console.error('Maps start plugin not found'); + return null; + } + + return ( +
+ ); +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/index.ts new file mode 100644 index 0000000000000..ee11a18345f64 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { EmbeddedMapComponent } from './embedded_map'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx new file mode 100644 index 0000000000000..1c533075af27b --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx @@ -0,0 +1,59 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; + +import { EuiListGroup, EuiListGroupItem } from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header'; +interface Props { + examples: Array; +} + +export const ExamplesList: FC = ({ examples }) => { + if (examples === undefined || examples === null || !Array.isArray(examples)) { + return null; + } + let examplesContent; + if (examples.length === 0) { + examplesContent = ( + + ); + } else { + examplesContent = examples.map((example, i) => { + return ( + + ); + }); + } + + return ( +
+ + + + + {examplesContent} + +
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/index.ts new file mode 100644 index 0000000000000..966c844987002 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { ExamplesList } from './examples_list'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/file_based_expanded_row.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx similarity index 69% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/file_based_expanded_row.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx index 01b5da5c42ccc..620bcfef8ff6c 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/file_based_expanded_row.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx @@ -14,10 +14,10 @@ import { OtherContent, TextContent, NumberContent, -} from '../../../stats_table/components/field_data_expanded_row'; +} from '../stats_table/components/field_data_expanded_row'; import { GeoPointContent } from './geo_point_content/geo_point_content'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; -import type { FileBasedFieldVisConfig } from '../../../stats_table/types/field_vis_config'; +import { JOB_FIELD_TYPES } from '../../../../common'; +import type { FileBasedFieldVisConfig } from '../stats_table/types/field_vis_config'; export const FileBasedDataVisualizerExpandedRow = ({ item }: { item: FileBasedFieldVisConfig }) => { const config = item; @@ -25,25 +25,25 @@ export const FileBasedDataVisualizerExpandedRow = ({ item }: { item: FileBasedFi function getCardContent() { switch (type) { - case ML_JOB_FIELD_TYPES.NUMBER: + case JOB_FIELD_TYPES.NUMBER: return ; - case ML_JOB_FIELD_TYPES.BOOLEAN: + case JOB_FIELD_TYPES.BOOLEAN: return ; - case ML_JOB_FIELD_TYPES.DATE: + case JOB_FIELD_TYPES.DATE: return ; - case ML_JOB_FIELD_TYPES.GEO_POINT: + case JOB_FIELD_TYPES.GEO_POINT: return ; - case ML_JOB_FIELD_TYPES.IP: + case JOB_FIELD_TYPES.IP: return ; - case ML_JOB_FIELD_TYPES.KEYWORD: + case JOB_FIELD_TYPES.KEYWORD: return ; - case ML_JOB_FIELD_TYPES.TEXT: + case JOB_FIELD_TYPES.TEXT: return ; default: @@ -53,7 +53,7 @@ export const FileBasedDataVisualizerExpandedRow = ({ item }: { item: FileBasedFi return (
{getCardContent()} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/format_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/format_utils.ts similarity index 96% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/format_utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/format_utils.ts index 30e07a6040dab..69e361aba9bca 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/format_utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/format_utils.ts @@ -8,7 +8,7 @@ import { Feature, Point } from 'geojson'; import { euiPaletteColorBlind } from '@elastic/eui'; import { DEFAULT_GEO_REGEX } from './geo_point_content'; -import { SOURCE_TYPES } from '../../../../../../../../maps/common/constants'; +import { SOURCE_TYPES } from '../../../../../../maps/common/constants'; export const convertWKTGeoToLonLat = ( value: string | number diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/geo_point_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.tsx similarity index 78% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/geo_point_content.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.tsx index b420ab43f56f4..c395b06059e8f 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/geo_point_content.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.tsx @@ -9,12 +9,12 @@ import React, { FC, useMemo } from 'react'; import { EuiFlexItem } from '@elastic/eui'; import { Feature, Point } from 'geojson'; -import type { FieldDataRowProps } from '../../../../stats_table/types/field_data_row'; -import { DocumentStatsTable } from '../../../../stats_table/components/field_data_expanded_row/document_stats'; -import { MlEmbeddedMapComponent } from '../../../../../components/ml_embedded_map'; +import type { FieldDataRowProps } from '../../stats_table/types/field_data_row'; +import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats'; +import { EmbeddedMapComponent } from '../../embedded_map'; import { convertWKTGeoToLonLat, getGeoPointsLayer } from './format_utils'; -import { ExpandedRowContent } from '../../../../stats_table/components/field_data_expanded_row/expanded_row_content'; -import { ExamplesList } from '../../../../index_based/components/field_data_row/examples_list'; +import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content'; +import { ExamplesList } from '../../examples_list'; export const DEFAULT_GEO_REGEX = RegExp('(?.+) (?.+)'); @@ -38,7 +38,7 @@ export const GeoPointContent: FC = ({ config }) => { geoPointsFeatures.push({ type: 'Feature', - id: `ml-${config.fieldName}-${i}`, + id: `fileDataVisualizer-${config.fieldName}-${i}`, geometry: { type: 'Point', coordinates: [coordinates.lat, coordinates.lon], @@ -69,10 +69,10 @@ export const GeoPointContent: FC = ({ config }) => { )} {formattedResults && Array.isArray(formattedResults.layerList) && ( - + )} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/geo_point_content/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/expanded_row/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/_experimental_badge.scss b/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_experimental_badge.scss similarity index 74% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/_experimental_badge.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_experimental_badge.scss index 016d5cd579e3f..8b21620542ff7 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/_experimental_badge.scss +++ b/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_experimental_badge.scss @@ -1,4 +1,4 @@ -.ml-experimental-badge.euiBetaBadge { +.experimental-badge.euiBetaBadge { font-size: 10px; vertical-align: middle; margin-bottom: 5px; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/experimental_badge.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx similarity index 85% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/experimental_badge.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx index 5eef240429a48..a067cb198914e 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/experimental_badge.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx @@ -14,10 +14,10 @@ export const ExperimentalBadge: FC<{ tooltipContent: string }> = ({ tooltipConte return ( } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/experimental_badge/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/explanation_flyout/explanation_flyout.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx similarity index 87% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/explanation_flyout/explanation_flyout.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx index 579f2e3340954..606bab514ac9f 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/explanation_flyout/explanation_flyout.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx @@ -20,7 +20,7 @@ import { EuiText, EuiSubSteps, } from '@elastic/eui'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; interface Props { results: FindFileStructureResponse; @@ -34,7 +34,7 @@ export const ExplanationFlyout: FC = ({ results, closeFlyout }) => {

@@ -48,7 +48,7 @@ export const ExplanationFlyout: FC = ({ results, closeFlyout }) => { @@ -63,7 +63,7 @@ const Content: FC<{ explanation: string[] }> = ({ explanation }) => ( <> diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/explanation_flyout/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/explanation_flyout/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_data_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_data_row/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.tsx similarity index 84% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_data_row/number_content_preview.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.tsx index dc164b5bf3453..c02976cdb3853 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_data_row/number_content_preview.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import { FileBasedFieldVisConfig } from '../../../stats_table/types'; +import { FileBasedFieldVisConfig } from '../stats_table/types'; export const FileBasedNumberContentPreview = ({ config }: { config: FileBasedFieldVisConfig }) => { const stats = config.stats; @@ -25,7 +25,7 @@ export const FileBasedNumberContentPreview = ({ config }: { config: FileBasedFie @@ -33,7 +33,7 @@ export const FileBasedNumberContentPreview = ({ config }: { config: FileBasedFie @@ -41,7 +41,7 @@ export const FileBasedNumberContentPreview = ({ config }: { config: FileBasedFie diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_names_filter/field_names_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx similarity index 84% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_names_filter/field_names_filter.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx index 9bd16ff5dbefa..466722adc7179 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_names_filter/field_names_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx @@ -7,11 +7,11 @@ import React, { FC, useMemo } from 'react'; import { i18n } from '@kbn/i18n'; -import { MultiSelectPicker } from '../../../../components/multi_select_picker'; +import { MultiSelectPicker } from '../multi_select_picker'; import type { FileBasedFieldVisConfig, FileBasedUnknownFieldVisConfig, -} from '../../../stats_table/types/field_vis_config'; +} from '../stats_table/types/field_vis_config'; interface Props { fields: Array; @@ -26,7 +26,7 @@ export const DataVisualizerFieldNamesFilter: FC = ({ }) => { const fieldNameTitle = useMemo( () => - i18n.translate('xpack.ml.dataVisualizer.fileBased.fieldNameSelect', { + i18n.translate('xpack.fileDataVisualizer.fieldNameSelect', { defaultMessage: 'Field name', }), [] diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_names_filter/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_names_filter/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/index.ts diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap new file mode 100644 index 0000000000000..769ebdeba9955 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap @@ -0,0 +1,16 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`FieldTypeIcon render component when type matches a field type 1`] = ` + + + +`; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx new file mode 100644 index 0000000000000..d1321ad8f9f4d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx @@ -0,0 +1,52 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { mount, shallow } from 'enzyme'; + +import { FieldTypeIcon } from './field_type_icon'; +import { JOB_FIELD_TYPES } from '../../../../common'; + +describe('FieldTypeIcon', () => { + test(`render component when type matches a field type`, () => { + const typeIconComponent = shallow( + + ); + expect(typeIconComponent).toMatchSnapshot(); + }); + + test(`render with tooltip and test hovering`, () => { + // Use fake timers so we don't have to wait for the EuiToolTip timeout + jest.useFakeTimers(); + + const typeIconComponent = mount( + + ); + const container = typeIconComponent.find({ 'data-test-subj': 'fieldTypeIcon' }); + + expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1); + + container.simulate('mouseover'); + + // Run the timers so the EuiTooltip will be visible + jest.runAllTimers(); + + typeIconComponent.update(); + expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(2); + + container.simulate('mouseout'); + + // Run the timers so the EuiTooltip will be hidden again + jest.runAllTimers(); + + typeIconComponent.update(); + expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1); + + // Clearing all mocks will also reset fake timers. + jest.clearAllMocks(); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx new file mode 100644 index 0000000000000..2dd7ff635bacd --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx @@ -0,0 +1,130 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; + +import { EuiToken, EuiToolTip } from '@elastic/eui'; + +import { i18n } from '@kbn/i18n'; + +import { getJobTypeAriaLabel } from '../../util/field_types_utils'; +import { JOB_FIELD_TYPES } from '../../../../common'; +import type { JobFieldType } from '../../../../common'; + +interface FieldTypeIconProps { + tooltipEnabled: boolean; + type: JobFieldType; + fieldName?: string; + needsAria: boolean; +} + +interface FieldTypeIconContainerProps { + ariaLabel: string | null; + iconType: string; + color: string; + needsAria: boolean; + [key: string]: any; +} + +export const FieldTypeIcon: FC = ({ + tooltipEnabled = false, + type, + fieldName, + needsAria = true, +}) => { + const ariaLabel = getJobTypeAriaLabel(type); + + let iconType = 'questionInCircle'; + let color = 'euiColorVis6'; + + switch (type) { + // Set icon types and colors + case JOB_FIELD_TYPES.BOOLEAN: + iconType = 'tokenBoolean'; + color = 'euiColorVis5'; + break; + case JOB_FIELD_TYPES.DATE: + iconType = 'tokenDate'; + color = 'euiColorVis7'; + break; + case JOB_FIELD_TYPES.GEO_POINT: + case JOB_FIELD_TYPES.GEO_SHAPE: + iconType = 'tokenGeo'; + color = 'euiColorVis8'; + break; + case JOB_FIELD_TYPES.TEXT: + iconType = 'document'; + color = 'euiColorVis9'; + break; + case JOB_FIELD_TYPES.IP: + iconType = 'tokenIP'; + color = 'euiColorVis3'; + break; + case JOB_FIELD_TYPES.KEYWORD: + iconType = 'tokenText'; + color = 'euiColorVis0'; + break; + case JOB_FIELD_TYPES.NUMBER: + iconType = 'tokenNumber'; + color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2'; + break; + case JOB_FIELD_TYPES.UNKNOWN: + // Use defaults + break; + } + + const containerProps = { + ariaLabel, + iconType, + color, + needsAria, + }; + + if (tooltipEnabled === true) { + // wrap the inner component inside because EuiToolTip doesn't seem + // to support having another component directly inside the tooltip anchor + // see https://github.com/elastic/eui/issues/839 + return ( + + + + ); + } + + return ; +}; + +// If the tooltip is used, it will apply its events to its first inner child. +// To pass on its properties we apply `rest` to the outer `span` element. +const FieldTypeIconContainer: FC = ({ + ariaLabel, + iconType, + color, + needsAria, + ...rest +}) => { + const wrapperProps: { className: string; 'aria-label'?: string } = { + className: 'field-type-icon', + }; + if (needsAria && ariaLabel) { + wrapperProps['aria-label'] = ariaLabel; + } + + return ( + + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/index.ts new file mode 100644 index 0000000000000..fa825e447be30 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { FieldTypeIcon } from './field_type_icon'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_types_filter/field_types_filter.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx similarity index 65% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_types_filter/field_types_filter.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx index 6ad6cfc84061d..8c5602bc625f8 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_types_filter/field_types_filter.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx @@ -8,13 +8,25 @@ import React, { FC, useMemo } from 'react'; import { i18n } from '@kbn/i18n'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import { MultiSelectPicker, Option } from '../../../../components/multi_select_picker'; +import { MultiSelectPicker, Option } from '../multi_select_picker'; import type { FileBasedFieldVisConfig, FileBasedUnknownFieldVisConfig, -} from '../../../stats_table/types/field_vis_config'; -import { FieldTypeIcon } from '../../../../components/field_type_icon'; -import { ML_JOB_FIELD_TYPES_OPTIONS } from '../../../index_based/components/search_panel/field_type_filter'; +} from '../stats_table/types/field_vis_config'; +import { FieldTypeIcon } from '../field_type_icon'; +import { JOB_FIELD_TYPES } from '../../../../common'; + +const JOB_FIELD_TYPES_OPTIONS = { + [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, + [JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' }, + [JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' }, + [JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' }, + [JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' }, + [JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' }, + [JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' }, + [JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' }, + [JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' }, +}; interface Props { fields: Array; @@ -29,7 +41,7 @@ export const DataVisualizerFieldTypesFilter: FC = ({ }) => { const fieldNameTitle = useMemo( () => - i18n.translate('xpack.ml.dataVisualizer.fileBased.fieldTypeSelect', { + i18n.translate('xpack.fileDataVisualizer.fieldTypeSelect', { defaultMessage: 'Field type', }), [] @@ -42,9 +54,9 @@ export const DataVisualizerFieldTypesFilter: FC = ({ if ( type !== undefined && !fieldTypesTracker.has(type) && - ML_JOB_FIELD_TYPES_OPTIONS[type] !== undefined + JOB_FIELD_TYPES_OPTIONS[type] !== undefined ) { - const item = ML_JOB_FIELD_TYPES_OPTIONS[type]; + const item = JOB_FIELD_TYPES_OPTIONS[type]; fieldTypesTracker.add(type); fieldTypes.push({ diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_types_filter/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/field_types_filter/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/create_fields.ts b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts similarity index 80% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/create_fields.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts index fdbb35d27c531..f45071d6e96b5 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/create_fields.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; import { getFieldNames, getSupportedFieldType } from './get_field_names'; -import { FileBasedFieldVisConfig } from '../../../stats_table/types'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; -import { roundToDecimalPlace } from '../../../../formatters/round_to_decimal_place'; +import { FileBasedFieldVisConfig } from '../stats_table/types'; +import { JOB_FIELD_TYPES } from '../../../../common'; +import { roundToDecimalPlace } from '../utils'; export function createFields(results: FindFileStructureResponse) { const { @@ -28,20 +28,20 @@ export function createFields(results: FindFileStructureResponse) { if (fieldStats[name] !== undefined) { const field: FileBasedFieldVisConfig = { fieldName: name, - type: ML_JOB_FIELD_TYPES.UNKNOWN, + type: JOB_FIELD_TYPES.UNKNOWN, }; const f = fieldStats[name]; const m = mappings.properties[name]; // sometimes the timestamp field is not in the mappings, and so our // collection of fields will be missing a time field with a type of date - if (name === timestampField && field.type === ML_JOB_FIELD_TYPES.UNKNOWN) { - field.type = ML_JOB_FIELD_TYPES.DATE; + if (name === timestampField && field.type === JOB_FIELD_TYPES.UNKNOWN) { + field.type = JOB_FIELD_TYPES.DATE; } if (m !== undefined) { field.type = getSupportedFieldType(m.type); - if (field.type === ML_JOB_FIELD_TYPES.NUMBER) { + if (field.type === JOB_FIELD_TYPES.NUMBER) { numericFieldsCount += 1; } if (m.format !== undefined) { @@ -71,7 +71,7 @@ export function createFields(results: FindFileStructureResponse) { } if (f.top_hits !== undefined) { - if (field.type === ML_JOB_FIELD_TYPES.TEXT) { + if (field.type === JOB_FIELD_TYPES.TEXT) { _stats = { ..._stats, examples: f.top_hits.map((hit) => hit.value), @@ -84,7 +84,7 @@ export function createFields(results: FindFileStructureResponse) { } } - if (field.type === ML_JOB_FIELD_TYPES.DATE) { + if (field.type === JOB_FIELD_TYPES.DATE) { _stats = { ..._stats, earliest: f.earliest, @@ -99,9 +99,9 @@ export function createFields(results: FindFileStructureResponse) { // this could be the message field for a semi-structured log file or a // field which the endpoint has not been able to work out any information for const type = - mappings.properties[name] && mappings.properties[name].type === ML_JOB_FIELD_TYPES.TEXT - ? ML_JOB_FIELD_TYPES.TEXT - : ML_JOB_FIELD_TYPES.UNKNOWN; + mappings.properties[name] && mappings.properties[name].type === JOB_FIELD_TYPES.TEXT + ? JOB_FIELD_TYPES.TEXT + : JOB_FIELD_TYPES.UNKNOWN; return { fieldName: name, diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/fields_stats_grid.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/fields_stats_grid.tsx similarity index 79% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/fields_stats_grid.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/fields_stats_grid.tsx index 1029d58b4c639..3b5b1bbf81dba 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/fields_stats_grid.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/fields_stats_grid.tsx @@ -5,29 +5,25 @@ * 2.0. */ -import React, { useMemo, FC } from 'react'; +import React, { useMemo, FC, useState } from 'react'; import { EuiFlexGroup, EuiSpacer } from '@elastic/eui'; -import type { FindFileStructureResponse } from '../../../../../../../file_upload/common'; -import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../../../stats_table'; -import type { FileBasedFieldVisConfig } from '../../../stats_table/types/field_vis_config'; +import type { FindFileStructureResponse } from '../../../../../file_upload/common'; +import type { DataVisualizerTableState } from '../../../../common'; +import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table'; +import type { FileBasedFieldVisConfig } from '../stats_table/types/field_vis_config'; import { FileBasedDataVisualizerExpandedRow } from '../expanded_row'; import { DataVisualizerFieldNamesFilter } from '../field_names_filter'; import { DataVisualizerFieldTypesFilter } from '../field_types_filter'; import { createFields } from './create_fields'; import { filterFields } from './filter_fields'; -import { usePageUrlState } from '../../../../util/url_state'; -import { ML_PAGES } from '../../../../../../common/constants/ml_url_generator'; -import { - MetricFieldsCount, - TotalFieldsCount, -} from '../../../stats_table/components/field_count_stats'; -import type { DataVisualizerFileBasedAppState } from '../../../../../../common/types/ml_url_generator'; +import { MetricFieldsCount, TotalFieldsCount } from '../stats_table/components/field_count_stats'; interface Props { results: FindFileStructureResponse; } -export const getDefaultDataVisualizerListState = (): Required => ({ + +export const getDefaultDataVisualizerListState = (): DataVisualizerTableState => ({ pageIndex: 0, pageSize: 10, sortField: 'fieldName', @@ -52,13 +48,11 @@ function getItemIdToExpandedRowMap( export const FieldsStatsGrid: FC = ({ results }) => { const restorableDefaults = getDefaultDataVisualizerListState(); - const [ - dataVisualizerListState, - setDataVisualizerListState, - ] = usePageUrlState( - ML_PAGES.DATA_VISUALIZER_FILE, + + const [dataVisualizerListState, setDataVisualizerListState] = useState( restorableDefaults ); + const visibleFieldTypes = dataVisualizerListState.visibleFieldTypes ?? restorableDefaults.visibleFieldTypes; const setVisibleFieldTypes = (values: string[]) => { @@ -73,11 +67,11 @@ export const FieldsStatsGrid: FC = ({ results }) => { const { fields, totalFieldsCount, totalMetricFieldsCount } = useMemo( () => createFields(results), - [results, visibleFieldNames, visibleFieldTypes] + [results] ); const { filteredFields, visibleFieldsCount, visibleMetricsCount } = useMemo( () => filterFields(fields, visibleFieldNames, visibleFieldTypes), - [results, visibleFieldNames, visibleFieldTypes] + [fields, visibleFieldNames, visibleFieldTypes] ); const fieldsCountStats = { visibleFieldsCount, totalFieldsCount }; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/filter_fields.ts b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts similarity index 81% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/filter_fields.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts index 2c43d11c3d447..0120b17452558 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/filter_fields.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts @@ -5,11 +5,11 @@ * 2.0. */ -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; +import { JOB_FIELD_TYPES } from '../../../../common'; import type { FileBasedFieldVisConfig, FileBasedUnknownFieldVisConfig, -} from '../../../stats_table/types/field_vis_config'; +} from '../stats_table/types/field_vis_config'; export function filterFields( fields: Array, @@ -32,6 +32,6 @@ export function filterFields( return { filteredFields: items, visibleFieldsCount: items.length, - visibleMetricsCount: items.filter((d) => d.type === ML_JOB_FIELD_TYPES.NUMBER).length, + visibleMetricsCount: items.filter((d) => d.type === JOB_FIELD_TYPES.NUMBER).length, }; } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/get_field_names.ts b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/get_field_names.ts similarity index 75% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/get_field_names.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/get_field_names.ts index d1cb361a84a72..83c517dfe965e 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/get_field_names.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/get_field_names.ts @@ -6,10 +6,10 @@ */ import { difference } from 'lodash'; -import type { FindFileStructureResponse } from '../../../../../../../file_upload/common'; -import { MlJobFieldType } from '../../../../../../common/types/field_types'; -import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; -import { ES_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/common'; +import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/common'; +import type { FindFileStructureResponse } from '../../../../../file_upload/common'; +import type { JobFieldType } from '../../../../common'; +import { JOB_FIELD_TYPES } from '../../../../common'; export function getFieldNames(results: FindFileStructureResponse) { const { mappings, field_stats: fieldStats, column_names: columnNames } = results; @@ -34,7 +34,7 @@ export function getFieldNames(results: FindFileStructureResponse) { return tempFields; } -export function getSupportedFieldType(type: string): MlJobFieldType { +export function getSupportedFieldType(type: string): JobFieldType { switch (type) { case ES_FIELD_TYPES.FLOAT: case ES_FIELD_TYPES.HALF_FLOAT: @@ -44,13 +44,13 @@ export function getSupportedFieldType(type: string): MlJobFieldType { case ES_FIELD_TYPES.LONG: case ES_FIELD_TYPES.SHORT: case ES_FIELD_TYPES.UNSIGNED_LONG: - return ML_JOB_FIELD_TYPES.NUMBER; + return JOB_FIELD_TYPES.NUMBER; case ES_FIELD_TYPES.DATE: case ES_FIELD_TYPES.DATE_NANOS: - return ML_JOB_FIELD_TYPES.DATE; + return JOB_FIELD_TYPES.DATE; default: - return type as MlJobFieldType; + return type as JobFieldType; } } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats_grid/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_contents/_file_contents.scss b/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_file_contents.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_contents/_file_contents.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_file_contents.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_contents/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_contents/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_contents/file_contents.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx similarity index 78% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_contents/file_contents.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx index 3de8e5851183d..fa54cf9cbc05c 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_contents/file_contents.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx @@ -10,7 +10,7 @@ import React, { FC } from 'react'; import { EuiTitle, EuiSpacer } from '@elastic/eui'; -import { MLJobEditor, ML_EDITOR_MODE } from '../../../../jobs/jobs_list/components/ml_job_editor'; +import { JsonEditor, EDITOR_MODE } from '../json_editor'; interface Props { data: string; @@ -19,9 +19,9 @@ interface Props { } export const FileContents: FC = ({ data, format, numberOfLines }) => { - let mode = ML_EDITOR_MODE.TEXT; - if (format === ML_EDITOR_MODE.JSON) { - mode = ML_EDITOR_MODE.JSON; + let mode = EDITOR_MODE.TEXT; + if (format === EDITOR_MODE.JSON) { + mode = EDITOR_MODE.JSON; } const formattedData = limitByNumberOfLines(data, numberOfLines); @@ -31,7 +31,7 @@ export const FileContents: FC = ({ data, format, numberOfLines }) => {

@@ -39,7 +39,7 @@ export const FileContents: FC = ({ data, format, numberOfLines }) => {
= ({ data, format, numberOfLines }) => { - ), @@ -345,9 +345,10 @@ export class FileDataVisualizerView extends Component { fileContents={fileContents} data={data} indexPatterns={this.props.indexPatterns} - kibanaConfig={this.props.kibanaConfig} showBottomBar={this.showBottomBar} hideBottomBar={this.hideBottomBar} + savedObjectsClient={this.savedObjectsClient} + fileUpload={this.props.fileUpload} /> {bottomBarVisible && ( diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/file_error_callouts.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_error_callouts.tsx similarity index 79% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/file_error_callouts.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_error_callouts.tsx index 0fa7de4732c39..b932dee35ebb8 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/file_error_callouts.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_error_callouts.tsx @@ -11,8 +11,8 @@ import React, { FC } from 'react'; import { EuiCallOut, EuiSpacer, EuiButtonEmpty, EuiHorizontalRule } from '@elastic/eui'; import numeral from '@elastic/numeral'; -import { ErrorResponse } from '../../../../../../common/types/errors'; -import { FILE_SIZE_DISPLAY_FORMAT } from '../../../../../../../file_upload/public'; +import { FILE_SIZE_DISPLAY_FORMAT } from '../../../../common'; +import { FindFileStructureErrorResponse } from '../../../../../file_upload/common'; interface FileTooLargeProps { fileSize: number; @@ -31,7 +31,7 @@ export const FileTooLarge: FC = ({ fileSize, maxFileSize }) = errorText = (

= ({ fileSize, maxFileSize }) = errorText = (

= ({ fileSize, maxFileSize }) = } @@ -76,7 +76,7 @@ export const FileTooLarge: FC = ({ fileSize, maxFileSize }) = }; interface FileCouldNotBeReadProps { - error: ErrorResponse; + error: FindFileStructureErrorResponse; loaded: boolean; showEditFlyout(): void; } @@ -92,7 +92,7 @@ export const FileCouldNotBeRead: FC = ({ } @@ -103,13 +103,13 @@ export const FileCouldNotBeRead: FC = ({ {loaded === false && ( <>
@@ -122,7 +122,7 @@ export const FileCouldNotBeRead: FC = ({ <> @@ -132,11 +132,11 @@ export const FileCouldNotBeRead: FC = ({ ); }; -export const Explanation: FC<{ error: ErrorResponse }> = ({ error }) => { +export const Explanation: FC<{ error: FindFileStructureErrorResponse }> = ({ error }) => { if (!error?.body?.attributes?.body?.error?.suppressed?.length) { return null; } - const reason: string = error.body.attributes.body.error.suppressed[0].reason; + const reason = error.body.attributes.body.error.suppressed[0].reason; return ( <> diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/index.js b/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/file_datavisualizer_view/index.js rename to x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config.ts b/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts similarity index 91% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts index 2254110432bdb..1cbb177c86442 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; export function createFilebeatConfig( index: string, @@ -36,7 +36,7 @@ export function createFilebeatConfig( } function getPaths() { - const txt = i18n.translate('xpack.ml.fileDatavisualizer.fileBeatConfig.paths', { + const txt = i18n.translate('xpack.fileDataVisualizer.fileBeatConfig.paths', { defaultMessage: 'add path to your files here', }); return [' paths:', ` - '<${txt}>'`]; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx similarity index 83% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx index c3b53d4430087..a5d05bb06f78e 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/filebeat_config_flyout.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx @@ -22,8 +22,8 @@ import { EuiCopy, } from '@elastic/eui'; import { createFilebeatConfig } from './filebeat_config'; -import { useMlKibana } from '../../../../contexts/kibana'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; // copy context? +import { FindFileStructureResponse } from '../../../../../file_upload/common'; export enum EDITOR_MODE { HIDDEN, @@ -48,7 +48,7 @@ export const FilebeatConfigFlyout: FC = ({ const [username, setUsername] = useState(null); const { services: { security }, - } = useMlKibana(); + } = useFileDataVisualizerKibana(); useEffect(() => { if (security !== undefined) { @@ -56,12 +56,12 @@ export const FilebeatConfigFlyout: FC = ({ setUsername(user.username === undefined ? null : user.username); }); } - }, []); + }, [security]); useEffect(() => { const config = createFilebeatConfig(index, results, ingestPipelineId, username); setFileBeatConfig(config); - }, [username]); + }, [username, index, ingestPipelineId, results]); return ( @@ -75,7 +75,7 @@ export const FilebeatConfigFlyout: FC = ({ @@ -85,7 +85,7 @@ export const FilebeatConfigFlyout: FC = ({ {(copy) => ( @@ -108,7 +108,7 @@ const Contents: FC<{

@@ -116,14 +116,14 @@ const Contents: FC<{

{index} }} />

filebeat.yml }} /> @@ -137,7 +137,7 @@ const Contents: FC<{

{username === null ? ( {''}, @@ -145,7 +145,7 @@ const Contents: FC<{ /> ) : ( {username}, diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/filebeat_config_flyout/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx similarity index 81% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx index 37e90b5f5753b..5a6f78a1a3068 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx @@ -38,56 +38,56 @@ function title(statuses: Statuses) { case statuses.readStatus: return ( ); case statuses.parseJSONStatus: return ( ); case statuses.indexCreatedStatus: return ( ); case statuses.ingestPipelineCreatedStatus: return ( ); case statuses.uploadStatus: return ( ); case statuses.indexPatternCreatedStatus: return ( ); case statuses.permissionCheckStatus: return ( ); default: return ( ); @@ -105,7 +105,7 @@ const ImportError: FC<{ error: any }> = ({ error }) => { id="more" buttonContent={ } @@ -151,7 +151,7 @@ function toString(error: any): ImportError { } return { - msg: i18n.translate('xpack.ml.fileDatavisualizer.importErrors.unknownErrorMessage', { + msg: i18n.translate('xpack.fileDataVisualizer.importErrors.unknownErrorMessage', { defaultMessage: 'Unknown error', }), }; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/import_errors/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_progress/import_progress.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx similarity index 81% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_progress/import_progress.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx index 40577a761cb03..8296a4885bf2c 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_progress/import_progress.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx @@ -80,31 +80,31 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } let processFileTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.processFileTitle', + 'xpack.fileDataVisualizer.importProgress.processFileTitle', { defaultMessage: 'Process file', } ); let createIndexTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.createIndexTitle', + 'xpack.fileDataVisualizer.importProgress.createIndexTitle', { defaultMessage: 'Create index', } ); let createIngestPipelineTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.createIngestPipelineTitle', + 'xpack.fileDataVisualizer.importProgress.createIngestPipelineTitle', { defaultMessage: 'Create ingest pipeline', } ); let uploadingDataTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.uploadDataTitle', + 'xpack.fileDataVisualizer.importProgress.uploadDataTitle', { defaultMessage: 'Upload data', } ); let createIndexPatternTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.createIndexPatternTitle', + 'xpack.fileDataVisualizer.importProgress.createIndexPatternTitle', { defaultMessage: 'Create index pattern', } @@ -113,7 +113,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { const creatingIndexStatus = (

@@ -122,7 +122,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { const creatingIndexAndIngestPipelineStatus = (

@@ -130,7 +130,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { if (completedStep >= 0) { processFileTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.processingFileTitle', + 'xpack.fileDataVisualizer.importProgress.processingFileTitle', { defaultMessage: 'Processing file', } @@ -138,7 +138,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { statusInfo = (

@@ -146,13 +146,13 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 1) { processFileTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.fileProcessedTitle', + 'xpack.fileDataVisualizer.importProgress.fileProcessedTitle', { defaultMessage: 'File processed', } ); createIndexTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.creatingIndexTitle', + 'xpack.fileDataVisualizer.importProgress.creatingIndexTitle', { defaultMessage: 'Creating index', } @@ -161,14 +161,11 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { createPipeline === true ? creatingIndexAndIngestPipelineStatus : creatingIndexStatus; } if (completedStep >= 2) { - createIndexTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.indexCreatedTitle', - { - defaultMessage: 'Index created', - } - ); + createIndexTitle = i18n.translate('xpack.fileDataVisualizer.importProgress.indexCreatedTitle', { + defaultMessage: 'Index created', + }); createIngestPipelineTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.creatingIngestPipelineTitle', + 'xpack.fileDataVisualizer.importProgress.creatingIngestPipelineTitle', { defaultMessage: 'Creating ingest pipeline', } @@ -178,13 +175,13 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 3) { createIngestPipelineTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.ingestPipelineCreatedTitle', + 'xpack.fileDataVisualizer.importProgress.ingestPipelineCreatedTitle', { defaultMessage: 'Ingest pipeline created', } ); uploadingDataTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.uploadingDataTitle', + 'xpack.fileDataVisualizer.importProgress.uploadingDataTitle', { defaultMessage: 'Uploading data', } @@ -193,14 +190,14 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 4) { uploadingDataTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.dataUploadedTitle', + 'xpack.fileDataVisualizer.importProgress.dataUploadedTitle', { defaultMessage: 'Data uploaded', } ); if (createIndexPattern === true) { createIndexPatternTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.creatingIndexPatternTitle', + 'xpack.fileDataVisualizer.importProgress.creatingIndexPatternTitle', { defaultMessage: 'Creating index pattern', } @@ -208,7 +205,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { statusInfo = (

@@ -219,7 +216,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } if (completedStep >= 5) { createIndexPatternTitle = i18n.translate( - 'xpack.ml.fileDatavisualizer.importProgress.indexPatternCreatedTitle', + 'xpack.fileDataVisualizer.importProgress.indexPatternCreatedTitle', { defaultMessage: 'Index pattern created', } @@ -293,7 +290,7 @@ const UploadFunctionProgress: FC<{ progress: number }> = ({ progress }) => {

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_progress/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_progress/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/import_progress/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/advanced.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx similarity index 83% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/advanced.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx index eb0e09973f0e3..acb6415e93f9b 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/advanced.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx @@ -19,8 +19,8 @@ import { } from '@elastic/eui'; import { CombinedField, CombinedFieldsForm } from '../combined_fields'; -import { MLJobEditor, ML_EDITOR_MODE } from '../../../../jobs/jobs_list/components/ml_job_editor'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { JsonEditor, EDITOR_MODE } from '../json_editor'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; const EDITOR_HEIGHT = '300px'; interface Props { @@ -35,8 +35,8 @@ interface Props { mappingsString: string; pipelineString: string; onIndexSettingsStringChange(): void; - onMappingsStringChange(): void; - onPipelineStringChange(): void; + onMappingsStringChange(mappings: string): void; + onPipelineStringChange(pipeline: string): void; indexNameError: string; indexPatternNameError: string; combinedFields: CombinedField[]; @@ -69,7 +69,7 @@ export const AdvancedSettings: FC = ({ } @@ -78,7 +78,7 @@ export const AdvancedSettings: FC = ({ > = ({ onChange={onIndexChange} isInvalid={indexNameError !== ''} aria-label={i18n.translate( - 'xpack.ml.fileDatavisualizer.advancedImportSettings.indexNameAriaLabel', + 'xpack.fileDataVisualizer.advancedImportSettings.indexNameAriaLabel', { defaultMessage: 'Index name, required field', } @@ -102,7 +102,7 @@ export const AdvancedSettings: FC = ({ id="createIndexPattern" label={ } @@ -116,7 +116,7 @@ export const AdvancedSettings: FC = ({ } @@ -175,7 +175,7 @@ export const AdvancedSettings: FC = ({ interface JsonEditorProps { initialized: boolean; data: string; - onChange(): void; + onChange(value: string): void; } const IndexSettings: FC = ({ initialized, data, onChange }) => { @@ -184,14 +184,14 @@ const IndexSettings: FC = ({ initialized, data, onChange }) => } fullWidth > - = ({ initialized, data, onChange }) => { } fullWidth > - = ({ initialized, data, onChange }) => } fullWidth > - = ({ const tabs = [ { id: 'simple-settings', - name: i18n.translate('xpack.ml.fileDatavisualizer.importSettings.simpleTabName', { + name: i18n.translate('xpack.fileDataVisualizer.importSettings.simpleTabName', { defaultMessage: 'Simple', }), content: ( @@ -80,7 +80,7 @@ export const ImportSettings: FC = ({ }, { id: 'advanced-settings', - name: i18n.translate('xpack.ml.fileDatavisualizer.importSettings.advancedTabName', { + name: i18n.translate('xpack.fileDataVisualizer.importSettings.advancedTabName', { defaultMessage: 'Advanced', }), content: ( diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/import_settings/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/simple.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx similarity index 86% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/simple.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx index daa360f0e1af0..2751b37cd3256 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_settings/simple.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx @@ -36,7 +36,7 @@ export const SimpleSettings: FC = ({ } @@ -45,7 +45,7 @@ export const SimpleSettings: FC = ({ > = ({ onChange={onIndexChange} isInvalid={indexNameError !== ''} aria-label={i18n.translate( - 'xpack.ml.fileDatavisualizer.simpleImportSettings.indexNameAriaLabel', + 'xpack.fileDataVisualizer.simpleImportSettings.indexNameAriaLabel', { defaultMessage: 'Index name, required field', } @@ -70,7 +70,7 @@ export const SimpleSettings: FC = ({ id="createIndexPattern" label={ } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/_import_sumary.scss b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_import_sumary.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/_import_sumary.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_import_sumary.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/failures.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx similarity index 95% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/failures.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx index 498320b1b792d..c8f62021b7bae 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/failures.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx @@ -51,7 +51,7 @@ export class Failures extends Component { id="failureList" buttonContent={ } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/import_summary.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx similarity index 84% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/import_summary.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx index 7fa71193ee516..f981b1fdf9f23 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/import_summary.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx @@ -45,7 +45,7 @@ export const ImportSummary: FC = ({ } @@ -62,7 +62,7 @@ export const ImportSummary: FC = ({ } @@ -71,7 +71,7 @@ export const ImportSummary: FC = ({ >

), @@ -111,7 +111,7 @@ function createDisplayItems( { title: ( ), @@ -123,7 +123,7 @@ function createDisplayItems( items.splice(1, 0, { title: ( ), @@ -135,7 +135,7 @@ function createDisplayItems( items.splice(1, 0, { title: ( ), @@ -147,7 +147,7 @@ function createDisplayItems( items.push({ title: ( ), diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_summary/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/import_summary/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js b/x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js similarity index 92% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js rename to x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js index 04175f46c9201..0eaba4c033910 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/import_view.js +++ b/x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js @@ -20,7 +20,6 @@ import { import { i18n } from '@kbn/i18n'; import { debounce } from 'lodash'; -import { getFileUpload } from '../../../../util/dependency_cache'; import { ResultsLinks } from '../results_links'; import { FilebeatConfigFlyout } from '../filebeat_config_flyout'; import { ImportProgress, IMPORT_STATUS } from '../import_progress'; @@ -33,8 +32,6 @@ import { getDefaultCombinedFields, } from '../combined_fields'; import { ExperimentalBadge } from '../experimental_badge'; -import { getIndexPatternNames, loadIndexPatterns } from '../../../../util/index_utils'; -import { ml } from '../../../../services/ml_api_service'; const DEFAULT_TIME_FIELD = '@timestamp'; const DEFAULT_INDEX_SETTINGS = { number_of_shards: 1 }; @@ -81,6 +78,7 @@ export class ImportView extends Component { super(props); this.state = getDefaultState(DEFAULT_STATE, this.props.results); + this.savedObjectsClient = props.savedObjectsClient; } componentDidMount() { @@ -100,7 +98,7 @@ export class ImportView extends Component { // TODO - sort this function out. it's a mess async import() { - const { data, results, indexPatterns, kibanaConfig, showBottomBar } = this.props; + const { data, results, indexPatterns, showBottomBar, fileUpload } = this.props; const { format } = results; let { timeFieldName } = this.state; @@ -124,14 +122,14 @@ export class ImportView extends Component { async () => { // check to see if the user has permission to create and ingest data into the specified index if ( - (await getFileUpload().hasImportPermission({ + (await fileUpload.hasImportPermission({ checkCreateIndexPattern: createIndexPattern, checkHasManagePipeline: true, indexName: index, })) === false ) { errors.push( - i18n.translate('xpack.ml.fileDatavisualizer.importView.importPermissionError', { + i18n.translate('xpack.fileDataVisualizer.importView.importPermissionError', { defaultMessage: 'You do not have permission to create or import data into index {index}.', values: { @@ -171,7 +169,7 @@ export class ImportView extends Component { } catch (error) { success = false; const parseError = i18n.translate( - 'xpack.ml.fileDatavisualizer.importView.parseSettingsError', + 'xpack.fileDataVisualizer.importView.parseSettingsError', { defaultMessage: 'Error parsing settings:', } @@ -184,7 +182,7 @@ export class ImportView extends Component { } catch (error) { success = false; const parseError = i18n.translate( - 'xpack.ml.fileDatavisualizer.importView.parseMappingsError', + 'xpack.fileDataVisualizer.importView.parseMappingsError', { defaultMessage: 'Error parsing mappings:', } @@ -199,7 +197,7 @@ export class ImportView extends Component { } catch (error) { success = false; const parseError = i18n.translate( - 'xpack.ml.fileDatavisualizer.importView.parsePipelineError', + 'xpack.fileDataVisualizer.importView.parsePipelineError', { defaultMessage: 'Error parsing ingest pipeline:', } @@ -221,7 +219,7 @@ export class ImportView extends Component { } if (success) { - const importer = await getFileUpload().importerFactory(format, { + const importer = await fileUpload.importerFactory(format, { excludeLinesPattern: results.exclude_lines_pattern, multilineStartPattern: results.multiline_start_pattern, }); @@ -294,8 +292,7 @@ export class ImportView extends Component { const indexPatternResp = await createKibanaIndexPattern( indexPatternName, indexPatterns, - timeFieldName, - kibanaConfig + timeFieldName ); success = indexPatternResp.success; this.setState({ @@ -354,16 +351,15 @@ export class ImportView extends Component { return; } - const { exists } = await ml.checkIndexExists({ index }); + const exists = await this.props.fileUpload.checkIndexExists(index); const indexNameError = exists ? ( ) : ( isIndexNameValid(index) ); - this.setState({ checkingValidIndex: false, indexNameError }); }, 500); @@ -427,9 +423,19 @@ export class ImportView extends Component { }; async loadIndexPatternNames() { - await loadIndexPatterns(this.props.indexPatterns); - const indexPatternNames = getIndexPatternNames(); - this.setState({ indexPatternNames }); + try { + const indexPatternNames = ( + await this.savedObjectsClient.find({ + type: 'index-pattern', + fields: ['title'], + perPage: 10000, + }) + ).savedObjects.map(({ attributes }) => attributes && attributes.title); + + this.setState({ indexPatternNames }); + } catch (error) { + console.error('failed to load index patterns', error); + } } render() { @@ -501,14 +507,14 @@ export class ImportView extends Component {

  } @@ -549,7 +555,7 @@ export class ImportView extends Component { data-test-subj="mlFileDataVisImportButton" > @@ -558,7 +564,7 @@ export class ImportView extends Component { {initialized === true && importing === false && ( @@ -690,7 +696,7 @@ function isIndexNameValid(name) { ) { return ( ); @@ -707,7 +713,7 @@ function isIndexPatternNameValid(name, indexPatternNames, index) { if (indexPatternNames.find((i) => i === name)) { return ( ); @@ -723,7 +729,7 @@ function isIndexPatternNameValid(name, indexPatternNames, index) { // name should match index return ( ); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/index.js b/x-pack/plugins/file_data_visualizer/public/application/components/import_view/index.js similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_view/index.js rename to x-pack/plugins/file_data_visualizer/public/application/components/import_view/index.js diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/index.ts new file mode 100644 index 0000000000000..641587e5ac732 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { EDITOR_MODE, JsonEditor } from './json_editor'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx new file mode 100644 index 0000000000000..d429f8dada6ec --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; + +import { EuiCodeEditor, EuiCodeEditorProps } from '@elastic/eui'; +import { expandLiteralStrings, XJsonMode } from '../../shared_imports'; + +export const EDITOR_MODE = { TEXT: 'text', JSON: 'json', XJSON: new XJsonMode() }; + +interface JobEditorProps { + value: string; + height?: string; + width?: string; + mode?: typeof EDITOR_MODE[keyof typeof EDITOR_MODE]; + readOnly?: boolean; + syntaxChecking?: boolean; + theme?: string; + onChange?: EuiCodeEditorProps['onChange']; +} +export const JsonEditor: FC = ({ + value, + height = '500px', + width = '100%', + mode = EDITOR_MODE.JSON, + readOnly = false, + syntaxChecking = true, + theme = 'textmate', + onChange = () => {}, +}) => { + if (mode === EDITOR_MODE.XJSON) { + value = expandLiteralStrings(value); + } + + return ( + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/index.ts new file mode 100644 index 0000000000000..9d32228e1c4bc --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { MultiSelectPicker, Option } from './multi_select_picker'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx new file mode 100644 index 0000000000000..2093b61a7ef4d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx @@ -0,0 +1,145 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { + EuiFieldSearch, + EuiFilterButton, + EuiFilterGroup, + EuiFilterSelectItem, + EuiIcon, + EuiPopover, + EuiPopoverTitle, + EuiSpacer, +} from '@elastic/eui'; +import React, { FC, ReactNode, useEffect, useState } from 'react'; +import { FormattedMessage } from '@kbn/i18n/react'; + +export interface Option { + name?: string | ReactNode; + value: string; + checked?: 'on' | 'off'; +} + +const NoFilterItems = () => { + return ( +
+
+ + +

+ +

+
+
+ ); +}; + +export const MultiSelectPicker: FC<{ + options: Option[]; + onChange?: (items: string[]) => void; + title?: string; + checkedOptions: string[]; + dataTestSubj: string; +}> = ({ options, onChange, title, checkedOptions, dataTestSubj }) => { + const [items, setItems] = useState(options); + const [searchTerm, setSearchTerm] = useState(''); + + useEffect(() => { + if (searchTerm === '') { + setItems(options); + } else { + const filteredOptions = options.filter((o) => o?.value?.includes(searchTerm)); + setItems(filteredOptions); + } + }, [options, searchTerm]); + + const [isPopoverOpen, setIsPopoverOpen] = useState(false); + + const onButtonClick = () => { + setIsPopoverOpen(!isPopoverOpen); + }; + + const closePopover = () => { + setIsPopoverOpen(false); + }; + + const handleOnChange = (index: number) => { + if (!items[index] || !Array.isArray(checkedOptions) || onChange === undefined) { + return; + } + const item = items[index]; + const foundIndex = checkedOptions.findIndex((fieldValue) => fieldValue === item.value); + if (foundIndex > -1) { + onChange(checkedOptions.filter((_, idx) => idx !== foundIndex)); + } else { + onChange([...checkedOptions, item.value]); + } + }; + + const button = ( + 0} + numActiveFilters={checkedOptions && checkedOptions.length} + > + {title} + + ); + + return ( + + + + setSearchTerm(e.target.value)} + data-test-subj={`${dataTestSubj}-searchInput`} + /> + +
+ {Array.isArray(items) && items.length > 0 ? ( + items.map((item, index) => { + const checked = + checkedOptions && + checkedOptions.findIndex((fieldValue) => fieldValue === item.value) > -1; + + return ( + handleOnChange(index)} + style={{ flexDirection: 'row' }} + data-test-subj={`${dataTestSubj}-option-${item.value}${ + checked ? '-checked' : '' + }`} + > + {item.name ?? item.value} + + ); + }) + ) : ( + + )} +
+ + + ); +}; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_links/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/results_links/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_links/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/results_links/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_links/results_links.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx similarity index 61% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_links/results_links.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx index 90b8fb4ac0cbb..03dc06d836bbc 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_links/results_links.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx @@ -9,20 +9,14 @@ import React, { FC, useState, useEffect } from 'react'; import moment from 'moment'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui'; -import { ml } from '../../../../services/ml_api_service'; -import { isFullLicense } from '../../../../license'; -import { checkPermission } from '../../../../capabilities/check_capabilities'; -import { mlNodesAvailable } from '../../../../ml_nodes_check/check_ml_nodes'; -import { useMlKibana, useMlUrlGenerator } from '../../../../contexts/kibana'; -import { ML_PAGES } from '../../../../../../common/constants/ml_url_generator'; -import { MlCommonGlobalState } from '../../../../../../common/types/ml_url_generator'; import { DISCOVER_APP_URL_GENERATOR, DiscoverUrlGeneratorState, -} from '../../../../../../../../../src/plugins/discover/public'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; - -const RECHECK_DELAY_MS = 3000; +} from '../../../../../../../src/plugins/discover/public'; +import { TimeRange, RefreshInterval } from '../../../../../../../src/plugins/data/public'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; +import type { FileUploadPluginStart } from '../../../../../file_upload/public'; +import { useFileDataVisualizerKibana } from '../../kibana_context'; interface Props { fieldStats: FindFileStructureResponse['field_stats']; @@ -33,6 +27,13 @@ interface Props { showFilebeatFlyout(): void; } +interface GlobalState { + time?: TimeRange; + refreshInterval?: RefreshInterval; +} + +const RECHECK_DELAY_MS = 3000; + export const ResultsLinks: FC = ({ fieldStats, index, @@ -41,20 +42,19 @@ export const ResultsLinks: FC = ({ createIndexPattern, showFilebeatFlyout, }) => { + const { + services: { fileUpload }, + } = useFileDataVisualizerKibana(); + const [duration, setDuration] = useState({ from: 'now-30m', to: 'now', }); - const [showCreateJobLink, setShowCreateJobLink] = useState(false); - const [globalState, setGlobalState] = useState(); + const [globalState, setGlobalState] = useState(); const [discoverLink, setDiscoverLink] = useState(''); const [indexManagementLink, setIndexManagementLink] = useState(''); const [indexPatternManagementLink, setIndexPatternManagementLink] = useState(''); - const [dataVisualizerLink, setDataVisualizerLink] = useState(''); - const [createJobsSelectTypePage, setCreateJobsSelectTypePage] = useState(''); - - const mlUrlGenerator = useMlUrlGenerator(); const { services: { @@ -63,7 +63,7 @@ export const ResultsLinks: FC = ({ urlGenerators: { getUrlGenerator }, }, }, - } = useMlKibana(); + } = useFileDataVisualizerKibana(); useEffect(() => { let unmounted = false; @@ -98,34 +98,7 @@ export const ResultsLinks: FC = ({ } }; - const getDataVisualizerLink = async (): Promise => { - const _dataVisualizerLink = await mlUrlGenerator.createUrl({ - page: ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER, - pageState: { - index: indexPatternId, - globalState, - }, - }); - if (!unmounted) { - setDataVisualizerLink(_dataVisualizerLink); - } - }; - const getADCreateJobsSelectTypePage = async (): Promise => { - const _createJobsSelectTypePage = await mlUrlGenerator.createUrl({ - page: ML_PAGES.ANOMALY_DETECTION_CREATE_JOB_SELECT_TYPE, - pageState: { - index: indexPatternId, - globalState, - }, - }); - if (!unmounted) { - setCreateJobsSelectTypePage(_createJobsSelectTypePage); - } - }; - getDiscoverUrl(); - getDataVisualizerLink(); - getADCreateJobsSelectTypePage(); if (!unmounted) { setIndexManagementLink( @@ -141,15 +114,16 @@ export const ResultsLinks: FC = ({ return () => { unmounted = true; }; + // eslint-disable-next-line react-hooks/exhaustive-deps }, [indexPatternId, getUrlGenerator, JSON.stringify(globalState)]); useEffect(() => { - setShowCreateJobLink(checkPermission('canCreateJob') && mlNodesAvailable()); updateTimeValues(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); useEffect(() => { - const _globalState: MlCommonGlobalState = { + const _globalState: GlobalState = { time: { from: duration.from, to: duration.to, @@ -176,7 +150,7 @@ export const ResultsLinks: FC = ({ async function updateTimeValues(recheck = true) { if (timeFieldName !== undefined) { - const { from, to } = await getFullTimeRange(index, timeFieldName); + const { from, to } = await getFullTimeRange(index, timeFieldName, fileUpload); setDuration({ from: from === null ? duration.from : from, to: to === null ? duration.to : to, @@ -202,7 +176,7 @@ export const ResultsLinks: FC = ({ icon={} title={ } @@ -212,49 +186,13 @@ export const ResultsLinks: FC = ({ )} - {isFullLicense() === true && - timeFieldName !== undefined && - showCreateJobLink && - createIndexPattern && - createJobsSelectTypePage && ( - - } - title={ - - } - description="" - href={createJobsSelectTypePage} - /> - - )} - - {createIndexPattern && dataVisualizerLink && ( - - } - title={ - - } - description="" - href={dataVisualizerLink} - /> - - )} - {indexManagementLink && ( } title={ } @@ -270,7 +208,7 @@ export const ResultsLinks: FC = ({ icon={} title={ } @@ -284,7 +222,7 @@ export const ResultsLinks: FC = ({ icon={} title={ } @@ -296,13 +234,13 @@ export const ResultsLinks: FC = ({ ); }; -async function getFullTimeRange(index: string, timeFieldName: string) { +async function getFullTimeRange( + index: string, + timeFieldName: string, + { getTimeFieldRange }: FileUploadPluginStart +) { const query = { bool: { must: [{ query_string: { analyze_wildcard: true, query: '*' } }] } }; - const resp = await ml.getTimeFieldRange({ - index, - timeFieldName, - query, - }); + const resp = await getTimeFieldRange(index, query, timeFieldName); return { from: moment(resp.start.epoch).toISOString(), diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/_index.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/_results_view.scss b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_results_view.scss similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/_results_view.scss rename to x-pack/plugins/file_data_visualizer/public/application/components/results_view/_results_view.scss diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/index.ts similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/index.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/results_view/index.ts diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/results_view.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx similarity index 89% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/results_view.tsx rename to x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx index 7431bfd4295e4..e2d21f242e4ef 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/results_view/results_view.tsx +++ b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx @@ -20,7 +20,7 @@ import { EuiFlexGroup, EuiFlexItem, } from '@elastic/eui'; -import { FindFileStructureResponse } from '../../../../../../../file_upload/common'; +import { FindFileStructureResponse } from '../../../../../file_upload/common'; import { FileContents } from '../file_contents'; import { AnalysisSummary } from '../analysis_summary'; @@ -72,7 +72,7 @@ export const ResultsView: FC = ({ showEditFlyout()} disabled={disableButtons}> @@ -80,7 +80,7 @@ export const ResultsView: FC = ({ showExplanationFlyout()} disabled={disableButtons}> @@ -94,7 +94,7 @@ export const ResultsView: FC = ({

diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_field_data_row.scss b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_field_data_row.scss new file mode 100644 index 0000000000000..944c31da8cab7 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_field_data_row.scss @@ -0,0 +1,86 @@ +.fieldDataCard { + height: 420px; + box-shadow: none; + border-color: $euiBorderColor; + + // Note the names of these styles need to match the type of the field they are displaying. + .boolean { + color: $euiColorVis5; + border-color: $euiColorVis5; + } + + .date { + color: $euiColorVis7; + border-color: $euiColorVis7; + } + + .document_count { + color: $euiColorVis2; + border-color: $euiColorVis2; + } + + .geo_point { + color: $euiColorVis8; + border-color: $euiColorVis8; + } + + .ip { + color: $euiColorVis3; + border-color: $euiColorVis3; + } + + .keyword { + color: $euiColorVis0; + border-color: $euiColorVis0; + } + + .number { + color: $euiColorVis1; + border-color: $euiColorVis1; + } + + .text { + color: $euiColorVis9; + border-color: $euiColorVis9; + } + + .type-other, + .unknown { + color: $euiColorVis6; + border-color: $euiColorVis6; + } + + .fieldDataCard__content { + @include euiFontSizeS; + height: 385px; + overflow: hidden; + } + + .fieldDataCard__codeContent { + @include euiCodeFont; + } + + .fieldDataCard__geoContent { + z-index: auto; + flex: 1; + display: flex; + flex-direction: column; + height: 100%; + position: relative; + .embPanel__content { + display: flex; + flex: 1 1 100%; + z-index: 1; + min-height: 0; // Absolute must for Firefox to scroll contents + } + } + + .fieldDataCard__stats { + padding: $euiSizeS $euiSizeS 0 $euiSizeS; + text-align: center; + } + + .fieldDataCard__valuesTitle { + text-transform: uppercase; + } +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_index.scss new file mode 100644 index 0000000000000..d317d324bae90 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_index.scss @@ -0,0 +1,56 @@ +@import 'components/field_data_expanded_row/index'; +@import 'components/field_count_stats/index'; +@import 'components/field_data_row/index'; + +.dataVisualizerFieldExpandedRow { + padding-left: $euiSize * 4; + width: 100%; + + .fieldDataCard__valuesTitle { + text-transform: uppercase; + text-align: left; + color: $euiColorDarkShade; + font-weight: bold; + padding-bottom: $euiSizeS; + } + + .fieldDataCard__codeContent { + @include euiCodeFont; + } +} + +.dataVisualizer { + .euiTableRow > .euiTableRowCell { + border-bottom: 0; + border-top: $euiBorderThin; + + } + .euiTableRow-isExpandedRow { + + .euiTableRowCell { + background-color: $euiColorEmptyShade !important; + border-top: 0; + border-bottom: $euiBorderThin; + &:hover { + background-color: $euiColorEmptyShade !important; + } + } + } + .dataVisualizerSummaryTable { + max-width: 350px; + min-width: 250px; + .euiTableRow > .euiTableRowCell { + border-bottom: 0; + } + .euiTableHeaderCell { + display: none; + } + } + .dataVisualizerSummaryTableWrapper { + max-width: 300px; + } + .dataVisualizerMapWrapper { + min-height: 300px; + min-width: 600px; + } +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx new file mode 100644 index 0000000000000..7279bceb8be93 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiText } from '@elastic/eui'; +import React from 'react'; + +export const ExpandedRowFieldHeader = ({ children }: { children: React.ReactNode }) => ( + + {children} + +); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/index.ts new file mode 100644 index 0000000000000..a92fa7f1e0659 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { ExpandedRowFieldHeader } from './expanded_row_field_header'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/_index.scss new file mode 100644 index 0000000000000..e44082c90ba32 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/_index.scss @@ -0,0 +1,3 @@ +.dataVisualizerFieldCountContainer { + max-width: 300px; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/index.ts new file mode 100644 index 0000000000000..d841ee2959f62 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/index.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { TotalFieldsCount, TotalFieldsCountProps, TotalFieldsStats } from './total_fields_count'; +export { + MetricFieldsCount, + MetricFieldsCountProps, + MetricFieldsStats, +} from './metric_fields_count'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx new file mode 100644 index 0000000000000..93582a7cef9ed --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import React, { FC } from 'react'; + +export interface MetricFieldsStats { + visibleMetricsCount: number; + totalMetricFieldsCount: number; +} +export interface MetricFieldsCountProps { + metricsStats?: MetricFieldsStats; +} + +export const MetricFieldsCount: FC = ({ metricsStats }) => { + if ( + !metricsStats || + metricsStats.visibleMetricsCount === undefined || + metricsStats.totalMetricFieldsCount === undefined + ) + return null; + return ( + <> + {metricsStats && ( + + + +
+ +
+ + + + + {metricsStats.visibleMetricsCount} + + + + + + + + + )} + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx new file mode 100644 index 0000000000000..9d554c7025d80 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx @@ -0,0 +1,67 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; +import React, { FC } from 'react'; + +export interface TotalFieldsStats { + visibleFieldsCount: number; + totalFieldsCount: number; +} + +export interface TotalFieldsCountProps { + fieldsCountStats?: TotalFieldsStats; +} + +export const TotalFieldsCount: FC = ({ fieldsCountStats }) => { + if ( + !fieldsCountStats || + fieldsCountStats.visibleFieldsCount === undefined || + fieldsCountStats.totalFieldsCount === undefined + ) + return null; + + return ( + + + +
+ +
+ + + + + + {fieldsCountStats.visibleFieldsCount} + + + + + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_index.scss new file mode 100644 index 0000000000000..b878bf0dcc0f6 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_index.scss @@ -0,0 +1,7 @@ +@import 'number_content'; + +.dataVisualizerExpandedRow { + @include euiBreakpoint('xs', 's', 'm') { + flex-direction: column; + } +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_number_content.scss b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_number_content.scss new file mode 100644 index 0000000000000..1f52b0763cdd3 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_number_content.scss @@ -0,0 +1,4 @@ +.metricDistributionChartContainer { + padding-top: $euiSizeXS; + width: 100%; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx new file mode 100644 index 0000000000000..7c9ddcdab29c8 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx @@ -0,0 +1,145 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, ReactNode, useMemo } from 'react'; +import { EuiBasicTable, EuiFlexItem, EuiSpacer } from '@elastic/eui'; +import { Axis, BarSeries, Chart, Settings } from '@elastic/charts'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@kbn/i18n'; +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; +import { getTFPercentage } from '../../utils'; +import { roundToDecimalPlace } from '../../../utils'; +import { useDataVizChartTheme } from '../../hooks'; +import { DocumentStatsTable } from './document_stats'; +import { ExpandedRowContent } from './expanded_row_content'; + +function getPercentLabel(value: number): string { + if (value === 0) { + return '0%'; + } + if (value >= 0.1) { + return `${roundToDecimalPlace(value)}%`; + } else { + return '< 0.1%'; + } +} + +function getFormattedValue(value: number, totalCount: number): string { + const percentage = (value / totalCount) * 100; + return `${value} (${getPercentLabel(percentage)})`; +} + +const BOOLEAN_DISTRIBUTION_CHART_HEIGHT = 100; + +export const BooleanContent: FC = ({ config }) => { + const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; + const formattedPercentages = useMemo(() => getTFPercentage(config), [config]); + const theme = useDataVizChartTheme(); + if (!formattedPercentages) return null; + + const { trueCount, falseCount, count } = formattedPercentages; + const summaryTableItems = [ + { + function: 'true', + display: ( + + ), + value: getFormattedValue(trueCount, count), + }, + { + function: 'false', + display: ( + + ), + value: getFormattedValue(falseCount, count), + }, + ]; + const summaryTableColumns = [ + { + name: '', + render: (summaryItem: { display: ReactNode }) => summaryItem.display, + width: '75px', + }, + { + field: 'value', + name: '', + render: (v: string) => {v}, + }, + ]; + + const summaryTableTitle = i18n.translate( + 'xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.summaryTableTitle', + { + defaultMessage: 'Summary', + } + ); + + return ( + + + + + {summaryTableTitle} + + + + + + + + + + + getFormattedValue(d, count)} + /> + + + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx new file mode 100644 index 0000000000000..cf34417ad9bbd --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx @@ -0,0 +1,90 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, ReactNode } from 'react'; +import { EuiBasicTable, EuiFlexItem } from '@elastic/eui'; +// @ts-ignore +import { formatDate } from '@elastic/eui/lib/services/format'; +import { FormattedMessage } from '@kbn/i18n/react'; + +import { i18n } from '@kbn/i18n'; +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; +import { DocumentStatsTable } from './document_stats'; +import { ExpandedRowContent } from './expanded_row_content'; +const TIME_FORMAT = 'MMM D YYYY, HH:mm:ss.SSS'; +interface SummaryTableItem { + function: string; + display: ReactNode; + value: number | string | undefined | null; +} + +export const DateContent: FC = ({ config }) => { + const { stats } = config; + if (stats === undefined) return null; + + const { earliest, latest } = stats; + + const summaryTableTitle = i18n.translate( + 'xpack.fileDataVisualizer.fieldDataCard.cardDate.summaryTableTitle', + { + defaultMessage: 'Summary', + } + ); + const summaryTableItems = [ + { + function: 'earliest', + display: ( + + ), + value: typeof earliest === 'string' ? earliest : formatDate(earliest, TIME_FORMAT), + }, + { + function: 'latest', + display: ( + + ), + value: typeof latest === 'string' ? latest : formatDate(latest, TIME_FORMAT), + }, + ]; + const summaryTableColumns = [ + { + name: '', + render: (summaryItem: { display: ReactNode }) => summaryItem.display, + width: '75px', + }, + { + field: 'value', + name: '', + render: (v: string) => {v}, + }, + ]; + + return ( + + + + {summaryTableTitle} + + className={'dataVisualizerSummaryTable'} + data-test-subj={'mlDateSummaryTable'} + compressed + items={summaryTableItems} + columns={summaryTableColumns} + tableCaption={summaryTableTitle} + tableLayout="auto" + /> + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx new file mode 100644 index 0000000000000..f3ac0d94aa255 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx @@ -0,0 +1,93 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FormattedMessage } from '@kbn/i18n/react'; +import React, { FC, ReactNode } from 'react'; +import { i18n } from '@kbn/i18n'; +import { EuiBasicTable, EuiFlexItem } from '@elastic/eui'; +import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; +import { FieldDataRowProps } from '../../types'; +import { roundToDecimalPlace } from '../../../utils'; + +const metaTableColumns = [ + { + name: '', + render: (metaItem: { display: ReactNode }) => metaItem.display, + width: '75px', + }, + { + field: 'value', + name: '', + render: (v: string) => {v}, + }, +]; + +const metaTableTitle = i18n.translate( + 'xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle', + { + defaultMessage: 'Documents stats', + } +); + +export const DocumentStatsTable: FC = ({ config }) => { + if ( + config?.stats === undefined || + config.stats.cardinality === undefined || + config.stats.count === undefined || + config.stats.sampleCount === undefined + ) + return null; + const { cardinality, count, sampleCount } = config.stats; + const metaTableItems = [ + { + function: 'count', + display: ( + + ), + value: count, + }, + { + function: 'percentage', + display: ( + + ), + value: `${roundToDecimalPlace((count / sampleCount) * 100)}%`, + }, + { + function: 'distinctValues', + display: ( + + ), + value: cardinality, + }, + ]; + + return ( + + {metaTableTitle} + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx new file mode 100644 index 0000000000000..a9f5dc6eaab1d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, ReactNode } from 'react'; +import { EuiFlexGroup } from '@elastic/eui'; + +interface Props { + children: ReactNode; + dataTestSubj: string; +} +export const ExpandedRowContent: FC = ({ children, dataTestSubj }) => { + return ( + + {children} + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/index.ts new file mode 100644 index 0000000000000..c8db31146936d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/index.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { BooleanContent } from './boolean_content'; +export { DateContent } from './date_content'; +export { GeoPointContent } from '../../../expanded_row/geo_point_content/geo_point_content'; +export { KeywordContent } from './keyword_content'; +export { IpContent } from './ip_content'; +export { NumberContent } from './number_content'; +export { OtherContent } from './other_content'; +export { TextContent } from './text_content'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx new file mode 100644 index 0000000000000..07adf3103b78e --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx @@ -0,0 +1,27 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { TopValues } from '../../../top_values'; +import { DocumentStatsTable } from './document_stats'; +import { ExpandedRowContent } from './expanded_row_content'; + +export const IpContent: FC = ({ config }) => { + const { stats } = config; + if (stats === undefined) return null; + const { count, sampleCount, cardinality } = stats; + if (count === undefined || sampleCount === undefined || cardinality === undefined) return null; + const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; + + return ( + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx new file mode 100644 index 0000000000000..3f1a7aad5463f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { TopValues } from '../../../top_values'; +import { DocumentStatsTable } from './document_stats'; +import { ExpandedRowContent } from './expanded_row_content'; + +export const KeywordContent: FC = ({ config }) => { + const { stats } = config; + const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; + + return ( + + + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx new file mode 100644 index 0000000000000..e83eecb64d02e --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx @@ -0,0 +1,154 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, ReactNode, useEffect, useState } from 'react'; +import { EuiBasicTable, EuiFlexItem, EuiText } from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@kbn/i18n'; +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { kibanaFieldFormat, numberAsOrdinal } from '../../../utils'; +import { + MetricDistributionChart, + MetricDistributionChartData, + buildChartDataFromStats, +} from '../metric_distribution_chart'; +import { TopValues } from '../../../top_values'; +import { ExpandedRowFieldHeader } from '../expanded_row_field_header'; +import { DocumentStatsTable } from './document_stats'; +import { ExpandedRowContent } from './expanded_row_content'; + +const METRIC_DISTRIBUTION_CHART_WIDTH = 325; +const METRIC_DISTRIBUTION_CHART_HEIGHT = 200; + +interface SummaryTableItem { + function: string; + display: ReactNode; + value: number | string | undefined | null; +} + +export const NumberContent: FC = ({ config }) => { + const { stats } = config; + + useEffect(() => { + const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH); + setDistributionChartData(chartData); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + + const defaultChartData: MetricDistributionChartData[] = []; + const [distributionChartData, setDistributionChartData] = useState(defaultChartData); + + if (stats === undefined) return null; + const { min, median, max, distribution } = stats; + const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined; + + const summaryTableItems = [ + { + function: 'min', + display: ( + + ), + value: kibanaFieldFormat(min, fieldFormat), + }, + { + function: 'median', + display: ( + + ), + value: kibanaFieldFormat(median, fieldFormat), + }, + { + function: 'max', + display: ( + + ), + value: kibanaFieldFormat(max, fieldFormat), + }, + ]; + const summaryTableColumns = [ + { + name: '', + render: (summaryItem: { display: ReactNode }) => summaryItem.display, + width: '75px', + }, + { + field: 'value', + name: '', + render: (v: string) => {v}, + }, + ]; + + const summaryTableTitle = i18n.translate( + 'xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.summaryTableTitle', + { + defaultMessage: 'Summary', + } + ); + return ( + + + + {summaryTableTitle} + + className={'dataVisualizerSummaryTable'} + compressed + items={summaryTableItems} + columns={summaryTableColumns} + tableCaption={summaryTableTitle} + data-test-subj={'mlNumberSummaryTable'} + /> + + + {stats && ( + + )} + {distribution && ( + + + + + + + + + + + + + + + + + )} + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.tsx new file mode 100644 index 0000000000000..cb1605331551e --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.tsx @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; +import { EuiFlexItem } from '@elastic/eui'; +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { ExamplesList } from '../../../examples_list'; +import { DocumentStatsTable } from './document_stats'; +import { ExpandedRowContent } from './expanded_row_content'; + +export const OtherContent: FC = ({ config }) => { + const { stats } = config; + if (stats === undefined) return null; + return ( + + + {Array.isArray(stats.examples) && ( + + + + )} + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx new file mode 100644 index 0000000000000..b399f952b4d9d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, Fragment } from 'react'; +import { EuiCallOut, EuiFlexItem, EuiSpacer } from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; +import { i18n } from '@kbn/i18n'; + +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { ExamplesList } from '../../../examples_list'; +import { ExpandedRowContent } from './expanded_row_content'; + +export const TextContent: FC = ({ config }) => { + const { stats } = config; + if (stats === undefined) return null; + + const { examples } = stats; + if (examples === undefined) return null; + + const numExamples = examples.length; + + return ( + + + {numExamples > 0 && } + {numExamples === 0 && ( + + + + _source, + }} + /> + + + + copy_to, + sourceParam: _source, + includesParam: includes, + excludesParam: excludes, + }} + /> + + + )} + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/_index.scss new file mode 100644 index 0000000000000..3afa182560e1e --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/_index.scss @@ -0,0 +1,3 @@ +.dataVisualizerColumnHeaderIcon { + max-width: $euiSizeM; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx new file mode 100644 index 0000000000000..c6c28da0baf04 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useMemo } from 'react'; +// import { EuiDataGridColumn } from '@elastic/eui'; +import { OrdinalChartData } from './field_histograms'; +// import { ColumnChart } from '../../../../../../components/data_grid/column_chart'; // TODO copy component +import { FieldDataRowProps } from '../../types'; +import { getTFPercentage } from '../../utils'; + +export const BooleanContentPreview: FC = ({ config }) => { + const chartData = useMemo(() => { + const results = getTFPercentage(config); + if (results) { + const data = [ + { key: 'true', key_as_string: 'true', doc_count: results.trueCount }, + { key: 'false', key_as_string: 'false', doc_count: results.falseCount }, + ]; + return { id: config.fieldName, cardinality: 2, data, type: 'boolean' } as OrdinalChartData; + } + }, [config]); + if (!chartData || config.fieldName === undefined) return null; + + // const columnType: EuiDataGridColumn = { + // id: config.fieldName, + // schema: undefined, + // }; + // const dataTestSubj = `mlDataGridChart-${config.fieldName}`; + + return ( + <> + // + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.scss b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.scss new file mode 100644 index 0000000000000..63603ee9bd2ec --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.scss @@ -0,0 +1,32 @@ +.dataGridChart__histogram { + width: 100%; + height: $euiSizeXL + $euiSizeXXL; +} + +.dataGridChart__legend { + @include euiTextTruncate; + @include euiFontSizeXS; + + color: $euiColorMediumShade; + display: block; + overflow-x: hidden; + margin: $euiSizeXS 0 0 0; + font-style: italic; + font-weight: normal; + text-align: left; +} + +.dataGridChart__legend--numeric { + text-align: right; +} + +.dataGridChart__legendBoolean { + width: 100%; + min-width: $euiButtonMinWidth; + td { text-align: center } +} + +/* Override to align column header to bottom of cell when no chart is available */ +.dataGrid .euiDataGridHeaderCell__content { + margin-top: auto; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.tsx new file mode 100644 index 0000000000000..ed4b82005db29 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.tsx @@ -0,0 +1,84 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; +import classNames from 'classnames'; + +import { BarSeries, Chart, Settings } from '@elastic/charts'; +import { EuiDataGridColumn } from '@elastic/eui'; + +import './column_chart.scss'; + +import { isUnsupportedChartData, ChartData } from './field_histograms'; + +import { useColumnChart } from './use_column_chart'; + +interface Props { + chartData: ChartData; + columnType: EuiDataGridColumn; + dataTestSubj: string; + hideLabel?: boolean; + maxChartColumns?: number; +} + +const columnChartTheme = { + background: { color: 'transparent' }, + chartMargins: { + left: 0, + right: 0, + top: 0, + bottom: 1, + }, + chartPaddings: { + left: 0, + right: 0, + top: 0, + bottom: 0, + }, + scales: { barsPadding: 0.1 }, +}; +export const ColumnChart: FC = ({ + chartData, + columnType, + dataTestSubj, + hideLabel, + maxChartColumns, +}) => { + const { data, legendText, xScaleType } = useColumnChart(chartData, columnType, maxChartColumns); + + return ( +
+ {!isUnsupportedChartData(chartData) && data.length > 0 && ( +
+ + + d.datum.color} + data={data} + /> + +
+ )} +
+ {legendText} +
+ {!hideLabel &&
{columnType.id}
} +
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/distinct_values.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/distinct_values.tsx new file mode 100644 index 0000000000000..92e0d1a16229f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/distinct_values.tsx @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui'; + +import React from 'react'; + +export const DistinctValues = ({ cardinality }: { cardinality?: number }) => { + if (cardinality === undefined) return null; + return ( + + + + + + {cardinality} + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/document_stats.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/document_stats.tsx new file mode 100644 index 0000000000000..7d0bda6ac47ea --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/document_stats.tsx @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui'; + +import React from 'react'; +import type { FieldDataRowProps } from '../../types/field_data_row'; +import { roundToDecimalPlace } from '../../../utils'; + +export const DocumentStat = ({ config }: FieldDataRowProps) => { + const { stats } = config; + if (stats === undefined) return null; + + const { count, sampleCount } = stats; + if (count === undefined || sampleCount === undefined) return null; + + const docsPercent = roundToDecimalPlace((count / sampleCount) * 100); + + return ( + + + + + + {count} ({docsPercent}%) + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/field_histograms.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/field_histograms.ts new file mode 100644 index 0000000000000..22b0195a579ac --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/field_histograms.ts @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export interface NumericDataItem { + key: number; + key_as_string?: string | number; + doc_count: number; +} + +export interface NumericChartData { + data: NumericDataItem[]; + id: string; + interval: number; + stats: [number, number]; + type: 'numeric'; +} + +export const isNumericChartData = (arg: any): arg is NumericChartData => { + return ( + typeof arg === 'object' && + arg.hasOwnProperty('data') && + arg.hasOwnProperty('id') && + arg.hasOwnProperty('interval') && + arg.hasOwnProperty('stats') && + arg.hasOwnProperty('type') && + arg.type === 'numeric' + ); +}; + +export interface OrdinalDataItem { + key: string; + key_as_string?: string; + doc_count: number; +} + +export interface OrdinalChartData { + cardinality: number; + data: OrdinalDataItem[]; + id: string; + type: 'ordinal' | 'boolean'; +} + +export const isOrdinalChartData = (arg: any): arg is OrdinalChartData => { + return ( + typeof arg === 'object' && + arg.hasOwnProperty('data') && + arg.hasOwnProperty('cardinality') && + arg.hasOwnProperty('id') && + arg.hasOwnProperty('type') && + (arg.type === 'ordinal' || arg.type === 'boolean') + ); +}; + +export interface UnsupportedChartData { + id: string; + type: 'unsupported'; +} + +export const isUnsupportedChartData = (arg: any): arg is UnsupportedChartData => { + return typeof arg === 'object' && arg.hasOwnProperty('type') && arg.type === 'unsupported'; +}; + +export type ChartDataItem = NumericDataItem | OrdinalDataItem; +export type ChartData = NumericChartData | OrdinalChartData | UnsupportedChartData; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/index.ts new file mode 100644 index 0000000000000..e4c0cc80eeb35 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { BooleanContentPreview } from './boolean_content_preview'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx new file mode 100644 index 0000000000000..00150bdfe8b7a --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx @@ -0,0 +1,78 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useEffect, useState } from 'react'; +import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; +import classNames from 'classnames'; +import { + MetricDistributionChart, + MetricDistributionChartData, + buildChartDataFromStats, +} from '../metric_distribution_chart'; +import { FieldVisConfig } from '../../types'; +import { kibanaFieldFormat, formatSingleValue } from '../../../utils'; + +const METRIC_DISTRIBUTION_CHART_WIDTH = 150; +const METRIC_DISTRIBUTION_CHART_HEIGHT = 80; + +export interface NumberContentPreviewProps { + config: FieldVisConfig; +} + +export const IndexBasedNumberContentPreview: FC = ({ config }) => { + const { stats, fieldFormat, fieldName } = config; + const defaultChartData: MetricDistributionChartData[] = []; + const [distributionChartData, setDistributionChartData] = useState(defaultChartData); + const [legendText, setLegendText] = useState<{ min: number; max: number } | undefined>(); + const dataTestSubj = `mlDataGridChart-${fieldName}`; + useEffect(() => { + const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH); + if ( + Array.isArray(chartData) && + chartData[0].x !== undefined && + chartData[chartData.length - 1].x !== undefined + ) { + setDistributionChartData(chartData); + setLegendText({ + min: formatSingleValue(chartData[0].x), + max: formatSingleValue(chartData[chartData.length - 1].x), + }); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + + return ( +
+
+ +
+
+ {legendText && ( + <> + + + + {kibanaFieldFormat(legendText.min, fieldFormat)} + + + {kibanaFieldFormat(legendText.max, fieldFormat)} + + + + )} +
+
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx new file mode 100644 index 0000000000000..63b15fdf30b3b --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; +import { EuiDataGridColumn } from '@elastic/eui'; +import { ChartData, OrdinalDataItem } from './field_histograms'; +import { ColumnChart } from './column_chart'; +import type { FieldDataRowProps } from '../../types/field_data_row'; + +export const TopValuesPreview: FC = ({ config }) => { + const { stats } = config; + if (stats === undefined) return null; + const { topValues, cardinality } = stats; + if (cardinality === undefined || topValues === undefined || config.fieldName === undefined) + return null; + + const data: OrdinalDataItem[] = topValues.map((d) => ({ + ...d, + key: d.key.toString(), + })); + const chartData: ChartData = { + cardinality, + data, + id: config.fieldName, + type: 'ordinal', + }; + const columnType: EuiDataGridColumn = { + id: config.fieldName, + schema: undefined, + }; + return ( + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.test.tsx new file mode 100644 index 0000000000000..2c92c366b2d73 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.test.tsx @@ -0,0 +1,177 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { render } from '@testing-library/react'; +import { renderHook } from '@testing-library/react-hooks'; +import '@testing-library/jest-dom/extend-expect'; + +import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/public'; + +import { + isNumericChartData, + isOrdinalChartData, + isUnsupportedChartData, + NumericChartData, + OrdinalChartData, + UnsupportedChartData, +} from './field_histograms'; + +import { getFieldType, getLegendText, getXScaleType, useColumnChart } from './use_column_chart'; + +describe('getFieldType()', () => { + it('should return the Kibana field type for a given EUI data grid schema', () => { + expect(getFieldType('text')).toBe('string'); + expect(getFieldType('datetime')).toBe('date'); + expect(getFieldType('numeric')).toBe('number'); + expect(getFieldType('boolean')).toBe('boolean'); + expect(getFieldType('json')).toBe('object'); + expect(getFieldType('non-aggregatable')).toBe(undefined); + }); +}); + +describe('getXScaleType()', () => { + it('should return the corresponding x axis scale type for a Kibana field type', () => { + expect(getXScaleType(KBN_FIELD_TYPES.BOOLEAN)).toBe('ordinal'); + expect(getXScaleType(KBN_FIELD_TYPES.IP)).toBe('ordinal'); + expect(getXScaleType(KBN_FIELD_TYPES.STRING)).toBe('ordinal'); + expect(getXScaleType(KBN_FIELD_TYPES.DATE)).toBe('time'); + expect(getXScaleType(KBN_FIELD_TYPES.NUMBER)).toBe('linear'); + expect(getXScaleType(undefined)).toBe(undefined); + }); +}); + +const validNumericChartData: NumericChartData = { + data: [], + id: 'the-id', + interval: 10, + stats: [0, 0], + type: 'numeric', +}; + +const validOrdinalChartData: OrdinalChartData = { + cardinality: 10, + data: [], + id: 'the-id', + type: 'ordinal', +}; + +const validUnsupportedChartData: UnsupportedChartData = { id: 'the-id', type: 'unsupported' }; + +describe('isNumericChartData()', () => { + it('should return true for valid numeric chart data', () => { + expect(isNumericChartData(validNumericChartData)).toBe(true); + }); + it('should return false for invalid numeric chart data', () => { + expect(isNumericChartData(undefined)).toBe(false); + expect(isNumericChartData({})).toBe(false); + expect(isNumericChartData({ data: [] })).toBe(false); + expect(isNumericChartData(validOrdinalChartData)).toBe(false); + expect(isNumericChartData(validUnsupportedChartData)).toBe(false); + }); +}); + +describe('isOrdinalChartData()', () => { + it('should return true for valid ordinal chart data', () => { + expect(isOrdinalChartData(validOrdinalChartData)).toBe(true); + }); + it('should return false for invalid ordinal chart data', () => { + expect(isOrdinalChartData(undefined)).toBe(false); + expect(isOrdinalChartData({})).toBe(false); + expect(isOrdinalChartData({ data: [] })).toBe(false); + expect(isOrdinalChartData(validNumericChartData)).toBe(false); + expect(isOrdinalChartData(validUnsupportedChartData)).toBe(false); + }); +}); + +describe('isUnsupportedChartData()', () => { + it('should return true for unsupported chart data', () => { + expect(isUnsupportedChartData(validUnsupportedChartData)).toBe(true); + }); + it('should return false for invalid unsupported chart data', () => { + expect(isUnsupportedChartData(undefined)).toBe(false); + expect(isUnsupportedChartData({})).toBe(false); + expect(isUnsupportedChartData({ data: [] })).toBe(false); + expect(isUnsupportedChartData(validNumericChartData)).toBe(false); + expect(isUnsupportedChartData(validOrdinalChartData)).toBe(false); + }); +}); + +describe('getLegendText()', () => { + it('should return the chart legend text for unsupported chart types', () => { + expect(getLegendText(validUnsupportedChartData)).toBe('Chart not supported.'); + }); + it('should return the chart legend text for empty datasets', () => { + expect(getLegendText(validNumericChartData)).toBe('0 documents contain field.'); + }); + it('should return the chart legend text for boolean chart types', () => { + const { getByText } = render( + <> + {getLegendText({ + cardinality: 2, + data: [ + { key: 'true', key_as_string: 'true', doc_count: 10 }, + { key: 'false', key_as_string: 'false', doc_count: 20 }, + ], + id: 'the-id', + type: 'boolean', + })} + + ); + expect(getByText('true')).toBeInTheDocument(); + expect(getByText('false')).toBeInTheDocument(); + }); + it('should return the chart legend text for ordinal chart data with less than max categories', () => { + expect(getLegendText({ ...validOrdinalChartData, data: [{ key: 'cat', doc_count: 10 }] })).toBe( + '10 categories' + ); + }); + it('should return the chart legend text for ordinal chart data with more than max categories', () => { + expect( + getLegendText({ + ...validOrdinalChartData, + cardinality: 30, + data: [{ key: 'cat', doc_count: 10 }], + }) + ).toBe('top 20 of 30 categories'); + }); + it('should return the chart legend text for numeric datasets', () => { + expect( + getLegendText({ + ...validNumericChartData, + data: [{ key: 1, doc_count: 10 }], + stats: [1, 100], + }) + ).toBe('1 - 100'); + expect( + getLegendText({ + ...validNumericChartData, + data: [{ key: 1, doc_count: 10 }], + stats: [100, 100], + }) + ).toBe('100'); + expect( + getLegendText({ + ...validNumericChartData, + data: [{ key: 1, doc_count: 10 }], + stats: [1.2345, 6.3456], + }) + ).toBe('1.23 - 6.35'); + }); +}); + +describe('useColumnChart()', () => { + it('should return the column chart hook data', () => { + const { result } = renderHook(() => + useColumnChart(validNumericChartData, { id: 'the-id', schema: 'numeric' }) + ); + + expect(result.current.data).toStrictEqual([]); + expect(result.current.legendText).toBe('0 documents contain field.'); + expect(result.current.xScaleType).toBe('linear'); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.tsx new file mode 100644 index 0000000000000..bd1df7f32c375 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.tsx @@ -0,0 +1,206 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import moment from 'moment'; +import { BehaviorSubject } from 'rxjs'; +import React from 'react'; + +import useObservable from 'react-use/lib/useObservable'; + +import { euiPaletteColorBlind, EuiDataGridColumn } from '@elastic/eui'; + +import { i18n } from '@kbn/i18n'; + +import { KBN_FIELD_TYPES } from '../../../../../../../../../src/plugins/data/public'; + +import { + isNumericChartData, + isOrdinalChartData, + ChartData, + ChartDataItem, + NumericDataItem, + OrdinalDataItem, +} from './field_histograms'; + +const NON_AGGREGATABLE = 'non-aggregatable'; + +export const hoveredRow$ = new BehaviorSubject(null); + +export const BAR_COLOR = euiPaletteColorBlind()[0]; +const BAR_COLOR_BLUR = euiPaletteColorBlind({ rotations: 2 })[10]; +const MAX_CHART_COLUMNS = 20; + +type XScaleType = 'ordinal' | 'time' | 'linear' | undefined; +export const getXScaleType = (kbnFieldType: KBN_FIELD_TYPES | undefined): XScaleType => { + switch (kbnFieldType) { + case KBN_FIELD_TYPES.BOOLEAN: + case KBN_FIELD_TYPES.IP: + case KBN_FIELD_TYPES.STRING: + return 'ordinal'; + case KBN_FIELD_TYPES.DATE: + return 'time'; + case KBN_FIELD_TYPES.NUMBER: + return 'linear'; + } +}; + +export const getFieldType = (schema: EuiDataGridColumn['schema']): KBN_FIELD_TYPES | undefined => { + if (schema === NON_AGGREGATABLE) { + return undefined; + } + + let fieldType: KBN_FIELD_TYPES; + + switch (schema) { + case 'datetime': + fieldType = KBN_FIELD_TYPES.DATE; + break; + case 'numeric': + fieldType = KBN_FIELD_TYPES.NUMBER; + break; + case 'boolean': + fieldType = KBN_FIELD_TYPES.BOOLEAN; + break; + case 'json': + fieldType = KBN_FIELD_TYPES.OBJECT; + break; + default: + fieldType = KBN_FIELD_TYPES.STRING; + } + + return fieldType; +}; + +type LegendText = string | JSX.Element; +export const getLegendText = ( + chartData: ChartData, + maxChartColumns = MAX_CHART_COLUMNS +): LegendText => { + if (chartData.type === 'unsupported') { + return i18n.translate('xpack.fileDataVisualizer.dataGridChart.histogramNotAvailable', { + defaultMessage: 'Chart not supported.', + }); + } + + if (chartData.data.length === 0) { + return i18n.translate('xpack.fileDataVisualizer.dataGridChart.notEnoughData', { + defaultMessage: `0 documents contain field.`, + }); + } + + if (chartData.type === 'boolean') { + return ( + + + + {chartData.data[0] !== undefined && } + {chartData.data[1] !== undefined && } + + +
{chartData.data[0].key_as_string}{chartData.data[1].key_as_string}
+ ); + } + + if (isOrdinalChartData(chartData) && chartData.cardinality <= maxChartColumns) { + return i18n.translate('xpack.fileDataVisualizer.dataGridChart.singleCategoryLegend', { + defaultMessage: `{cardinality, plural, one {# category} other {# categories}}`, + values: { cardinality: chartData.cardinality }, + }); + } + + if (isOrdinalChartData(chartData) && chartData.cardinality > maxChartColumns) { + return i18n.translate('xpack.fileDataVisualizer.dataGridChart.topCategoriesLegend', { + defaultMessage: `top {maxChartColumns} of {cardinality} categories`, + values: { cardinality: chartData.cardinality, maxChartColumns }, + }); + } + + if (isNumericChartData(chartData)) { + const fromValue = Math.round(chartData.stats[0] * 100) / 100; + const toValue = Math.round(chartData.stats[1] * 100) / 100; + + return fromValue !== toValue ? `${fromValue} - ${toValue}` : '' + fromValue; + } + + return ''; +}; + +interface ColumnChart { + data: ChartDataItem[]; + legendText: LegendText; + xScaleType: XScaleType; +} + +export const useColumnChart = ( + chartData: ChartData, + columnType: EuiDataGridColumn, + maxChartColumns?: number +): ColumnChart => { + const fieldType = getFieldType(columnType.schema); + + const hoveredRow = useObservable(hoveredRow$); + + const xScaleType = getXScaleType(fieldType); + + const getColor = (d: ChartDataItem) => { + if (hoveredRow === undefined || hoveredRow === null) { + return BAR_COLOR; + } + + if ( + isOrdinalChartData(chartData) && + xScaleType === 'ordinal' && + hoveredRow._source[columnType.id] === d.key + ) { + return BAR_COLOR; + } + + if ( + isNumericChartData(chartData) && + xScaleType === 'linear' && + hoveredRow._source[columnType.id] >= +d.key && + hoveredRow._source[columnType.id] < +d.key + chartData.interval + ) { + return BAR_COLOR; + } + + if ( + isNumericChartData(chartData) && + xScaleType === 'time' && + moment(hoveredRow._source[columnType.id]).unix() * 1000 >= +d.key && + moment(hoveredRow._source[columnType.id]).unix() * 1000 < +d.key + chartData.interval + ) { + return BAR_COLOR; + } + + return BAR_COLOR_BLUR; + }; + + let data: ChartDataItem[] = []; + + // The if/else if/else is a work-around because `.map()` doesn't work with union types. + // See TS Caveats for details: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-3.html#caveats + if (isOrdinalChartData(chartData)) { + data = chartData.data.map((d: OrdinalDataItem) => ({ + ...d, + key_as_string: d.key_as_string ?? d.key, + color: getColor(d), + })); + } else if (isNumericChartData(chartData)) { + data = chartData.data.map((d: NumericDataItem) => ({ + ...d, + key_as_string: d.key_as_string || d.key, + color: getColor(d), + })); + } + + return { + data, + legendText: getLegendText(chartData, maxChartColumns), + xScaleType, + }; +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/index.ts new file mode 100644 index 0000000000000..72947f2953cb8 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/index.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { MetricDistributionChart, MetricDistributionChartData } from './metric_distribution_chart'; +export { buildChartDataFromStats } from './metric_distribution_chart_data_builder'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx new file mode 100644 index 0000000000000..caa560488d499 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx @@ -0,0 +1,108 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; + +import { i18n } from '@kbn/i18n'; + +import { + AreaSeries, + Axis, + Chart, + CurveType, + Position, + ScaleType, + Settings, + TooltipValue, + TooltipValueFormatter, +} from '@elastic/charts'; + +import { MetricDistributionChartTooltipHeader } from './metric_distribution_chart_tooltip_header'; +import { kibanaFieldFormat } from '../../../utils'; +import { useDataVizChartTheme } from '../../hooks'; + +interface ChartTooltipValue extends TooltipValue { + skipHeader?: boolean; +} + +export interface MetricDistributionChartData { + x: number; + y: number; + dataMin: number; + dataMax: number; + percent: number; +} + +interface Props { + width: number; + height: number; + chartData: MetricDistributionChartData[]; + fieldFormat?: any; // Kibana formatter for field being viewed + hideXAxis?: boolean; +} + +const SPEC_ID = 'metric_distribution'; + +export const MetricDistributionChart: FC = ({ + width, + height, + chartData, + fieldFormat, + hideXAxis, +}) => { + // This value is shown to label the y axis values in the tooltip. + // Ideally we wouldn't show these values at all in the tooltip, + // but this is not yet possible with Elastic charts. + const seriesName = i18n.translate( + 'xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.seriesName', + { + defaultMessage: 'distribution', + } + ); + + const theme = useDataVizChartTheme(); + + const headerFormatter: TooltipValueFormatter = (tooltipData: ChartTooltipValue) => { + const xValue = tooltipData.value; + const chartPoint: MetricDistributionChartData | undefined = chartData.find( + (data) => data.x === xValue + ); + + return ( + + ); + }; + + return ( +
+ + + kibanaFieldFormat(d, fieldFormat)} + hide={hideXAxis === true} + /> + d.toFixed(3)} hide={true} /> + 0 ? chartData : [{ x: 0, y: 0 }]} + curve={CurveType.CURVE_STEP_AFTER} + /> + +
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx new file mode 100644 index 0000000000000..a65b6bdc7458f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx @@ -0,0 +1,156 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +const METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH = 3; // Minimum bar width, in pixels. +const METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR = 20; // Max bar height relative to median bar height. + +import { MetricDistributionChartData } from './metric_distribution_chart'; + +interface DistributionPercentile { + minValue: number; + maxValue: number; + percent: number; +} + +interface DistributionChartBar { + x0: number; + x1: number; + y: number; + dataMin: number; + dataMax: number; + percent: number; + isMinWidth: boolean; +} + +export function buildChartDataFromStats( + stats: any, + chartWidth: number +): MetricDistributionChartData[] { + // Process the raw percentiles data so it is in a suitable format for plotting in the metric distribution chart. + let chartData: MetricDistributionChartData[] = []; + + const distribution = stats.distribution; + if (distribution === undefined) { + return chartData; + } + + const percentiles: DistributionPercentile[] = distribution.percentiles; + if (percentiles.length === 0) { + return chartData; + } + + // Adjust x axis min and max if there is a single bar. + const minX = percentiles[0].minValue; + const maxX = percentiles[percentiles.length - 1].maxValue; + + let xAxisMin: number = minX; + let xAxisMax: number = maxX; + if (maxX === minX) { + if (minX !== 0) { + xAxisMin = 0; + xAxisMax = 2 * minX; + } else { + xAxisMax = 1; + } + } + + // Adjust the right hand x coordinates so that each bar is at least METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH. + const minBarWidth = + (METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH / chartWidth) * (xAxisMax - xAxisMin); + const processedData: DistributionChartBar[] = []; + let lastBar: DistributionChartBar; + percentiles.forEach((data, index) => { + if (index === 0) { + const bar: DistributionChartBar = { + x0: data.minValue, + x1: Math.max(data.minValue + minBarWidth, data.maxValue), + y: 0, // Set below + dataMin: data.minValue, + dataMax: data.maxValue, + percent: data.percent, + isMinWidth: false, + }; + + // Scale the height of the bar according to the range of data values in the bar. + bar.y = + (data.percent / (bar.x1 - bar.x0)) * + Math.max(1, minBarWidth / Math.max(data.maxValue - data.minValue, 0.5 * minBarWidth)); + bar.isMinWidth = data.maxValue <= data.minValue + minBarWidth; + processedData.push(bar); + lastBar = bar; + } else { + if (lastBar.isMinWidth === false || data.maxValue > lastBar.x1) { + const bar = { + x0: lastBar.x1, + x1: Math.max(lastBar.x1 + minBarWidth, data.maxValue), + y: 0, // Set below + dataMin: data.minValue, + dataMax: data.maxValue, + percent: data.percent, + isMinWidth: false, + }; + + // Scale the height of the bar according to the range of data values in the bar. + bar.y = + (data.percent / (bar.x1 - bar.x0)) * + Math.max(1, minBarWidth / Math.max(data.maxValue - data.minValue, 0.5 * minBarWidth)); + bar.isMinWidth = data.maxValue <= lastBar.x1 + minBarWidth; + processedData.push(bar); + lastBar = bar; + } else { + // Combine bars which are less than minBarWidth apart. + lastBar.percent = lastBar.percent + data.percent; + lastBar.y = lastBar.percent / (lastBar.x1 - lastBar.x0); + lastBar.dataMax = data.maxValue; + } + } + }); + + if (maxX !== minX) { + xAxisMax = processedData[processedData.length - 1].x1; + } + + // Adjust the maximum bar height to be (METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR * median bar height). + let barHeights = processedData.map((data) => data.y); + barHeights = barHeights.sort((a, b) => a - b); + + let maxBarHeight = 0; + const processedDataLength = processedData.length; + if (Math.abs(processedDataLength % 2) === 1) { + maxBarHeight = + METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR * + barHeights[Math.floor(processedDataLength / 2)]; + } else { + maxBarHeight = + (METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR * + (barHeights[Math.floor(processedDataLength / 2) - 1] + + barHeights[Math.floor(processedDataLength / 2)])) / + 2; + } + + processedData.forEach((data) => { + data.y = Math.min(data.y, maxBarHeight); + }); + + // Convert the data to the format used by the chart. + chartData = processedData.map((data) => { + const { x0, y, dataMin, dataMax, percent } = data; + return { x: x0, y, dataMin, dataMax, percent }; + }); + + // Add a final point to drop the curve back to the y axis. + const last = processedData[processedData.length - 1]; + chartData.push({ + x: last.x1, + y: 0, + dataMin: last.dataMin, + dataMax: last.dataMax, + percent: last.percent, + }); + + return chartData; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx new file mode 100644 index 0000000000000..9fd613ac96b8e --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx @@ -0,0 +1,54 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC } from 'react'; + +import { FormattedMessage } from '@kbn/i18n/react'; + +import { MetricDistributionChartData } from './metric_distribution_chart'; +import { kibanaFieldFormat } from '../../../utils'; + +interface Props { + chartPoint: MetricDistributionChartData | undefined; + maxWidth: number; + fieldFormat?: any; // Kibana formatter for field being viewed +} + +export const MetricDistributionChartTooltipHeader: FC = ({ + chartPoint, + maxWidth, + fieldFormat, +}) => { + if (chartPoint === undefined) { + return null; + } + + return ( +
+ {chartPoint.dataMax > chartPoint.dataMin ? ( + + ) : ( + + )} +
+ ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx new file mode 100644 index 0000000000000..bfa40c487a2ac --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx @@ -0,0 +1,284 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { useMemo, useState } from 'react'; + +import { + CENTER_ALIGNMENT, + EuiBasicTableColumn, + EuiButtonIcon, + EuiFlexItem, + EuiIcon, + EuiInMemoryTable, + EuiText, + HorizontalAlignment, + LEFT_ALIGNMENT, + RIGHT_ALIGNMENT, +} from '@elastic/eui'; +import { i18n } from '@kbn/i18n'; +import { EuiTableComputedColumnType } from '@elastic/eui/src/components/basic_table/table_types'; +import { JOB_FIELD_TYPES, JobFieldType, DataVisualizerTableState } from '../../../../common'; +import { FieldTypeIcon } from '../field_type_icon'; +import { DocumentStat } from './components/field_data_row/document_stats'; +import { DistinctValues } from './components/field_data_row/distinct_values'; +import { IndexBasedNumberContentPreview } from './components/field_data_row/number_content_preview'; + +import { useTableSettings } from './use_table_settings'; +import { TopValuesPreview } from './components/field_data_row/top_values_preview'; +import { + FieldVisConfig, + FileBasedFieldVisConfig, + isIndexBasedFieldVisConfig, +} from './types/field_vis_config'; +import { FileBasedNumberContentPreview } from '../field_data_row'; +import { BooleanContentPreview } from './components/field_data_row'; + +const FIELD_NAME = 'fieldName'; + +export type ItemIdToExpandedRowMap = Record; + +type DataVisualizerTableItem = FieldVisConfig | FileBasedFieldVisConfig; +interface DataVisualizerTableProps { + items: T[]; + pageState: DataVisualizerTableState; + updatePageState: (update: DataVisualizerTableState) => void; + getItemIdToExpandedRowMap: (itemIds: string[], items: T[]) => ItemIdToExpandedRowMap; + extendedColumns?: Array>; +} + +export const DataVisualizerTable = ({ + items, + pageState, + updatePageState, + getItemIdToExpandedRowMap, + extendedColumns, +}: DataVisualizerTableProps) => { + const [expandedRowItemIds, setExpandedRowItemIds] = useState([]); + const [expandAll, toggleExpandAll] = useState(false); + + const { onTableChange, pagination, sorting } = useTableSettings( + items, + pageState, + updatePageState + ); + const showDistributions: boolean = + ('showDistributions' in pageState && pageState.showDistributions) ?? true; + const toggleShowDistribution = () => { + updatePageState({ + ...pageState, + showDistributions: !showDistributions, + }); + }; + + function toggleDetails(item: DataVisualizerTableItem) { + if (item.fieldName === undefined) return; + const index = expandedRowItemIds.indexOf(item.fieldName); + if (index !== -1) { + expandedRowItemIds.splice(index, 1); + } else { + expandedRowItemIds.push(item.fieldName); + } + + // spread to a new array otherwise the component wouldn't re-render + setExpandedRowItemIds([...expandedRowItemIds]); + } + + const columns = useMemo(() => { + const expanderColumn: EuiTableComputedColumnType = { + name: ( + toggleExpandAll(!expandAll)} + aria-label={ + !expandAll + ? i18n.translate( + 'xpack.fileDataVisualizer.datavisualizer.dataGrid.expandDetailsForAllAriaLabel', + { + defaultMessage: 'Expand details for all fields', + } + ) + : i18n.translate( + 'xpack.fileDataVisualizer.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel', + { + defaultMessage: 'Collapse details for all fields', + } + ) + } + iconType={expandAll ? 'arrowUp' : 'arrowDown'} + /> + ), + align: RIGHT_ALIGNMENT, + width: '40px', + isExpander: true, + render: (item: DataVisualizerTableItem) => { + if (item.fieldName === undefined) return null; + const direction = expandedRowItemIds.includes(item.fieldName) ? 'arrowUp' : 'arrowDown'; + return ( + toggleDetails(item)} + aria-label={ + expandedRowItemIds.includes(item.fieldName) + ? i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.rowCollapse', { + defaultMessage: 'Hide details for {fieldName}', + values: { fieldName: item.fieldName }, + }) + : i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.rowExpand', { + defaultMessage: 'Show details for {fieldName}', + values: { fieldName: item.fieldName }, + }) + } + iconType={direction} + /> + ); + }, + 'data-test-subj': 'mlDataVisualizerTableColumnDetailsToggle', + }; + + const baseColumns = [ + expanderColumn, + { + field: 'type', + name: i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.typeColumnName', { + defaultMessage: 'Type', + }), + render: (fieldType: JobFieldType) => { + return ; + }, + width: '75px', + sortable: true, + align: CENTER_ALIGNMENT as HorizontalAlignment, + 'data-test-subj': 'mlDataVisualizerTableColumnType', + }, + { + field: 'fieldName', + name: i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.nameColumnName', { + defaultMessage: 'Name', + }), + sortable: true, + truncateText: true, + render: (fieldName: string) => ( + + {fieldName} + + ), + align: LEFT_ALIGNMENT as HorizontalAlignment, + 'data-test-subj': 'mlDataVisualizerTableColumnName', + }, + { + field: 'docCount', + name: i18n.translate( + 'xpack.fileDataVisualizer.datavisualizer.dataGrid.documentsCountColumnName', + { + defaultMessage: 'Documents (%)', + } + ), + render: (value: number | undefined, item: DataVisualizerTableItem) => ( + + ), + sortable: (item: DataVisualizerTableItem) => item?.stats?.count, + align: LEFT_ALIGNMENT as HorizontalAlignment, + 'data-test-subj': 'mlDataVisualizerTableColumnDocumentsCount', + }, + { + field: 'stats.cardinality', + name: i18n.translate( + 'xpack.fileDataVisualizer.datavisualizer.dataGrid.distinctValuesColumnName', + { + defaultMessage: 'Distinct values', + } + ), + render: (cardinality?: number) => , + sortable: true, + align: LEFT_ALIGNMENT as HorizontalAlignment, + 'data-test-subj': 'mlDataVisualizerTableColumnDistinctValues', + }, + { + name: ( +
+ + {i18n.translate( + 'xpack.fileDataVisualizer.datavisualizer.dataGrid.distributionsColumnName', + { + defaultMessage: 'Distributions', + } + )} + toggleShowDistribution()} + aria-label={i18n.translate( + 'xpack.fileDataVisualizer.datavisualizer.dataGrid.showDistributionsAriaLabel', + { + defaultMessage: 'Show distributions', + } + )} + /> +
+ ), + render: (item: DataVisualizerTableItem) => { + if (item === undefined || showDistributions === false) return null; + if ( + (item.type === JOB_FIELD_TYPES.KEYWORD || item.type === JOB_FIELD_TYPES.IP) && + item.stats?.topValues !== undefined + ) { + return ; + } + + if (item.type === JOB_FIELD_TYPES.NUMBER) { + if (isIndexBasedFieldVisConfig(item) && item.stats?.distribution !== undefined) { + return ; + } else { + return ; + } + } + + if (item.type === JOB_FIELD_TYPES.BOOLEAN) { + return ; + } + + return null; + }, + align: LEFT_ALIGNMENT as HorizontalAlignment, + 'data-test-subj': 'mlDataVisualizerTableColumnDistribution', + }, + ]; + return extendedColumns ? [...baseColumns, ...extendedColumns] : baseColumns; + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [expandAll, showDistributions, updatePageState, extendedColumns]); + + const itemIdToExpandedRowMap = useMemo(() => { + let itemIds = expandedRowItemIds; + if (expandAll) { + itemIds = items.map((i) => i[FIELD_NAME]).filter((f) => f !== undefined) as string[]; + } + return getItemIdToExpandedRowMap(itemIds, items); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [expandAll, items, expandedRowItemIds]); + + return ( + + + className={'dataVisualizer'} + items={items} + itemId={FIELD_NAME} + columns={columns} + pagination={pagination} + sorting={sorting} + isExpandable={true} + itemIdToExpandedRowMap={itemIdToExpandedRowMap} + isSelectable={false} + onTableChange={onTableChange} + data-test-subj={'mlDataVisualizerTable'} + rowProps={(item) => ({ + 'data-test-subj': `mlDataVisualizerRow row-${item.fieldName}`, + })} + /> + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/color_range_legend.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/color_range_legend.tsx new file mode 100644 index 0000000000000..58be31a53e9c5 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/color_range_legend.tsx @@ -0,0 +1,146 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { useEffect, useRef, FC } from 'react'; +import d3 from 'd3'; + +import { EuiText } from '@elastic/eui'; + +const COLOR_RANGE_RESOLUTION = 10; + +interface ColorRangeLegendProps { + colorRange: (d: number) => string; + justifyTicks?: boolean; + showTicks?: boolean; + title?: string; + width?: number; +} + +/** + * Component to render a legend for color ranges to be used for color coding + * table cells and visualizations. + * + * This current version supports normalized value ranges (0-1) only. + * + * @param props ColorRangeLegendProps + */ +export const ColorRangeLegend: FC = ({ + colorRange, + justifyTicks = false, + showTicks = true, + title, + width = 250, +}) => { + const d3Container = useRef(null); + + const scale = d3.range(COLOR_RANGE_RESOLUTION + 1).map((d) => ({ + offset: (d / COLOR_RANGE_RESOLUTION) * 100, + stopColor: colorRange(d / COLOR_RANGE_RESOLUTION), + })); + + useEffect(() => { + if (d3Container.current === null) { + return; + } + + const wrapperHeight = 32; + const wrapperWidth = width; + + // top: 2 — adjust vertical alignment with title text + // bottom: 20 — room for axis ticks and labels + // left/right: 1 — room for first and last axis tick + // when justifyTicks is enabled, the left margin is increased to not cut off the first tick label + const margin = { top: 2, bottom: 20, left: justifyTicks || !showTicks ? 1 : 4, right: 1 }; + + const legendWidth = wrapperWidth - margin.left - margin.right; + const legendHeight = wrapperHeight - margin.top - margin.bottom; + + // remove, then redraw the legend + d3.select(d3Container.current).selectAll('*').remove(); + + const wrapper = d3 + .select(d3Container.current) + .classed('colorRangeLegend', true) + .attr('width', wrapperWidth) + .attr('height', wrapperHeight) + .append('g') + .attr('transform', 'translate(' + margin.left + ',' + margin.top + ')'); + + // append gradient bar + const gradient = wrapper + .append('defs') + .append('linearGradient') + .attr('id', 'colorRangeGradient') + .attr('x1', '0%') + .attr('y1', '0%') + .attr('x2', '100%') + .attr('y2', '0%') + .attr('spreadMethod', 'pad'); + + scale.forEach(function (d) { + gradient + .append('stop') + .attr('offset', `${d.offset}%`) + .attr('stop-color', d.stopColor) + .attr('stop-opacity', 1); + }); + + wrapper + .append('rect') + .attr('x1', 0) + .attr('y1', 0) + .attr('width', legendWidth) + .attr('height', legendHeight) + .style('fill', 'url(#colorRangeGradient)'); + + const axisScale = d3.scale.linear().domain([0, 1]).range([0, legendWidth]); + + // Using this formatter ensures we get e.g. `0` and not `0.0`, but still `0.1`, `0.2` etc. + const tickFormat = d3.format(''); + const legendAxis = d3.svg + .axis() + .scale(axisScale) + .orient('bottom') + .tickFormat(tickFormat) + .tickSize(legendHeight + 4) + .ticks(legendWidth / 40); + + wrapper + .append('g') + .attr('class', 'legend axis') + .attr('transform', 'translate(0, 0)') + .call(legendAxis); + + // Adjust the alignment of the first and last tick text + // so that the tick labels don't overflow the color range. + if (justifyTicks || !showTicks) { + const text = wrapper.selectAll('text')[0]; + if (text.length > 1) { + d3.select(text[0]).style('text-anchor', 'start'); + d3.select(text[text.length - 1]).style('text-anchor', 'end'); + } + } + + if (!showTicks) { + wrapper.selectAll('.axis line').style('display', 'none'); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [JSON.stringify(scale), d3Container.current]); + + if (title === undefined) { + return ; + } + + return ( + <> + +

{title}

+ + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/index.ts new file mode 100644 index 0000000000000..85d85f51a623f --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { useDataVizChartTheme } from './use_data_viz_chart_theme'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.test.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.test.ts new file mode 100644 index 0000000000000..55888c607c287 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.test.ts @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { influencerColorScaleFactory } from './use_color_range'; + +describe('useColorRange', () => { + test('influencerColorScaleFactory(1)', () => { + const influencerColorScale = influencerColorScaleFactory(1); + + expect(influencerColorScale(0)).toBe(0); + expect(influencerColorScale(0.1)).toBe(0.1); + expect(influencerColorScale(0.2)).toBe(0.2); + expect(influencerColorScale(0.3)).toBe(0.3); + expect(influencerColorScale(0.4)).toBe(0.4); + expect(influencerColorScale(0.5)).toBe(0.5); + expect(influencerColorScale(0.6)).toBe(0.6); + expect(influencerColorScale(0.7)).toBe(0.7); + expect(influencerColorScale(0.8)).toBe(0.8); + expect(influencerColorScale(0.9)).toBe(0.9); + expect(influencerColorScale(1)).toBe(1); + }); + + test('influencerColorScaleFactory(2)', () => { + const influencerColorScale = influencerColorScaleFactory(2); + + expect(influencerColorScale(0)).toBe(0); + expect(influencerColorScale(0.1)).toBe(0); + expect(influencerColorScale(0.2)).toBe(0); + expect(influencerColorScale(0.3)).toBe(0); + expect(influencerColorScale(0.4)).toBe(0); + expect(influencerColorScale(0.5)).toBe(0); + expect(influencerColorScale(0.6)).toBe(0.04999999999999999); + expect(influencerColorScale(0.7)).toBe(0.09999999999999998); + expect(influencerColorScale(0.8)).toBe(0.15000000000000002); + expect(influencerColorScale(0.9)).toBe(0.2); + expect(influencerColorScale(1)).toBe(0.25); + }); + + test('influencerColorScaleFactory(3)', () => { + const influencerColorScale = influencerColorScaleFactory(3); + + expect(influencerColorScale(0)).toBe(0); + expect(influencerColorScale(0.1)).toBe(0); + expect(influencerColorScale(0.2)).toBe(0); + expect(influencerColorScale(0.3)).toBe(0); + expect(influencerColorScale(0.4)).toBe(0.05000000000000003); + expect(influencerColorScale(0.5)).toBe(0.125); + expect(influencerColorScale(0.6)).toBe(0.2); + expect(influencerColorScale(0.7)).toBe(0.27499999999999997); + expect(influencerColorScale(0.8)).toBe(0.35000000000000003); + expect(influencerColorScale(0.9)).toBe(0.425); + expect(influencerColorScale(1)).toBe(0.5); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts new file mode 100644 index 0000000000000..e24134507e3a9 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts @@ -0,0 +1,219 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import d3 from 'd3'; +import { useMemo } from 'react'; +import euiThemeLight from '@elastic/eui/dist/eui_theme_light.json'; +import euiThemeDark from '@elastic/eui/dist/eui_theme_dark.json'; + +import { i18n } from '@kbn/i18n'; + +import { useFileDataVisualizerKibana } from '../../../kibana_context'; + +/** + * Custom color scale factory that takes the amount of feature influencers + * into account to adjust the contrast of the color range. This is used for + * color coding for outlier detection where the amount of feature influencers + * affects the threshold from which the influencers value can actually be + * considered influential. + * + * @param n number of influencers + * @returns a function suitable as a preprocessor for d3.scale.linear() + */ +export const influencerColorScaleFactory = (n: number) => (t: number) => { + // for 1 influencer or less we fall back to a plain linear scale. + if (n <= 1) { + return t; + } + + if (t < 1 / n) { + return 0; + } + if (t < 3 / n) { + return (n / 4) * (t - 1 / n); + } + return 0.5 + (t - 3 / n); +}; + +export enum COLOR_RANGE_SCALE { + LINEAR = 'linear', + INFLUENCER = 'influencer', + SQRT = 'sqrt', +} + +/** + * Color range scale options in the format for EuiSelect's options prop. + */ +export const colorRangeScaleOptions = [ + { + value: COLOR_RANGE_SCALE.LINEAR, + text: i18n.translate('xpack.fileDataVisualizer.components.colorRangeLegend.linearScaleLabel', { + defaultMessage: 'Linear', + }), + }, + { + value: COLOR_RANGE_SCALE.INFLUENCER, + text: i18n.translate( + 'xpack.fileDataVisualizer.components.colorRangeLegend.influencerScaleLabel', + { + defaultMessage: 'Influencer custom scale', + } + ), + }, + { + value: COLOR_RANGE_SCALE.SQRT, + text: i18n.translate('xpack.fileDataVisualizer.components.colorRangeLegend.sqrtScaleLabel', { + defaultMessage: 'Sqrt', + }), + }, +]; + +export enum COLOR_RANGE { + BLUE = 'blue', + RED = 'red', + RED_GREEN = 'red-green', + GREEN_RED = 'green-red', + YELLOW_GREEN_BLUE = 'yellow-green-blue', +} + +/** + * Color range options in the format for EuiSelect's options prop. + */ +export const colorRangeOptions = [ + { + value: COLOR_RANGE.BLUE, + text: i18n.translate( + 'xpack.fileDataVisualizer.components.colorRangeLegend.blueColorRangeLabel', + { + defaultMessage: 'Blue', + } + ), + }, + { + value: COLOR_RANGE.RED, + text: i18n.translate( + 'xpack.fileDataVisualizer.components.colorRangeLegend.redColorRangeLabel', + { + defaultMessage: 'Red', + } + ), + }, + { + value: COLOR_RANGE.RED_GREEN, + text: i18n.translate( + 'xpack.fileDataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel', + { + defaultMessage: 'Red - Green', + } + ), + }, + { + value: COLOR_RANGE.GREEN_RED, + text: i18n.translate( + 'xpack.fileDataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel', + { + defaultMessage: 'Green - Red', + } + ), + }, + { + value: COLOR_RANGE.YELLOW_GREEN_BLUE, + text: i18n.translate( + 'xpack.fileDataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel', + { + defaultMessage: 'Yellow - Green - Blue', + } + ), + }, +]; + +/** + * A custom Yellow-Green-Blue color range to demonstrate the support + * for more complex ranges with more than two colors. + */ +const coloursYGB = [ + '#FFFFDD', + '#AAF191', + '#80D385', + '#61B385', + '#3E9583', + '#217681', + '#285285', + '#1F2D86', + '#000086', +]; +const colourRangeYGB = d3.range(0, 1, 1.0 / (coloursYGB.length - 1)); +colourRangeYGB.push(1); + +const colorDomains = { + [COLOR_RANGE.BLUE]: [0, 1], + [COLOR_RANGE.RED]: [0, 1], + [COLOR_RANGE.RED_GREEN]: [0, 1], + [COLOR_RANGE.GREEN_RED]: [0, 1], + [COLOR_RANGE.YELLOW_GREEN_BLUE]: colourRangeYGB, +}; + +/** + * Custom hook to get a d3 based color range to be used for color coding in table cells. + * + * @param colorRange COLOR_RANGE enum. + * @param colorRangeScale COLOR_RANGE_SCALE enum. + * @param featureCount + */ +export const useColorRange = ( + colorRange = COLOR_RANGE.BLUE, + colorRangeScale = COLOR_RANGE_SCALE.LINEAR, + featureCount = 1 +) => { + const { euiTheme } = useCurrentEuiTheme(); + + const colorRanges: Record = { + [COLOR_RANGE.BLUE]: [ + d3.rgb(euiTheme.euiColorEmptyShade).toString(), + d3.rgb(euiTheme.euiColorVis1).toString(), + ], + [COLOR_RANGE.RED]: [ + d3.rgb(euiTheme.euiColorEmptyShade).toString(), + d3.rgb(euiTheme.euiColorDanger).toString(), + ], + [COLOR_RANGE.RED_GREEN]: ['red', 'green'], + [COLOR_RANGE.GREEN_RED]: ['green', 'red'], + [COLOR_RANGE.YELLOW_GREEN_BLUE]: coloursYGB, + }; + + const linearScale = d3.scale + .linear() + .domain(colorDomains[colorRange]) + .range(colorRanges[colorRange]); + const influencerColorScale = influencerColorScaleFactory(featureCount); + const influencerScaleLinearWrapper = (n: number) => linearScale(influencerColorScale(n)); + + const scaleTypes = { + [COLOR_RANGE_SCALE.LINEAR]: linearScale, + [COLOR_RANGE_SCALE.INFLUENCER]: influencerScaleLinearWrapper, + [COLOR_RANGE_SCALE.SQRT]: d3.scale + .sqrt() + .domain(colorDomains[colorRange]) + // typings for .range() incorrectly don't allow passing in a color extent. + // @ts-ignore + .range(colorRanges[colorRange]), + }; + + return scaleTypes[colorRangeScale]; +}; + +export type EuiThemeType = typeof euiThemeLight | typeof euiThemeDark; + +export function useCurrentEuiTheme() { + const { + services: { uiSettings }, + } = useFileDataVisualizerKibana(); + return useMemo( + () => ({ euiTheme: uiSettings.get('theme:darkMode') ? euiThemeDark : euiThemeLight }), + [uiSettings] + ); +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_data_viz_chart_theme.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_data_viz_chart_theme.ts new file mode 100644 index 0000000000000..ad31ca2d09420 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_data_viz_chart_theme.ts @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { PartialTheme } from '@elastic/charts'; +import { useMemo } from 'react'; +import { useCurrentEuiTheme } from './use_color_range'; +export const useDataVizChartTheme = (): PartialTheme => { + const { euiTheme } = useCurrentEuiTheme(); + const chartTheme = useMemo(() => { + const AREA_SERIES_COLOR = euiTheme.euiColorVis0; + return { + axes: { + tickLabel: { + fontSize: parseInt(euiTheme.euiFontSizeXS, 10), + fontFamily: euiTheme.euiFontFamily, + fontStyle: 'italic', + }, + }, + background: { color: 'transparent' }, + chartMargins: { + left: 0, + right: 0, + top: 0, + bottom: 0, + }, + chartPaddings: { + left: 0, + right: 0, + top: 4, + bottom: 0, + }, + scales: { barsPadding: 0.1 }, + colors: { + vizColors: [AREA_SERIES_COLOR], + }, + areaSeriesStyle: { + line: { + strokeWidth: 1, + visible: true, + }, + point: { + visible: false, + radius: 0, + opacity: 0, + }, + area: { visible: true, opacity: 1 }, + }, + }; + }, [euiTheme]); + return chartTheme; +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/index.ts new file mode 100644 index 0000000000000..3009470af4858 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { DataVisualizerTable, ItemIdToExpandedRowMap } from './data_visualizer_stats_table'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_data_row.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_data_row.ts new file mode 100644 index 0000000000000..24209af23ceb4 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_data_row.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import type { FieldVisConfig, FileBasedFieldVisConfig } from './field_vis_config'; + +export interface FieldDataRowProps { + config: FieldVisConfig | FileBasedFieldVisConfig; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts new file mode 100644 index 0000000000000..e9ef0cd75e286 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { JobFieldType } from '../../../../../common'; + +export interface Percentile { + percent: number; + minValue: number; + maxValue: number; +} + +export interface MetricFieldVisStats { + avg?: number; + distribution?: { + percentiles: Percentile[]; + maxPercentile: number; + minPercentile: 0; + }; + max?: number; + median?: number; + min?: number; +} + +interface DocumentCountBuckets { + [key: string]: number; +} + +export interface FieldVisStats { + cardinality?: number; + count?: number; + sampleCount?: number; + trueCount?: number; + falseCount?: number; + earliest?: number; + latest?: number; + documentCounts?: { + buckets?: DocumentCountBuckets; + }; + avg?: number; + distribution?: { + percentiles: Percentile[]; + maxPercentile: number; + minPercentile: 0; + }; + fieldName?: string; + isTopValuesSampled?: boolean; + max?: number; + median?: number; + min?: number; + topValues?: Array<{ key: number | string; doc_count: number }>; + topValuesSampleSize?: number; + topValuesSamplerShardSize?: number; + examples?: Array; + timeRangeEarliest?: number; + timeRangeLatest?: number; +} + +// The internal representation of the configuration used to build the visuals +// which display the field information. +export interface FieldVisConfig { + type: JobFieldType; + fieldName?: string; + existsInDocs: boolean; + aggregatable: boolean; + loading: boolean; + stats?: FieldVisStats; + fieldFormat?: any; + isUnsupportedType?: boolean; +} + +export interface FileBasedFieldVisConfig { + type: JobFieldType; + fieldName?: string; + stats?: FieldVisStats; + format?: string; +} + +export interface FileBasedUnknownFieldVisConfig { + fieldName: string; + type: 'text' | 'unknown'; + stats: { mean: number; count: number; sampleCount: number; cardinality: number }; +} + +export function isFileBasedFieldVisConfig( + field: FieldVisConfig | FileBasedFieldVisConfig +): field is FileBasedFieldVisConfig { + return !field.hasOwnProperty('existsInDocs'); +} + +export function isIndexBasedFieldVisConfig( + field: FieldVisConfig | FileBasedFieldVisConfig +): field is FieldVisConfig { + return field.hasOwnProperty('existsInDocs'); +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts new file mode 100644 index 0000000000000..161829461aa26 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { FieldDataRowProps } from './field_data_row'; +export { + FieldVisConfig, + FileBasedFieldVisConfig, + FieldVisStats, + MetricFieldVisStats, + isFileBasedFieldVisConfig, + isIndexBasedFieldVisConfig, +} from './field_vis_config'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts new file mode 100644 index 0000000000000..e2ff18a8001aa --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Direction, EuiBasicTableProps, Pagination, PropertySort } from '@elastic/eui'; +import { useCallback, useMemo } from 'react'; + +import { DataVisualizerTableState } from '../../../../common'; + +const PAGE_SIZE_OPTIONS = [10, 25, 50]; + +interface UseTableSettingsReturnValue { + onTableChange: EuiBasicTableProps['onChange']; + pagination: Pagination; + sorting: { sort: PropertySort }; +} + +export function useTableSettings( + items: TypeOfItem[], + pageState: DataVisualizerTableState, + updatePageState: (update: DataVisualizerTableState) => void +): UseTableSettingsReturnValue { + const { pageIndex, pageSize, sortField, sortDirection } = pageState; + + const onTableChange: EuiBasicTableProps['onChange'] = useCallback( + ({ page, sort }) => { + const result = { + ...pageState, + pageIndex: page?.index ?? pageState.pageIndex, + pageSize: page?.size ?? pageState.pageSize, + sortField: (sort?.field as string) ?? pageState.sortField, + sortDirection: sort?.direction ?? pageState.sortDirection, + }; + updatePageState(result); + }, + [pageState, updatePageState] + ); + + const pagination = useMemo( + () => ({ + pageIndex, + pageSize, + totalItemCount: items.length, + pageSizeOptions: PAGE_SIZE_OPTIONS, + }), + [items, pageIndex, pageSize] + ); + + const sorting = useMemo( + () => ({ + sort: { + field: sortField as string, + direction: sortDirection as Direction, + }, + }), + [sortField, sortDirection] + ); + + return { onTableChange, pagination, sorting }; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/utils.ts new file mode 100644 index 0000000000000..27da91153b3ba --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/utils.ts @@ -0,0 +1,38 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FileBasedFieldVisConfig } from './types'; + +export const getTFPercentage = (config: FileBasedFieldVisConfig) => { + const { stats } = config; + if (stats === undefined) return null; + const { count } = stats; + // use stats from index based config + let { trueCount, falseCount } = stats; + + // use stats from file based find structure results + if (stats.trueCount === undefined || stats.falseCount === undefined) { + if (config?.stats?.topValues) { + config.stats.topValues.forEach((doc) => { + if (doc.doc_count !== undefined) { + if (doc.key.toString().toLowerCase() === 'false') { + falseCount = doc.doc_count; + } + if (doc.key.toString().toLowerCase() === 'true') { + trueCount = doc.doc_count; + } + } + }); + } + } + if (count === undefined || trueCount === undefined || falseCount === undefined) return null; + return { + count, + trueCount, + falseCount, + }; +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/_top_values.scss b/x-pack/plugins/file_data_visualizer/public/application/components/top_values/_top_values.scss new file mode 100644 index 0000000000000..05fa1bfa94b2d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/top_values/_top_values.scss @@ -0,0 +1,19 @@ +.fieldDataTopValuesContainer { + padding-top: $euiSizeXS; +} + +.topValuesValueLabelContainer { + margin-right: $euiSizeM; + &.topValuesValueLabelContainer--small { + width:70px; + } + + &.topValuesValueLabelContainer--large { + width: 200px; + } +} + +.topValuesPercentLabelContainer { + margin-left: $euiSizeM; + width:70px; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/top_values/index.ts new file mode 100644 index 0000000000000..c006b37fe2794 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/top_values/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { TopValues } from './top_values'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.tsx new file mode 100644 index 0000000000000..c1815fad41de8 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.tsx @@ -0,0 +1,115 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, Fragment } from 'react'; +import { + EuiFlexGroup, + EuiFlexItem, + EuiProgress, + EuiSpacer, + EuiText, + EuiToolTip, +} from '@elastic/eui'; + +import { FormattedMessage } from '@kbn/i18n/react'; + +import classNames from 'classnames'; +import { roundToDecimalPlace, kibanaFieldFormat } from '../utils'; +import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header'; +import { FieldVisStats } from '../stats_table/types'; + +interface Props { + stats: FieldVisStats | undefined; + fieldFormat?: any; + barColor?: 'primary' | 'secondary' | 'danger' | 'subdued' | 'accent'; + compressed?: boolean; +} + +function getPercentLabel(docCount: number, topValuesSampleSize: number): string { + const percent = (100 * docCount) / topValuesSampleSize; + if (percent >= 0.1) { + return `${roundToDecimalPlace(percent, 1)}%`; + } else { + return '< 0.1%'; + } +} + +export const TopValues: FC = ({ stats, fieldFormat, barColor, compressed }) => { + if (stats === undefined) return null; + const { + topValues, + topValuesSampleSize, + topValuesSamplerShardSize, + count, + isTopValuesSampled, + } = stats; + const progressBarMax = isTopValuesSampled === true ? topValuesSampleSize : count; + return ( + + + + + +
+ {Array.isArray(topValues) && + topValues.map((value) => ( + + + + + {kibanaFieldFormat(value.key, fieldFormat)} + + + + + + + {progressBarMax !== undefined && ( + + + {getPercentLabel(value.doc_count, progressBarMax)} + + + )} + + ))} + {isTopValuesSampled === true && ( + + + + + + + )} +
+ + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/format_value.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/format_value.ts new file mode 100644 index 0000000000000..5e12302a598ff --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/format_value.ts @@ -0,0 +1,88 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +/* + * Formatter for 'typical' and 'actual' values from machine learning results. + * For detectors which use the time_of_week or time_of_day + * functions, the filter converts the raw number, which is the number of seconds since + * midnight, into a human-readable date/time format. + */ + +import moment from 'moment'; +const SIGFIGS_IF_ROUNDING = 3; // Number of sigfigs to use for values < 10 + +// Formats a single value according to the specified ML function. +// If a Kibana fieldFormat is not supplied, will fall back to default +// formatting depending on the magnitude of the value. +// For time_of_day or time_of_week functions the anomaly record +// containing the timestamp of the anomaly should be supplied in +// order to correctly format the day or week offset to the time of the anomaly. +export function formatSingleValue( + value: number, + func?: string, + fieldFormat?: any, + record?: any // TODO remove record, not needed for file upload +) { + if (value === undefined || value === null) { + return ''; + } + + // If the analysis function is time_of_week/day, format as day/time. + // For time_of_week / day, actual / typical is the UTC offset in seconds from the + // start of the week / day, so need to manipulate to UTC moment of the start of the week / day + // that the anomaly occurred using record timestamp if supplied, add on the offset, and finally + // revert back to configured timezone for formatting. + if (func === 'time_of_week') { + const d = + record !== undefined && record.timestamp !== undefined + ? new Date(record.timestamp) + : new Date(); + const utcMoment = moment.utc(d).startOf('week').add(value, 's'); + return moment(utcMoment.valueOf()).format('ddd HH:mm'); + } else if (func === 'time_of_day') { + const d = + record !== undefined && record.timestamp !== undefined + ? new Date(record.timestamp) + : new Date(); + const utcMoment = moment.utc(d).startOf('day').add(value, 's'); + return moment(utcMoment.valueOf()).format('HH:mm'); + } else { + if (fieldFormat !== undefined) { + return fieldFormat.convert(value, 'text'); + } else { + // If no Kibana FieldFormat object provided, + // format the value depending on its magnitude. + const absValue = Math.abs(value); + if (absValue >= 10000 || absValue === Math.floor(absValue)) { + // Output 0 decimal places if whole numbers or >= 10000 + if (fieldFormat !== undefined) { + return fieldFormat.convert(value, 'text'); + } else { + return Number(value.toFixed(0)); + } + } else if (absValue >= 10) { + // Output to 1 decimal place between 10 and 10000 + return Number(value.toFixed(1)); + } else { + // For values < 10, output to 3 significant figures + let multiple; + if (value > 0) { + multiple = Math.pow( + 10, + SIGFIGS_IF_ROUNDING - Math.floor(Math.log(value) / Math.LN10) - 1 + ); + } else { + multiple = Math.pow( + 10, + SIGFIGS_IF_ROUNDING - Math.floor(Math.log(-1 * value) / Math.LN10) - 1 + ); + } + return Math.round(value * multiple) / multiple; + } + } + } +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/index.ts new file mode 100644 index 0000000000000..b4c491eee8fd4 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/index.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { createUrlOverrides, processResults, readFile, DEFAULT_LINES_TO_SAMPLE } from './utils'; +export { roundToDecimalPlace } from './round_to_decimal_place'; +export { kibanaFieldFormat } from './kibana_field_format'; +export { numberAsOrdinal } from './number_as_ordinal'; +export { formatSingleValue } from './format_value'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/kibana_field_format.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/kibana_field_format.ts new file mode 100644 index 0000000000000..0218b7d62655c --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/kibana_field_format.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +/* + * Formatter which uses the fieldFormat object of a Kibana index pattern + * field to format the value of a field. + */ + +export function kibanaFieldFormat(value: any, fieldFormat: any) { + if (fieldFormat !== undefined && fieldFormat !== null) { + return fieldFormat.convert(value, 'text'); + } else { + return value; + } +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.test.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.test.ts new file mode 100644 index 0000000000000..6990bf0923ac3 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.test.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { numberAsOrdinal } from './number_as_ordinal'; + +describe('numberAsOrdinal formatter', () => { + const tests = [ + { number: 0, asOrdinal: '0th' }, + { number: 1, asOrdinal: '1st' }, + { number: 2.2, asOrdinal: '2nd' }, + { number: 3, asOrdinal: '3rd' }, + { number: 5, asOrdinal: '5th' }, + { number: 10, asOrdinal: '10th' }, + { number: 11, asOrdinal: '11th' }, + { number: 22, asOrdinal: '22nd' }, + { number: 33, asOrdinal: '33rd' }, + { number: 44.4, asOrdinal: '44th' }, + { number: 100, asOrdinal: '100th' }, + ]; + test('returns the expected numeral format', () => { + tests.forEach((test) => { + expect(numberAsOrdinal(test.number)).toBe(test.asOrdinal); + }); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.ts new file mode 100644 index 0000000000000..3a2707cc47783 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +// @ts-ignore +import numeral from '@elastic/numeral'; + +/** + * Formats the supplied number as ordinal e.g. 15 as 15th. + * Formatting first converts the supplied number to an integer by flooring. + * @param {number} value to format as an ordinal + * @return {string} number formatted as an ordinal e.g. 15th + */ +export function numberAsOrdinal(num: number) { + const int = Math.floor(num); + return `${numeral(int).format('0o')}`; +} diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.test.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.test.ts new file mode 100644 index 0000000000000..151ae93a93815 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.test.ts @@ -0,0 +1,38 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { roundToDecimalPlace } from './round_to_decimal_place'; + +describe('roundToDecimalPlace formatter', () => { + it('returns the correct format using default decimal place', () => { + expect(roundToDecimalPlace(12)).toBe(12); + expect(roundToDecimalPlace(12.3)).toBe(12.3); + expect(roundToDecimalPlace(12.34)).toBe(12.34); + expect(roundToDecimalPlace(12.345)).toBe(12.35); + expect(roundToDecimalPlace(12.045)).toBe(12.05); + expect(roundToDecimalPlace(12.005)).toBe(12.01); + expect(roundToDecimalPlace(12.0005)).toBe(12); + expect(roundToDecimalPlace(0.05)).toBe(0.05); + expect(roundToDecimalPlace(0.005)).toBe('5.00e-3'); + expect(roundToDecimalPlace(0.0005)).toBe('5.00e-4'); + expect(roundToDecimalPlace(-0.0005)).toBe('-5.00e-4'); + expect(roundToDecimalPlace(-12.045)).toBe(-12.04); + expect(roundToDecimalPlace(0)).toBe(0); + }); + + it('returns the correct format using specified decimal place', () => { + expect(roundToDecimalPlace(12, 4)).toBe(12); + expect(roundToDecimalPlace(12.3, 4)).toBe(12.3); + expect(roundToDecimalPlace(12.3456, 4)).toBe(12.3456); + expect(roundToDecimalPlace(12.345678, 4)).toBe(12.3457); + expect(roundToDecimalPlace(0.05, 4)).toBe(0.05); + expect(roundToDecimalPlace(0.0005, 4)).toBe(0.0005); + expect(roundToDecimalPlace(0.00005, 4)).toBe('5.00e-5'); + expect(roundToDecimalPlace(-0.00005, 4)).toBe('-5.00e-5'); + expect(roundToDecimalPlace(0, 4)).toBe(0); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.ts new file mode 100644 index 0000000000000..88ab605a95369 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export function roundToDecimalPlace(num?: number, dp: number = 2): number | string { + if (num === undefined) return ''; + if (num % 1 === 0) { + // no decimal place + return num; + } + + if (Math.abs(num) < Math.pow(10, -dp)) { + return Number.parseFloat(String(num)).toExponential(2); + } + const m = Math.pow(10, dp); + return Math.round(num * m) / m; +} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts similarity index 96% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/utils.ts rename to x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts index 49e5da565b927..1d47e633188c5 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/utils/utils.ts +++ b/x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts @@ -6,8 +6,7 @@ */ import { isEqual } from 'lodash'; -import { AnalysisResult, InputOverrides } from '../../../../../../../file_upload/common'; -import { MB } from '../../../../../../../file_upload/public'; +import { AnalysisResult, InputOverrides, MB } from '../../../../../file_upload/common'; export const DEFAULT_LINES_TO_SAMPLE = 1000; const UPLOAD_SIZE_MB = 5; diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx new file mode 100644 index 0000000000000..f291076557bb8 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import './_index.scss'; +import React, { FC } from 'react'; +import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; +import { getCoreStart, getPluginsStart } from '../kibana_services'; + +// @ts-ignore +import { FileDataVisualizerView } from './components/file_datavisualizer_view/index'; + +export const FileDataVisualizer: FC = () => { + const coreStart = getCoreStart(); + const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart(); + const services = { data, maps, embeddable, share, security, fileUpload, ...coreStart }; + + return ( + + + + ); +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index.ts new file mode 100644 index 0000000000000..dba820519af94 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { FileDataVisualizer } from './file_datavisualizer'; diff --git a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts new file mode 100644 index 0000000000000..6752c322d42e3 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { CoreStart } from 'kibana/public'; +import { useKibana } from '../../../../../src/plugins/kibana_react/public'; +import type { FileDataVisualizerStartDependencies } from '../plugin'; + +export type StartServices = CoreStart & FileDataVisualizerStartDependencies; +export const useFileDataVisualizerKibana = () => useKibana(); diff --git a/x-pack/plugins/file_data_visualizer/public/application/shared_imports.ts b/x-pack/plugins/file_data_visualizer/public/application/shared_imports.ts new file mode 100644 index 0000000000000..20481d2fde9be --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/shared_imports.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { XJson } from '../../../../../src/plugins/es_ui_shared/public'; +const { collapseLiteralStrings, expandLiteralStrings } = XJson; + +export { XJsonMode } from '@kbn/ace'; +export { collapseLiteralStrings, expandLiteralStrings }; diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts b/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts new file mode 100644 index 0000000000000..6f81c0bf4e7d3 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { JOB_FIELD_TYPES } from '../../../common'; +import { getJobTypeAriaLabel, jobTypeAriaLabels } from './field_types_utils'; + +describe('field type utils', () => { + describe('getJobTypeAriaLabel: Getting a field type aria label by passing what it is stored in constants', () => { + test('should returns all JOB_FIELD_TYPES labels exactly as it is for each correct value', () => { + const keys = Object.keys(JOB_FIELD_TYPES); + const receivedLabels: Record = {}; + const testStorage = jobTypeAriaLabels; + keys.forEach((constant) => { + receivedLabels[constant] = getJobTypeAriaLabel( + JOB_FIELD_TYPES[constant as keyof typeof JOB_FIELD_TYPES] + ); + }); + + expect(receivedLabels).toEqual(testStorage); + }); + test('should returns NULL as JOB_FIELD_TYPES does not contain such a keyword', () => { + expect(getJobTypeAriaLabel('JOB_FIELD_TYPES')).toBe(null); + }); + }); +}); diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts new file mode 100644 index 0000000000000..76a5f6ac20117 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { i18n } from '@kbn/i18n'; +import { JOB_FIELD_TYPES } from '../../../common'; + +export const jobTypeAriaLabels = { + BOOLEAN: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.booleanTypeAriaLabel', { + defaultMessage: 'boolean type', + }), + DATE: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.dateTypeAriaLabel', { + defaultMessage: 'date type', + }), + GEO_POINT: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.geoPointTypeAriaLabel', { + defaultMessage: '{geoPointParam} type', + values: { + geoPointParam: 'geo point', + }, + }), + IP: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.ipTypeAriaLabel', { + defaultMessage: 'ip type', + }), + KEYWORD: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.keywordTypeAriaLabel', { + defaultMessage: 'keyword type', + }), + NUMBER: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.numberTypeAriaLabel', { + defaultMessage: 'number type', + }), + TEXT: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.textTypeAriaLabel', { + defaultMessage: 'text type', + }), + UNKNOWN: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.unknownTypeAriaLabel', { + defaultMessage: 'unknown type', + }), +}; + +export const getJobTypeAriaLabel = (type: string) => { + const requestedFieldType = Object.keys(JOB_FIELD_TYPES).find( + (k) => JOB_FIELD_TYPES[k as keyof typeof JOB_FIELD_TYPES] === type + ); + if (requestedFieldType === undefined) { + return null; + } + return jobTypeAriaLabels[requestedFieldType as keyof typeof jobTypeAriaLabels]; +}; diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts b/x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts new file mode 100644 index 0000000000000..821a94bf5166d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { getPluginsStart } from '../../kibana_services'; + +// expose the fileUpload plugin's getMaxBytesFormatted for use in ML +// so ML doesn't need to depend on the fileUpload plugin for this one function +export function getMaxBytesFormatted() { + return getPluginsStart().fileUpload.getMaxBytesFormatted(); +} diff --git a/x-pack/plugins/file_data_visualizer/public/index.ts b/x-pack/plugins/file_data_visualizer/public/index.ts new file mode 100644 index 0000000000000..64a81936dbbde --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/index.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FileDataVisualizerPlugin } from './plugin'; + +export function plugin() { + return new FileDataVisualizerPlugin(); +} + +export { FileDataVisualizerPluginStart } from './plugin'; diff --git a/x-pack/plugins/file_data_visualizer/public/kibana_services.ts b/x-pack/plugins/file_data_visualizer/public/kibana_services.ts new file mode 100644 index 0000000000000..6a5fe85c72477 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/kibana_services.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { CoreStart } from 'kibana/public'; +import { FileDataVisualizerStartDependencies } from './plugin'; + +let coreStart: CoreStart; +let pluginsStart: FileDataVisualizerStartDependencies; +export function setStartServices(core: CoreStart, plugins: FileDataVisualizerStartDependencies) { + coreStart = core; + pluginsStart = plugins; +} + +export const getCoreStart = () => coreStart; +export const getPluginsStart = () => pluginsStart; diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts new file mode 100644 index 0000000000000..99dbb6d3746ce --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { HttpSetup } from 'src/core/public'; +import { FileDataVisualizer } from '../application'; +import { getCoreStart } from '../kibana_services'; + +let loadModulesPromise: Promise; + +interface LazyLoadedModules { + FileDataVisualizer: typeof FileDataVisualizer; + getHttp: () => HttpSetup; +} + +export async function lazyLoadModules(): Promise { + if (typeof loadModulesPromise !== 'undefined') { + return loadModulesPromise; + } + + loadModulesPromise = new Promise(async (resolve) => { + const lazyImports = await import('./lazy'); + + resolve({ + ...lazyImports, + getHttp: () => getCoreStart().http, + }); + }); + return loadModulesPromise; +} diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts new file mode 100644 index 0000000000000..4229b95f3aaad --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +export { FileDataVisualizer } from '../../application'; diff --git a/x-pack/plugins/file_data_visualizer/public/plugin.ts b/x-pack/plugins/file_data_visualizer/public/plugin.ts new file mode 100644 index 0000000000000..a94c0fce45cd4 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/public/plugin.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { CoreStart } from 'kibana/public'; +import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public'; +import type { SharePluginStart } from '../../../../src/plugins/share/public'; +import { Plugin } from '../../../../src/core/public'; + +import { setStartServices } from './kibana_services'; +import { DataPublicPluginStart } from '../../../../src/plugins/data/public'; +import type { FileUploadPluginStart } from '../../file_upload/public'; +import type { MapsStartApi } from '../../maps/public'; +import type { SecurityPluginSetup } from '../../security/public'; +import { getFileDataVisualizerComponent } from './api'; +import { getMaxBytesFormatted } from './application/util/get_max_bytes'; + +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface FileDataVisualizerSetupDependencies {} +export interface FileDataVisualizerStartDependencies { + data: DataPublicPluginStart; + fileUpload: FileUploadPluginStart; + maps: MapsStartApi; + embeddable: EmbeddableStart; + security?: SecurityPluginSetup; + share: SharePluginStart; +} + +export type FileDataVisualizerPluginSetup = ReturnType; +export type FileDataVisualizerPluginStart = ReturnType; + +export class FileDataVisualizerPlugin + implements + Plugin< + FileDataVisualizerPluginSetup, + FileDataVisualizerPluginStart, + FileDataVisualizerSetupDependencies, + FileDataVisualizerStartDependencies + > { + public setup() {} + + public start(core: CoreStart, plugins: FileDataVisualizerStartDependencies) { + setStartServices(core, plugins); + return { getFileDataVisualizerComponent, getMaxBytesFormatted }; + } +} diff --git a/x-pack/plugins/file_data_visualizer/server/index.ts b/x-pack/plugins/file_data_visualizer/server/index.ts new file mode 100644 index 0000000000000..43067dbe99d0d --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/index.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { FileDataVisualizerPlugin } from './plugin'; + +export const plugin = () => new FileDataVisualizerPlugin(); diff --git a/x-pack/plugins/file_data_visualizer/server/plugin.ts b/x-pack/plugins/file_data_visualizer/server/plugin.ts new file mode 100644 index 0000000000000..f6893b7edaa53 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/server/plugin.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { Plugin } from 'src/core/server'; + +export class FileDataVisualizerPlugin implements Plugin { + setup() {} + start() {} +} diff --git a/x-pack/plugins/file_data_visualizer/tsconfig.json b/x-pack/plugins/file_data_visualizer/tsconfig.json new file mode 100644 index 0000000000000..2d668bcaa2045 --- /dev/null +++ b/x-pack/plugins/file_data_visualizer/tsconfig.json @@ -0,0 +1,20 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "composite": true, + "outDir": "./target/types", + "emitDeclarationOnly": true, + "declaration": true, + "declarationMap": true + }, + "include": ["common/**/*", "public/**/*", "server/**/*"], + "references": [ + { "path": "../../../src/core/tsconfig.json" }, + { "path": "../../../src/plugins/data/tsconfig.json" }, + { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, + { "path": "../security/tsconfig.json" }, + { "path": "../file_upload/tsconfig.json" }, + { "path": "../maps/tsconfig.json" }, + { "path": "../../../src/plugins/embeddable/tsconfig.json" }, + ] +} diff --git a/x-pack/plugins/file_upload/common/constants.ts b/x-pack/plugins/file_upload/common/constants.ts index ea36e51466703..977f969647658 100644 --- a/x-pack/plugins/file_upload/common/constants.ts +++ b/x-pack/plugins/file_upload/common/constants.ts @@ -16,4 +16,4 @@ export const FILE_SIZE_DISPLAY_FORMAT = '0,0.[0] b'; // Value to use in the Elasticsearch index mapping meta data to identify the // index as having been created by the ML File Data Visualizer. -export const INDEX_META_DATA_CREATED_BY = 'ml-file-data-visualizer'; +export const INDEX_META_DATA_CREATED_BY = 'file-data-visualizer'; diff --git a/x-pack/plugins/file_upload/common/types.ts b/x-pack/plugins/file_upload/common/types.ts index 11cf4ac3615bf..e10b9e90a71d8 100644 --- a/x-pack/plugins/file_upload/common/types.ts +++ b/x-pack/plugins/file_upload/common/types.ts @@ -6,11 +6,7 @@ */ import type { estypes } from '@elastic/elasticsearch'; -import { ES_FIELD_TYPES } from '../../../../src/plugins/data/common'; - -export interface HasImportPermission { - hasImportPermission: boolean; -} +import { ES_FIELD_TYPES } from 'src/plugins/data/common'; export interface InputOverrides { [key: string]: string | undefined; @@ -75,6 +71,28 @@ export interface FindFileStructureResponse { should_trim_fields?: boolean; } +export interface FindFileStructureErrorResponse { + body: { + statusCode: number; + error: string; + message: string; + attributes?: ErrorAttribute; + }; + name: string; +} + +interface ErrorAttribute { + body: { + error: { + suppressed: Array<{ reason: string }>; + }; + }; +} + +export interface HasImportPermission { + hasImportPermission: boolean; +} + export type InputData = any[]; export interface ImportResponse { diff --git a/x-pack/plugins/file_upload/kibana.json b/x-pack/plugins/file_upload/kibana.json index a1c585e534333..6f93874cdbcaa 100644 --- a/x-pack/plugins/file_upload/kibana.json +++ b/x-pack/plugins/file_upload/kibana.json @@ -4,7 +4,17 @@ "kibanaVersion": "kibana", "server": true, "ui": true, - "requiredPlugins": ["data", "usageCollection"], - "optionalPlugins": ["security"], - "requiredBundles": ["kibanaReact"] + "requiredPlugins": [ + "data", + "usageCollection" + ], + "optionalPlugins": [ + "security" + ], + "requiredBundles": [ + "kibanaReact" + ], + "extraPublicDirs": [ + "common" + ] } diff --git a/x-pack/plugins/file_upload/public/api/index.ts b/x-pack/plugins/file_upload/public/api/index.ts index 281537cbbde16..23eeb9abde324 100644 --- a/x-pack/plugins/file_upload/public/api/index.ts +++ b/x-pack/plugins/file_upload/public/api/index.ts @@ -6,22 +6,32 @@ */ import React from 'react'; -import { FileUploadComponentProps, lazyLoadFileUploadModules } from '../lazy_load_bundle'; +import { FileUploadComponentProps, lazyLoadModules } from '../lazy_load_bundle'; import type { IImporter, ImportFactoryOptions } from '../importer'; -import { HasImportPermission } from '../../common'; +import type { HasImportPermission, FindFileStructureResponse } from '../../common'; +import type { getMaxBytes, getMaxBytesFormatted } from '../importer/get_max_bytes'; export interface FileUploadStartApi { - getFileUploadComponent(): Promise>; - importerFactory(format: string, options: ImportFactoryOptions): Promise; - getMaxBytes(): number; - getMaxBytesFormatted(): string; - hasImportPermission(params: HasImportPermissionParams): Promise; + getFileUploadComponent(): ReturnType; + importerFactory: typeof importerFactory; + getMaxBytes: typeof getMaxBytes; + getMaxBytesFormatted: typeof getMaxBytesFormatted; + hasImportPermission: typeof hasImportPermission; + checkIndexExists: typeof checkIndexExists; + getTimeFieldRange: typeof getTimeFieldRange; + analyzeFile: typeof analyzeFile; +} + +export interface GetTimeFieldRangeResponse { + success: boolean; + start: { epoch: number; string: string }; + end: { epoch: number; string: string }; } export async function getFileUploadComponent(): Promise< React.ComponentType > { - const fileUploadModules = await lazyLoadFileUploadModules(); + const fileUploadModules = await lazyLoadModules(); return fileUploadModules.JsonUploadAndParse; } @@ -29,7 +39,7 @@ export async function importerFactory( format: string, options: ImportFactoryOptions ): Promise { - const fileUploadModules = await lazyLoadFileUploadModules(); + const fileUploadModules = await lazyLoadModules(); return fileUploadModules.importerFactory(format, options); } @@ -39,8 +49,22 @@ interface HasImportPermissionParams { indexName?: string; } +export async function analyzeFile( + file: string, + params: Record = {} +): Promise { + const { getHttp } = await lazyLoadModules(); + const body = JSON.stringify(file); + return await getHttp().fetch({ + path: `/internal/file_data_visualizer/analyze_file`, + method: 'POST', + body, + query: params, + }); +} + export async function hasImportPermission(params: HasImportPermissionParams): Promise { - const fileUploadModules = await lazyLoadFileUploadModules(); + const fileUploadModules = await lazyLoadModules(); try { const resp = await fileUploadModules.getHttp().fetch({ path: `/internal/file_upload/has_import_permission`, @@ -52,3 +76,29 @@ export async function hasImportPermission(params: HasImportPermissionParams): Pr return false; } } + +export async function checkIndexExists( + index: string, + params: Record = {} +): Promise { + const body = JSON.stringify({ index }); + const fileUploadModules = await lazyLoadModules(); + const { exists } = await fileUploadModules.getHttp().fetch<{ exists: boolean }>({ + path: `/internal/file_upload/index_exists`, + method: 'POST', + body, + query: params, + }); + return exists; +} + +export async function getTimeFieldRange(index: string, query: unknown, timeFieldName?: string) { + const body = JSON.stringify({ index, timeFieldName, query }); + + const fileUploadModules = await lazyLoadModules(); + return await fileUploadModules.getHttp().fetch({ + path: `/internal/file_upload/time_field_range`, + method: 'POST', + body, + }); +} diff --git a/x-pack/plugins/file_upload/public/components/geojson_upload_form/geojson_file_picker.tsx b/x-pack/plugins/file_upload/public/components/geojson_upload_form/geojson_file_picker.tsx index 2f31bc47b899c..6cd55e3a0a74a 100644 --- a/x-pack/plugins/file_upload/public/components/geojson_upload_form/geojson_file_picker.tsx +++ b/x-pack/plugins/file_upload/public/components/geojson_upload_form/geojson_file_picker.tsx @@ -9,7 +9,7 @@ import React, { Component } from 'react'; import { EuiFilePicker, EuiFormRow } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { MB } from '../../../common'; -import { getMaxBytesFormatted } from '../../get_max_bytes'; +import { getMaxBytesFormatted } from '../../importer/get_max_bytes'; import { validateFile } from '../../importer'; import { GeoJsonImporter, diff --git a/x-pack/plugins/file_upload/public/get_max_bytes.ts b/x-pack/plugins/file_upload/public/importer/get_max_bytes.ts similarity index 91% rename from x-pack/plugins/file_upload/public/get_max_bytes.ts rename to x-pack/plugins/file_upload/public/importer/get_max_bytes.ts index 2e002e65248c9..f1ca532692e77 100644 --- a/x-pack/plugins/file_upload/public/get_max_bytes.ts +++ b/x-pack/plugins/file_upload/public/importer/get_max_bytes.ts @@ -5,7 +5,6 @@ * 2.0. */ -// @ts-ignore import numeral from '@elastic/numeral'; import { MAX_FILE_SIZE, @@ -13,8 +12,8 @@ import { ABSOLUTE_MAX_FILE_SIZE_BYTES, FILE_SIZE_DISPLAY_FORMAT, UI_SETTING_MAX_FILE_SIZE, -} from '../common'; -import { getUiSettings } from './kibana_services'; +} from '../../common'; +import { getUiSettings } from '../kibana_services'; export function getMaxBytes() { const maxFileSize = getUiSettings().get(UI_SETTING_MAX_FILE_SIZE, MAX_FILE_SIZE); diff --git a/x-pack/plugins/file_upload/public/importer/importer.ts b/x-pack/plugins/file_upload/public/importer/importer.ts index 4a87d67d0616b..49324c8f360ef 100644 --- a/x-pack/plugins/file_upload/public/importer/importer.ts +++ b/x-pack/plugins/file_upload/public/importer/importer.ts @@ -260,7 +260,7 @@ export function callImportRoute({ }); return getHttp().fetch({ - path: `/api/file_upload/import`, + path: `/internal/file_upload/import`, method: 'POST', query, body, diff --git a/x-pack/plugins/file_upload/public/importer/validate_file.ts b/x-pack/plugins/file_upload/public/importer/validate_file.ts index 4c7fe704d8afa..60d93ad552d0d 100644 --- a/x-pack/plugins/file_upload/public/importer/validate_file.ts +++ b/x-pack/plugins/file_upload/public/importer/validate_file.ts @@ -6,7 +6,7 @@ */ import { i18n } from '@kbn/i18n'; -import { getMaxBytes, getMaxBytesFormatted } from '../get_max_bytes'; +import { getMaxBytes, getMaxBytesFormatted } from './get_max_bytes'; export function validateFile(file: File, types: string[]) { if (file.size > getMaxBytes()) { diff --git a/x-pack/plugins/file_upload/public/index.ts b/x-pack/plugins/file_upload/public/index.ts index bb69a1b2efb05..792568e9c11ad 100644 --- a/x-pack/plugins/file_upload/public/index.ts +++ b/x-pack/plugins/file_upload/public/index.ts @@ -11,8 +11,6 @@ export function plugin() { return new FileUploadPlugin(); } -export * from '../common'; - export * from './importer/types'; export { FileUploadPluginStart } from './plugin'; diff --git a/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts b/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts index e1e00bee37159..9d89b6b761e25 100644 --- a/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts +++ b/x-pack/plugins/file_upload/public/lazy_load_bundle/index.ts @@ -36,7 +36,7 @@ interface LazyLoadedFileUploadModules { getHttp: () => HttpStart; } -export async function lazyLoadFileUploadModules(): Promise { +export async function lazyLoadModules(): Promise { if (typeof loadModulesPromise !== 'undefined') { return loadModulesPromise; } diff --git a/x-pack/plugins/file_upload/public/plugin.ts b/x-pack/plugins/file_upload/public/plugin.ts index a4e386b85e182..19306fadfd61c 100644 --- a/x-pack/plugins/file_upload/public/plugin.ts +++ b/x-pack/plugins/file_upload/public/plugin.ts @@ -11,10 +11,13 @@ import { getFileUploadComponent, importerFactory, hasImportPermission, + checkIndexExists, + getTimeFieldRange, + analyzeFile, } from './api'; import { setStartServices } from './kibana_services'; import { DataPublicPluginStart } from '../../../../src/plugins/data/public'; -import { getMaxBytes, getMaxBytesFormatted } from './get_max_bytes'; +import { getMaxBytes, getMaxBytesFormatted } from './importer/get_max_bytes'; // eslint-disable-next-line @typescript-eslint/no-empty-interface export interface FileUploadSetupDependencies {} @@ -43,6 +46,9 @@ export class FileUploadPlugin getMaxBytes, getMaxBytesFormatted, hasImportPermission, + checkIndexExists, + getTimeFieldRange, + analyzeFile, }; } } diff --git a/x-pack/plugins/file_upload/server/get_time_field_range.ts b/x-pack/plugins/file_upload/server/get_time_field_range.ts new file mode 100644 index 0000000000000..66a428128cbe1 --- /dev/null +++ b/x-pack/plugins/file_upload/server/get_time_field_range.ts @@ -0,0 +1,54 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import { IScopedClusterClient } from 'kibana/server'; +export async function getTimeFieldRange( + client: IScopedClusterClient, + index: string[] | string, + timeFieldName: string, + query: any +): Promise<{ + success: boolean; + start: { epoch: number; string: string }; + end: { epoch: number; string: string }; +}> { + const obj = { success: true, start: { epoch: 0, string: '' }, end: { epoch: 0, string: '' } }; + + const { + body: { aggregations }, + } = await client.asCurrentUser.search({ + index, + size: 0, + body: { + ...(query ? { query } : {}), + aggs: { + earliest: { + min: { + field: timeFieldName, + }, + }, + latest: { + max: { + field: timeFieldName, + }, + }, + }, + }, + }); + + if (aggregations && aggregations.earliest && aggregations.latest) { + // @ts-expect-error fix search aggregation response + obj.start.epoch = aggregations.earliest.value; + // @ts-expect-error fix search aggregation response + obj.start.string = aggregations.earliest.value_as_string; + + // @ts-expect-error fix search aggregation response + obj.end.epoch = aggregations.latest.value; + // @ts-expect-error fix search aggregation response + obj.end.string = aggregations.latest.value_as_string; + } + return obj; +} diff --git a/x-pack/plugins/file_upload/server/routes.ts b/x-pack/plugins/file_upload/server/routes.ts index 6d7eb77f39069..f2e796ec53ce0 100644 --- a/x-pack/plugins/file_upload/server/routes.ts +++ b/x-pack/plugins/file_upload/server/routes.ts @@ -16,11 +16,12 @@ import { Settings, } from '../common'; import { wrapError } from './error_wrapper'; -import { analyzeFile } from './analyze_file'; import { importDataProvider } from './import_data'; +import { getTimeFieldRange } from './get_time_field_range'; +import { analyzeFile } from './analyze_file'; import { updateTelemetry } from './telemetry'; -import { analyzeFileQuerySchema, importFileBodySchema, importFileQuerySchema } from './schemas'; +import { importFileBodySchema, importFileQuerySchema, analyzeFileQuerySchema } from './schemas'; import { CheckPrivilegesPayload } from '../../security/server'; import { StartDeps } from './types'; @@ -92,7 +93,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup, logge /** * @apiGroup FileDataVisualizer * - * @api {post} /api/file_upload/analyze_file Analyze file data + * @api {post} /internal/file_upload/analyze_file Analyze file data * @apiName AnalyzeFile * @apiDescription Performs analysis of the file data. * @@ -100,7 +101,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup, logge */ router.post( { - path: '/api/file_upload/analyze_file', + path: '/internal/file_data_visualizer/analyze_file', validate: { body: schema.any(), query: analyzeFileQuerySchema, @@ -130,7 +131,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup, logge /** * @apiGroup FileDataVisualizer * - * @api {post} /api/file_upload/import Import file data + * @api {post} /internal/file_upload/import Import file data * @apiName ImportFile * @apiDescription Imports file data into elasticsearch index. * @@ -139,7 +140,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup, logge */ router.post( { - path: '/api/file_upload/import', + path: '/internal/file_upload/import', validate: { query: importFileQuerySchema, body: importFileBodySchema, @@ -180,4 +181,90 @@ export function fileUploadRoutes(coreSetup: CoreSetup, logge } } ); + + /** + * @apiGroup FileDataVisualizer + * + * @api {post} /internal/file_upload/index_exists ES Field caps wrapper checks if index exists + * @apiName IndexExists + */ + router.post( + { + path: '/internal/file_upload/index_exists', + validate: { + body: schema.object({ index: schema.string() }), + }, + options: { + tags: ['access:fileUpload:analyzeFile'], + }, + }, + async (context, request, response) => { + try { + const { index } = request.body; + + const options = { + index: [index], + fields: ['*'], + ignore_unavailable: true, + allow_no_indices: true, + }; + + const { body } = await context.core.elasticsearch.client.asCurrentUser.fieldCaps(options); + const exists = Array.isArray(body.indices) && body.indices.length !== 0; + return response.ok({ + body: { exists }, + }); + } catch (e) { + return response.customError(wrapError(e)); + } + } + ); + + /** + * @apiGroup FileDataVisualizer + * + * @api {post} /internal/file_upload/time_field_range Get time field range + * @apiName GetTimeFieldRange + * @apiDescription Returns the time range for the given index and query using the specified time range. + * + * @apiSchema (body) getTimeFieldRangeSchema + * + * @apiSuccess {Object} start start of time range with epoch and string properties. + * @apiSuccess {Object} end end of time range with epoch and string properties. + */ + router.post( + { + path: '/internal/file_upload/time_field_range', + validate: { + body: schema.object({ + /** Index or indexes for which to return the time range. */ + index: schema.oneOf([schema.string(), schema.arrayOf(schema.string())]), + /** Name of the time field in the index. */ + timeFieldName: schema.string(), + /** Query to match documents in the index(es). */ + query: schema.maybe(schema.any()), + }), + }, + options: { + tags: ['access:fileUpload:analyzeFile'], + }, + }, + async (context, request, response) => { + try { + const { index, timeFieldName, query } = request.body; + const resp = await getTimeFieldRange( + context.core.elasticsearch.client, + index, + timeFieldName, + query + ); + + return response.ok({ + body: resp, + }); + } catch (e) { + return response.customError(wrapError(e)); + } + } + ); } diff --git a/x-pack/plugins/file_upload/tsconfig.json b/x-pack/plugins/file_upload/tsconfig.json index 887a05af31174..3e146d76fbb90 100644 --- a/x-pack/plugins/file_upload/tsconfig.json +++ b/x-pack/plugins/file_upload/tsconfig.json @@ -13,5 +13,6 @@ { "path": "../../../src/plugins/data/tsconfig.json" }, { "path": "../../../src/plugins/usage_collection/tsconfig.json" }, { "path": "../security/tsconfig.json" }, + { "path": "../../../src/plugins/embeddable/tsconfig.json" }, ] } diff --git a/x-pack/plugins/fleet/common/constants/routes.ts b/x-pack/plugins/fleet/common/constants/routes.ts index 5aeba4bc3881d..377cb8d8bd871 100644 --- a/x-pack/plugins/fleet/common/constants/routes.ts +++ b/x-pack/plugins/fleet/common/constants/routes.ts @@ -76,6 +76,7 @@ export const SETTINGS_API_ROUTES = { // App API routes export const APP_API_ROUTES = { CHECK_PERMISSIONS_PATTERN: `${API_ROOT}/check-permissions`, + GENERATE_SERVICE_TOKEN_PATTERN: `${API_ROOT}/service-tokens`, }; // Agent API routes diff --git a/x-pack/plugins/fleet/common/services/routes.ts b/x-pack/plugins/fleet/common/services/routes.ts index e1b3791d9cbb5..6156decf8641d 100644 --- a/x-pack/plugins/fleet/common/services/routes.ts +++ b/x-pack/plugins/fleet/common/services/routes.ts @@ -164,6 +164,7 @@ export const settingsRoutesService = { export const appRoutesService = { getCheckPermissionsPath: () => APP_API_ROUTES.CHECK_PERMISSIONS_PATTERN, + getRegenerateServiceTokenPath: () => APP_API_ROUTES.GENERATE_SERVICE_TOKEN_PATTERN, }; export const enrollmentAPIKeyRouteService = { diff --git a/x-pack/plugins/fleet/common/types/rest_spec/app.ts b/x-pack/plugins/fleet/common/types/rest_spec/app.ts index 3e54cf04d7533..a742c387c14aa 100644 --- a/x-pack/plugins/fleet/common/types/rest_spec/app.ts +++ b/x-pack/plugins/fleet/common/types/rest_spec/app.ts @@ -9,3 +9,8 @@ export interface CheckPermissionsResponse { error?: 'MISSING_SECURITY' | 'MISSING_SUPERUSER_ROLE'; success: boolean; } + +export interface GenerateServiceTokenResponse { + name: string; + value: string; +} diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/confirm_modal.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/confirm_modal.tsx index 8bef32916452f..ae9863e84d605 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/confirm_modal.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/confirm_modal.tsx @@ -113,7 +113,7 @@ export const SettingsConfirmModal = React.memo( title={ } color="warning" @@ -124,13 +124,13 @@ export const SettingsConfirmModal = React.memo(

), @@ -143,13 +143,13 @@ export const SettingsConfirmModal = React.memo(

), @@ -178,7 +178,7 @@ export const SettingsConfirmModal = React.memo( diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/index.tsx index 30e1aedc3e5a5..f3c353fd75dba 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/index.tsx @@ -251,19 +251,10 @@ export const SettingFlyout: React.FunctionComponent = ({ onClose }) => { const body = settings && ( - -

- -

- - outputs, }} @@ -279,7 +270,7 @@ export const SettingFlyout: React.FunctionComponent = ({ onClose }) => { helpText={ = ({ onClose }) => { defaultMessage: 'Elasticsearch hosts', })} helpText={i18n.translate('xpack.fleet.settings.elasticsearchUrlsHelpTect', { - defaultMessage: 'Specify the Elasticsearch URLs where agents will send data.', + defaultMessage: 'Specify the Elasticsearch URLs where agents send data.', })} {...inputs.elasticsearchUrl.formRowProps} > diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/app.ts b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/app.ts index bd690a4b53e07..c84dd0fd15b44 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/app.ts +++ b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/app.ts @@ -6,7 +6,7 @@ */ import { appRoutesService } from '../../services'; -import type { CheckPermissionsResponse } from '../../types'; +import type { CheckPermissionsResponse, GenerateServiceTokenResponse } from '../../types'; import { sendRequest } from './use_request'; @@ -16,3 +16,10 @@ export const sendGetPermissionsCheck = () => { method: 'get', }); }; + +export const sendGenerateServiceToken = () => { + return sendRequest({ + path: appRoutesService.getRegenerateServiceTokenPath(), + method: 'post', + }); +}; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx index e5f3cdbcfba97..2e37d9efc7857 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/fleet_server_requirement_page.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React from 'react'; +import React, { useState, useMemo, useCallback } from 'react'; import { EuiButton, EuiFlexGroup, @@ -16,62 +16,283 @@ import { EuiText, EuiLink, EuiEmptyPrompt, + EuiSteps, + EuiCodeBlock, + EuiCallOut, + EuiSelect, } from '@elastic/eui'; +import type { EuiStepProps } from '@elastic/eui/src/components/steps/step'; import styled from 'styled-components'; -import { FormattedMessage } from 'react-intl'; +import { i18n } from '@kbn/i18n'; +import { FormattedMessage } from '@kbn/i18n/react'; -import { useStartServices } from '../../../hooks'; +import { DownloadStep } from '../components/agent_enrollment_flyout/steps'; +import { useStartServices, useGetOutputs, sendGenerateServiceToken } from '../../../hooks'; + +const FlexItemWithMinWidth = styled(EuiFlexItem)` + min-width: 0px; + max-width: 100%; +`; export const ContentWrapper = styled(EuiFlexGroup)` height: 100%; + margin: 0 auto; + max-width: 800px; `; -function renderOnPremInstructions() { +// Otherwise the copy button is over the text +const CommandCode = styled.pre({ + overflow: 'scroll', +}); + +type PLATFORM_TYPE = 'linux-mac' | 'windows' | 'rpm-deb'; +const PLATFORM_OPTIONS: Array<{ text: string; value: PLATFORM_TYPE }> = [ + { text: 'Linux / macOS', value: 'linux-mac' }, + { text: 'Windows', value: 'windows' }, + { text: 'RPM / DEB', value: 'rpm-deb' }, +]; + +export const ServiceTokenStep = ({ + serviceToken, + getServiceToken, + isLoadingServiceToken, +}: { + serviceToken?: string; + getServiceToken: () => void; + isLoadingServiceToken: boolean; +}): EuiStepProps => { + return { + title: i18n.translate('xpack.fleet.fleetServerSetup.stepGenerateServiceTokenTitle', { + defaultMessage: 'Generate a service token', + }), + children: ( + <> + + + + + {!serviceToken ? ( + + + { + getServiceToken(); + }} + > + + + + + ) : ( + <> + + + + + + + + + + + + + {serviceToken} + + + + + )} + + ), + }; +}; + +export const FleetServerCommandStep = ({ + serviceToken, + installCommand, + platform, + setPlatform, +}: { + serviceToken?: string; + installCommand: string; + platform: string; + setPlatform: (platform: PLATFORM_TYPE) => void; +}): EuiStepProps => { + return { + title: i18n.translate('xpack.fleet.fleetServerSetup.stepInstallAgentTitle', { + defaultMessage: 'Start Fleet Server', + }), + status: !serviceToken ? 'disabled' : undefined, + children: serviceToken ? ( + <> + + + + + ), + }} + /> + + + + + + } + options={PLATFORM_OPTIONS} + value={platform} + onChange={(e) => setPlatform(e.target.value as PLATFORM_TYPE)} + aria-label={i18n.translate('xpack.fleet.fleetServerSetup.platformSelectAriaLabel', { + defaultMessage: 'Platform', + })} + /> + + + {installCommand} + + + ) : null, + }; +}; + +export const useFleetServerInstructions = () => { + const outputsRequest = useGetOutputs(); + const { notifications } = useStartServices(); + const [serviceToken, setServiceToken] = useState(); + const [isLoadingServiceToken, setIsLoadingServiceToken] = useState(false); + const [platform, setPlatform] = useState('linux-mac'); + + const output = outputsRequest.data?.items?.[0]; + const esHost = output?.hosts?.[0]; + + const installCommand = useMemo((): string => { + if (!serviceToken || !esHost) { + return ''; + } + switch (platform) { + case 'linux-mac': + return `sudo ./elastic-agent install -f --fleet-server-es=${esHost} --fleet-server-service-token=${serviceToken}`; + case 'windows': + return `.\\elastic-agent.exe install --fleet-server-es=${esHost} --fleet-server-service-token=${serviceToken}`; + case 'rpm-deb': + return `sudo elastic-agent enroll -f --fleet-server-es=${esHost} --fleet-server-service-token=${serviceToken}`; + default: + return ''; + } + }, [serviceToken, esHost, platform]); + + const getServiceToken = useCallback(async () => { + setIsLoadingServiceToken(true); + try { + const { data } = await sendGenerateServiceToken(); + if (data?.value) { + setServiceToken(data?.value); + } + } catch (err) { + notifications.toasts.addError(err, { + title: i18n.translate('xpack.fleet.fleetServerSetup.errorGeneratingTokenTitleText', { + defaultMessage: 'Error generating token', + }), + }); + } + + setIsLoadingServiceToken(false); + }, [notifications]); + + return { + serviceToken, + getServiceToken, + isLoadingServiceToken, + installCommand, + platform, + setPlatform, + }; +}; + +const OnPremInstructions: React.FC = () => { + const { + serviceToken, + getServiceToken, + isLoadingServiceToken, + installCommand, + platform, + setPlatform, + } = useFleetServerInstructions(); + return ( - - - -

- } - body={ + + + +

- } - actions={ - - - - } +

+ + + + + ), + }} + /> + + + ); -} +}; -function renderCloudInstructions(deploymentUrl: string) { +const CloudInstructions: React.FC<{ deploymentUrl: string }> = ({ deploymentUrl }) => { return ( ); -} +}; export const FleetServerRequirementPage = () => { const startService = useStartServices(); @@ -134,11 +355,16 @@ export const FleetServerRequirementPage = () => { return ( <> - + + + {deploymentUrl ? ( + + ) : ( + + )} + - {deploymentUrl ? renderCloudInstructions(deploymentUrl) : renderOnPremInstructions()} - - + diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/index.tsx index 9993014f55cdb..9e6505ede4918 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_requirements_page/index.tsx @@ -6,4 +6,9 @@ */ export { MissingESRequirementsPage } from './es_requirements_page'; -export { FleetServerRequirementPage } from './fleet_server_requirement_page'; +export { + FleetServerRequirementPage, + ServiceTokenStep, + FleetServerCommandStep, + useFleetServerInstructions, +} from './fleet_server_requirement_page'; diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/index.tsx index d3c6ec114ee0a..0ad1706e5273f 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/index.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/index.tsx @@ -129,12 +129,12 @@ export const AgentEnrollmentFlyout: React.FunctionComponent = ({ ) : undefined } > - {fleetServerHosts.length === 0 ? null : mode === 'managed' ? ( + {fleetServerHosts.length === 0 && mode === 'managed' ? null : mode === 'managed' ? ( ) : ( diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx index 34b3536ac2810..8f6a2a26a2f6f 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx @@ -5,7 +5,7 @@ * 2.0. */ -import React, { useState } from 'react'; +import React, { useState, useMemo } from 'react'; import { EuiSteps, EuiLink, EuiText, EuiSpacer } from '@elastic/eui'; import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps'; import { i18n } from '@kbn/i18n'; @@ -19,7 +19,12 @@ import { useFleetStatus, } from '../../../../hooks'; import { ManualInstructions } from '../../../../components/enrollment_instructions'; -import { FleetServerRequirementPage } from '../../agent_requirements_page'; +import { + FleetServerRequirementPage, + ServiceTokenStep, + FleetServerCommandStep, + useFleetServerInstructions, +} from '../../agent_requirements_page'; import { DownloadStep, AgentPolicySelectionStep } from './steps'; @@ -58,23 +63,55 @@ export const ManagedInstructions = React.memo(({ agentPolicies }) => { const fleetStatus = useFleetStatus(); const [selectedAPIKeyId, setSelectedAPIKeyId] = useState(); + const [isFleetServerPolicySelected, setIsFleetServerPolicySelected] = useState(false); const apiKey = useGetOneEnrollmentAPIKey(selectedAPIKeyId); const settings = useGetSettings(); - const fleetServerHosts = settings.data?.item?.fleet_server_hosts || []; + const fleetServerInstructions = useFleetServerInstructions(); - const steps: EuiContainedStepProps[] = [ - DownloadStep(), - AgentPolicySelectionStep({ agentPolicies, setSelectedAPIKeyId }), - { - title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', { - defaultMessage: 'Enroll and start the Elastic Agent', + const steps = useMemo(() => { + const { + serviceToken, + getServiceToken, + isLoadingServiceToken, + installCommand, + platform, + setPlatform, + } = fleetServerInstructions; + const fleetServerHosts = settings.data?.item?.fleet_server_hosts || []; + const baseSteps: EuiContainedStepProps[] = [ + DownloadStep(), + AgentPolicySelectionStep({ + agentPolicies, + setSelectedAPIKeyId, + setIsFleetServerPolicySelected, }), - children: apiKey.data && ( - - ), - }, - ]; + ]; + if (isFleetServerPolicySelected) { + baseSteps.push( + ...[ + ServiceTokenStep({ serviceToken, getServiceToken, isLoadingServiceToken }), + FleetServerCommandStep({ serviceToken, installCommand, platform, setPlatform }), + ] + ); + } else { + baseSteps.push({ + title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', { + defaultMessage: 'Enroll and start the Elastic Agent', + }), + children: apiKey.data && ( + + ), + }); + } + return baseSteps; + }, [ + agentPolicies, + apiKey.data, + isFleetServerPolicySelected, + settings.data?.item?.fleet_server_hosts, + fleetServerInstructions, + ]); return ( <> diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx index faa0461ed4773..08b1cbdb341d5 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx +++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx @@ -5,12 +5,14 @@ * 2.0. */ -import React from 'react'; +import React, { useCallback } from 'react'; import { EuiText, EuiButton, EuiSpacer } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; -import type { AgentPolicy } from '../../../../types'; +import type { AgentPolicy, PackagePolicy } from '../../../../types'; +import { sendGetOneAgentPolicy } from '../../../../hooks'; +import { FLEET_SERVER_PACKAGE } from '../../../../constants'; import { EnrollmentStepAgentPolicy } from './agent_policy_selection'; @@ -48,14 +50,39 @@ export const AgentPolicySelectionStep = ({ agentPolicies, setSelectedAPIKeyId, setSelectedPolicyId, + setIsFleetServerPolicySelected, }: { agentPolicies?: AgentPolicy[]; setSelectedAPIKeyId?: (key: string) => void; setSelectedPolicyId?: (policyId: string) => void; + setIsFleetServerPolicySelected?: (selected: boolean) => void; }) => { const regularAgentPolicies = Array.isArray(agentPolicies) ? agentPolicies.filter((policy) => policy && !policy.is_managed) : []; + + const onAgentPolicyChange = useCallback( + async (policyId: string) => { + if (setSelectedPolicyId) { + setSelectedPolicyId(policyId); + } + if (setIsFleetServerPolicySelected) { + const agentPolicyRequest = await sendGetOneAgentPolicy(policyId); + if ( + agentPolicyRequest.data?.item && + (agentPolicyRequest.data.item.package_policies as PackagePolicy[]).some( + (packagePolicy) => packagePolicy.package?.name === FLEET_SERVER_PACKAGE + ) + ) { + setIsFleetServerPolicySelected(true); + } else { + setIsFleetServerPolicySelected(false); + } + } + }, + [setIsFleetServerPolicySelected, setSelectedPolicyId] + ); + return { title: i18n.translate('xpack.fleet.agentEnrollment.stepChooseAgentPolicyTitle', { defaultMessage: 'Choose an agent policy', @@ -65,7 +92,7 @@ export const AgentPolicySelectionStep = ({ agentPolicies={regularAgentPolicies} withKeySelection={setSelectedAPIKeyId ? true : false} onKeyChange={setSelectedAPIKeyId} - onAgentPolicyChange={setSelectedPolicyId} + onAgentPolicyChange={onAgentPolicyChange} /> ), }; diff --git a/x-pack/plugins/fleet/public/applications/fleet/types/index.ts b/x-pack/plugins/fleet/public/applications/fleet/types/index.ts index 89aa5ad1add35..0d85bfcdb6af6 100644 --- a/x-pack/plugins/fleet/public/applications/fleet/types/index.ts +++ b/x-pack/plugins/fleet/public/applications/fleet/types/index.ts @@ -88,6 +88,7 @@ export { PutSettingsResponse, // API schemas - app CheckPermissionsResponse, + GenerateServiceTokenResponse, // EPM types AssetReference, AssetsGroupedByServiceByType, diff --git a/x-pack/plugins/fleet/server/errors/index.ts b/x-pack/plugins/fleet/server/errors/index.ts index 6738e078e8b75..793a349f730f3 100644 --- a/x-pack/plugins/fleet/server/errors/index.ts +++ b/x-pack/plugins/fleet/server/errors/index.ts @@ -47,6 +47,7 @@ export class AgentUnenrollmentError extends IngestManagerError {} export class AgentPolicyDeletionError extends IngestManagerError {} export class FleetSetupError extends IngestManagerError {} +export class GenerateServiceTokenError extends IngestManagerError {} export class ArtifactsClientError extends IngestManagerError {} export class ArtifactsClientAccessDeniedError extends IngestManagerError { diff --git a/x-pack/plugins/fleet/server/routes/app/index.ts b/x-pack/plugins/fleet/server/routes/app/index.ts index ba7c649c4fa54..f2fc6302c8ce5 100644 --- a/x-pack/plugins/fleet/server/routes/app/index.ts +++ b/x-pack/plugins/fleet/server/routes/app/index.ts @@ -7,9 +7,10 @@ import type { IRouter, RequestHandler } from 'src/core/server'; -import { APP_API_ROUTES } from '../../constants'; +import { PLUGIN_ID, APP_API_ROUTES } from '../../constants'; import { appContextService } from '../../services'; -import type { CheckPermissionsResponse } from '../../../common'; +import type { CheckPermissionsResponse, GenerateServiceTokenResponse } from '../../../common'; +import { defaultIngestErrorHandler, GenerateServiceTokenError } from '../../errors'; export const getCheckPermissionsHandler: RequestHandler = async (context, request, response) => { const body: CheckPermissionsResponse = { success: true }; @@ -35,6 +36,29 @@ export const getCheckPermissionsHandler: RequestHandler = async (context, reques } }; +export const generateServiceTokenHandler: RequestHandler = async (context, request, response) => { + const esClient = context.core.elasticsearch.client.asCurrentUser; + try { + const { body: tokenResponse } = await esClient.transport.request({ + method: 'POST', + path: `_security/service/elastic/fleet-server/credential/token/token-${Date.now()}`, + }); + + if (tokenResponse.created && tokenResponse.token) { + const body: GenerateServiceTokenResponse = tokenResponse.token; + return response.ok({ + body, + }); + } else { + const error = new GenerateServiceTokenError('Unable to generate service token'); + return defaultIngestErrorHandler({ error, response }); + } + } catch (e) { + const error = new GenerateServiceTokenError(e); + return defaultIngestErrorHandler({ error, response }); + } +}; + export const registerRoutes = (router: IRouter) => { router.get( { @@ -44,4 +68,13 @@ export const registerRoutes = (router: IRouter) => { }, getCheckPermissionsHandler ); + + router.post( + { + path: APP_API_ROUTES.GENERATE_SERVICE_TOKEN_PATTERN, + validate: {}, + options: { tags: [`access:${PLUGIN_ID}-all`] }, + }, + generateServiceTokenHandler + ); }; diff --git a/x-pack/plugins/infra/common/http_api/log_analysis/validation/datasets.ts b/x-pack/plugins/infra/common/http_api/log_analysis/validation/datasets.ts index c349ceab03043..ff4ee4fd328da 100644 --- a/x-pack/plugins/infra/common/http_api/log_analysis/validation/datasets.ts +++ b/x-pack/plugins/infra/common/http_api/log_analysis/validation/datasets.ts @@ -19,6 +19,7 @@ export const validateLogEntryDatasetsRequestPayloadRT = rt.type({ timestampField: rt.string, startTime: rt.number, endTime: rt.number, + runtimeMappings: rt.UnknownRecord, }), }); diff --git a/x-pack/plugins/infra/common/http_api/log_analysis/validation/log_entry_rate_indices.ts b/x-pack/plugins/infra/common/http_api/log_analysis/validation/log_entry_rate_indices.ts index c63a544201749..a6a7a9996d260 100644 --- a/x-pack/plugins/infra/common/http_api/log_analysis/validation/log_entry_rate_indices.ts +++ b/x-pack/plugins/infra/common/http_api/log_analysis/validation/log_entry_rate_indices.ts @@ -26,6 +26,7 @@ export const validationIndicesRequestPayloadRT = rt.type({ data: rt.type({ fields: rt.array(validationIndicesFieldSpecificationRT), indices: rt.array(rt.string), + runtimeMappings: rt.UnknownRecord, }), }); diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts index 9b827b6cb5331..d4e1f7366dd2a 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/ml_get_jobs_summary_api.ts @@ -97,6 +97,9 @@ export const jobSummaryRT = rt.intersection([ custom_settings: jobCustomSettingsRT, finished_time: rt.number, model_size_stats: jobModelSizeStatsRT, + datafeed_config: rt.partial({ + runtime_mappings: rt.UnknownRecord, + }), }), }), ]); diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts index 8fe2d215cef26..9eadc3035588d 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_datasets.ts @@ -5,6 +5,7 @@ * 2.0. */ +import type { estypes } from '@elastic/elasticsearch'; import type { HttpHandler } from 'src/core/public'; import { LOG_ANALYSIS_VALIDATE_DATASETS_PATH, @@ -18,10 +19,11 @@ interface RequestArgs { timestampField: string; startTime: number; endTime: number; + runtimeMappings: estypes.RuntimeFields; } export const callValidateDatasetsAPI = async (requestArgs: RequestArgs, fetch: HttpHandler) => { - const { indices, timestampField, startTime, endTime } = requestArgs; + const { indices, timestampField, startTime, endTime, runtimeMappings } = requestArgs; const response = await fetch(LOG_ANALYSIS_VALIDATE_DATASETS_PATH, { method: 'POST', body: JSON.stringify( @@ -31,6 +33,7 @@ export const callValidateDatasetsAPI = async (requestArgs: RequestArgs, fetch: H indices, startTime, timestampField, + runtimeMappings, }, }) ), diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts index 5168736b80f0a..f9eb7609e00f3 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/api/validate_indices.ts @@ -6,6 +6,7 @@ */ import type { HttpHandler } from 'src/core/public'; +import { estypes } from '@elastic/elasticsearch'; import { LOG_ANALYSIS_VALIDATE_INDICES_PATH, @@ -19,13 +20,16 @@ import { decodeOrThrow } from '../../../../../common/runtime_types'; interface RequestArgs { indices: string[]; fields: ValidationIndicesFieldSpecification[]; + runtimeMappings: estypes.RuntimeFields; } export const callValidateIndicesAPI = async (requestArgs: RequestArgs, fetch: HttpHandler) => { - const { indices, fields } = requestArgs; + const { indices, fields, runtimeMappings } = requestArgs; const response = await fetch(LOG_ANALYSIS_VALIDATE_INDICES_PATH, { method: 'POST', - body: JSON.stringify(validationIndicesRequestPayloadRT.encode({ data: { indices, fields } })), + body: JSON.stringify( + validationIndicesRequestPayloadRT.encode({ data: { indices, fields, runtimeMappings } }) + ), }); return decodeOrThrow(validationIndicesResponsePayloadRT)(response); diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx index 00a6c3c2a72fb..a9ea7e6d6e39a 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module.tsx @@ -21,7 +21,7 @@ export const useLogAnalysisModule = ({ moduleDescriptor: ModuleDescriptor; }) => { const { services } = useKibanaContextForPlugin(); - const { spaceId, sourceId, timestampField } = sourceConfiguration; + const { spaceId, sourceId, timestampField, runtimeMappings } = sourceConfiguration; const [moduleStatus, dispatchModuleStatus] = useModuleStatus(moduleDescriptor.jobTypes); const trackMetric = useUiTracker({ app: 'infra_logs' }); @@ -67,6 +67,7 @@ export const useLogAnalysisModule = ({ sourceId, spaceId, timestampField, + runtimeMappings, }, services.http.fetch ); diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_configuration.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_configuration.ts index 1a1f2862b331b..888c89357929a 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_configuration.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_configuration.ts @@ -6,6 +6,7 @@ */ import { useMemo } from 'react'; +import equal from 'fast-deep-equal'; import { JobSummary } from './api/ml_get_jobs_summary_api'; import { ModuleDescriptor, ModuleSourceConfiguration } from './log_analysis_module_types'; @@ -30,11 +31,16 @@ export const isJobConfigurationOutdated = ( { bucketSpan }: ModuleDescriptor, currentSourceConfiguration: ModuleSourceConfiguration ) => (jobSummary: JobSummary): boolean => { - if (!jobSummary.fullJob || !jobSummary.fullJob.custom_settings) { + if ( + !jobSummary.fullJob || + !jobSummary.fullJob.custom_settings || + !jobSummary.fullJob.datafeed_config + ) { return false; } const jobConfiguration = jobSummary.fullJob.custom_settings.logs_source_config; + const datafeedRuntimeMappings = jobSummary.fullJob.datafeed_config.runtime_mappings; return !( jobConfiguration && @@ -44,7 +50,8 @@ export const isJobConfigurationOutdated = ( new Set(jobConfiguration.indexPattern.split(',')), new Set(currentSourceConfiguration.indices) ) && - jobConfiguration.timestampField === currentSourceConfiguration.timestampField + jobConfiguration.timestampField === currentSourceConfiguration.timestampField && + equal(datafeedRuntimeMappings, currentSourceConfiguration.runtimeMappings) ); }; diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts index e79b75fecc817..36371b080ee45 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_module_types.ts @@ -6,6 +6,7 @@ */ import type { HttpHandler } from 'src/core/public'; +import { estypes } from '@elastic/elasticsearch'; import { ValidateLogEntryDatasetsResponsePayload, ValidationIndicesResponsePayload, @@ -46,6 +47,7 @@ export interface ModuleDescriptor { validateSetupIndices: ( indices: string[], timestampField: string, + runtimeMappings: estypes.RuntimeFields, fetch: HttpHandler ) => Promise; validateSetupDatasets: ( @@ -53,6 +55,7 @@ export interface ModuleDescriptor { timestampField: string, startTime: number, endTime: number, + runtimeMappings: estypes.RuntimeFields, fetch: HttpHandler ) => Promise; } @@ -62,4 +65,5 @@ export interface ModuleSourceConfiguration { sourceId: string; spaceId: string; timestampField: string; + runtimeMappings: estypes.RuntimeFields; } diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts index 825ac5be747fe..fad6fd56f6251 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/log_analysis_setup_state.ts @@ -162,6 +162,7 @@ export const useAnalysisSetupState = ({ return await validateSetupIndices( sourceConfiguration.indices, sourceConfiguration.timestampField, + sourceConfiguration.runtimeMappings, services.http.fetch ); }, @@ -188,6 +189,7 @@ export const useAnalysisSetupState = ({ sourceConfiguration.timestampField, startTime ?? 0, endTime ?? Date.now(), + sourceConfiguration.runtimeMappings, services.http.fetch ); }, diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts index bc79dbdf0912a..981b7b496b435 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/module_descriptor.ts @@ -5,6 +5,7 @@ * 2.0. */ +import type { estypes } from '@elastic/elasticsearch'; import { i18n } from '@kbn/i18n'; import type { HttpHandler } from 'src/core/public'; import { @@ -62,7 +63,7 @@ const setUpModule = async ( start: number | undefined, end: number | undefined, datasetFilter: DatasetFilter, - { spaceId, sourceId, indices, timestampField }: ModuleSourceConfiguration, + { spaceId, sourceId, indices, timestampField, runtimeMappings }: ModuleSourceConfiguration, fetch: HttpHandler ) => { const indexNamePattern = indices.join(','); @@ -85,6 +86,12 @@ const setUpModule = async ( }, }, ]; + const datafeedOverrides = [ + { + job_id: 'log-entry-categories-count' as const, + runtime_mappings: runtimeMappings, + }, + ]; const query = { bool: { filter: [ @@ -115,6 +122,7 @@ const setUpModule = async ( sourceId, indexPattern: indexNamePattern, jobOverrides, + datafeedOverrides, query, }, fetch @@ -128,6 +136,7 @@ const cleanUpModule = async (spaceId: string, sourceId: string, fetch: HttpHandl const validateSetupIndices = async ( indices: string[], timestampField: string, + runtimeMappings: estypes.RuntimeFields, fetch: HttpHandler ) => { return await callValidateIndicesAPI( @@ -147,6 +156,7 @@ const validateSetupIndices = async ( validTypes: ['text'], }, ], + runtimeMappings, }, fetch ); @@ -157,9 +167,13 @@ const validateSetupDatasets = async ( timestampField: string, startTime: number, endTime: number, + runtimeMappings: estypes.RuntimeFields, fetch: HttpHandler ) => { - return await callValidateDatasetsAPI({ indices, timestampField, startTime, endTime }, fetch); + return await callValidateDatasetsAPI( + { indices, timestampField, startTime, endTime, runtimeMappings }, + fetch + ); }; export const logEntryCategoriesModule: ModuleDescriptor = { diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx index eaa82dd18c984..a2ad5cd4f56c4 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx @@ -6,6 +6,7 @@ */ import createContainer from 'constate'; +import { estypes } from '@elastic/elasticsearch'; import { useMemo } from 'react'; import { useLogAnalysisModule } from '../../log_analysis_module'; import { useLogAnalysisModuleConfiguration } from '../../log_analysis_module_configuration'; @@ -19,11 +20,13 @@ export const useLogEntryCategoriesModule = ({ sourceId, spaceId, timestampField, + runtimeMappings, }: { indexPattern: string; sourceId: string; spaceId: string; timestampField: string; + runtimeMappings: estypes.RuntimeFields; }) => { const sourceConfiguration: ModuleSourceConfiguration = useMemo( () => ({ @@ -31,8 +34,9 @@ export const useLogEntryCategoriesModule = ({ sourceId, spaceId, timestampField, + runtimeMappings, }), - [indexPattern, sourceId, spaceId, timestampField] + [indexPattern, sourceId, spaceId, timestampField, runtimeMappings] ); const logAnalysisModule = useLogAnalysisModule({ diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts index f7c866c8e4e67..345f221f11c1f 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/module_descriptor.ts @@ -6,6 +6,7 @@ */ import { i18n } from '@kbn/i18n'; +import type { estypes } from '@elastic/elasticsearch'; import type { HttpHandler } from 'src/core/public'; import { bucketSpan, @@ -61,7 +62,7 @@ const setUpModule = async ( start: number | undefined, end: number | undefined, datasetFilter: DatasetFilter, - { spaceId, sourceId, indices, timestampField }: ModuleSourceConfiguration, + { spaceId, sourceId, indices, timestampField, runtimeMappings }: ModuleSourceConfiguration, fetch: HttpHandler ) => { const indexNamePattern = indices.join(','); @@ -83,6 +84,12 @@ const setUpModule = async ( }, }, ]; + const datafeedOverrides = [ + { + job_id: 'log-entry-rate' as const, + runtime_mappings: runtimeMappings, + }, + ]; const query = datasetFilter.type === 'includeSome' ? { @@ -107,6 +114,7 @@ const setUpModule = async ( sourceId, indexPattern: indexNamePattern, jobOverrides, + datafeedOverrides, query, }, fetch @@ -120,6 +128,7 @@ const cleanUpModule = async (spaceId: string, sourceId: string, fetch: HttpHandl const validateSetupIndices = async ( indices: string[], timestampField: string, + runtimeMappings: estypes.RuntimeFields, fetch: HttpHandler ) => { return await callValidateIndicesAPI( @@ -135,6 +144,7 @@ const validateSetupIndices = async ( validTypes: ['keyword'], }, ], + runtimeMappings, }, fetch ); @@ -145,9 +155,13 @@ const validateSetupDatasets = async ( timestampField: string, startTime: number, endTime: number, + runtimeMappings: estypes.RuntimeFields, fetch: HttpHandler ) => { - return await callValidateDatasetsAPI({ indices, timestampField, startTime, endTime }, fetch); + return await callValidateDatasetsAPI( + { indices, timestampField, startTime, endTime, runtimeMappings }, + fetch + ); }; export const logEntryRateModule: ModuleDescriptor = { diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx index 02eeb66f44590..b451cad1c8753 100644 --- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx +++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx @@ -5,6 +5,7 @@ * 2.0. */ +import { estypes } from '@elastic/elasticsearch'; import createContainer from 'constate'; import { useMemo } from 'react'; import { ModuleSourceConfiguration } from '../../log_analysis_module_types'; @@ -18,11 +19,13 @@ export const useLogEntryRateModule = ({ sourceId, spaceId, timestampField, + runtimeMappings, }: { indexPattern: string; sourceId: string; spaceId: string; timestampField: string; + runtimeMappings: estypes.RuntimeFields; }) => { const sourceConfiguration: ModuleSourceConfiguration = useMemo( () => ({ @@ -30,8 +33,9 @@ export const useLogEntryRateModule = ({ sourceId, spaceId, timestampField, + runtimeMappings, }), - [indexPattern, sourceId, spaceId, timestampField] + [indexPattern, sourceId, spaceId, timestampField, runtimeMappings] ); const logAnalysisModule = useLogAnalysisModule({ diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx index 68b5a133550b0..ab409d661fe0a 100644 --- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx +++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx @@ -28,6 +28,7 @@ export const LogEntryCategoriesPageProviders: React.FunctionComponent = ({ child sourceId={sourceId} spaceId={space.id} timestampField={resolvedSourceConfiguration.timestampField} + runtimeMappings={resolvedSourceConfiguration.runtimeMappings} > {children} diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx index cb52dfd713578..628e2fb74d830 100644 --- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx +++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx @@ -31,12 +31,14 @@ export const LogEntryRatePageProviders: React.FunctionComponent = ({ children }) sourceId={sourceId} spaceId={space.id} timestampField={resolvedSourceConfiguration.timestampField ?? ''} + runtimeMappings={resolvedSourceConfiguration.runtimeMappings} > {children} diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts index ea57885bcdfbb..387143ef9f9c4 100644 --- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts @@ -5,6 +5,7 @@ * 2.0. */ +import type { estypes } from '@elastic/elasticsearch'; import { JsonObject } from '../../../../../../../src/plugins/kibana_utils/common'; import type { InfraPluginRequestHandlerContext } from '../../../types'; @@ -38,7 +39,6 @@ import { CompositeDatasetKey, createLogEntryDatasetsQuery, } from './queries/log_entry_datasets'; - export interface LogEntriesParams { startTimestamp: number; endTimestamp: number; @@ -276,7 +276,8 @@ export class InfraLogEntriesDomain { timestampField: string, indexName: string, startTime: number, - endTime: number + endTime: number, + runtimeMappings: estypes.RuntimeFields ) { let datasetBuckets: LogEntryDatasetBucket[] = []; let afterLatestBatchKey: CompositeDatasetKey | undefined; @@ -290,6 +291,7 @@ export class InfraLogEntriesDomain { timestampField, startTime, endTime, + runtimeMappings, COMPOSITE_AGGREGATION_BATCH_SIZE, afterLatestBatchKey ) diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts index 172c30780202c..18e04aaf063d4 100644 --- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts @@ -6,6 +6,7 @@ */ import * as rt from 'io-ts'; +import { estypes } from '@elastic/elasticsearch'; import { commonSearchSuccessResponseFieldsRT } from '../../../../utils/elasticsearch_runtime_types'; @@ -14,6 +15,7 @@ export const createLogEntryDatasetsQuery = ( timestampField: string, startTime: number, endTime: number, + runtimeMappings: estypes.RuntimeFields, size: number, afterKey?: CompositeDatasetKey ) => ({ @@ -38,6 +40,7 @@ export const createLogEntryDatasetsQuery = ( ], }, }, + runtime_mappings: runtimeMappings, aggs: { dataset_buckets: { composite: { diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts index f5465a967f2a5..716ab400c0123 100644 --- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts +++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_anomalies.ts @@ -5,6 +5,7 @@ * 2.0. */ +import type { estypes } from '@elastic/elasticsearch'; import type { InfraPluginRequestHandlerContext, InfraRequestHandlerContext } from '../../types'; import { TracingSpan, startTracingSpan } from '../../../common/performance_tracing'; import { fetchMlJob, getLogEntryDatasets } from './common'; @@ -18,6 +19,7 @@ import { Pagination, isCategoryAnomaly, } from '../../../common/log_analysis'; +import type { ResolvedLogSourceConfiguration } from '../../../common/log_sources'; import type { MlSystem, MlAnomalyDetectors } from '../../types'; import { createLogEntryAnomaliesQuery, logEntryAnomaliesResponseRT } from './queries'; import { @@ -31,7 +33,6 @@ import { createLogEntryExamplesQuery, logEntryExamplesResponseRT, } from './queries/log_entry_examples'; -import { InfraSource } from '../sources'; import { KibanaFramework } from '../adapters/framework/kibana_framework_adapter'; import { fetchLogEntryCategories } from './log_entry_categories_analysis'; @@ -326,7 +327,7 @@ export async function getLogEntryExamples( endTime: number, dataset: string, exampleCount: number, - sourceConfiguration: InfraSource, + resolvedSourceConfiguration: ResolvedLogSourceConfiguration, callWithRequest: KibanaFramework['callWithRequest'], categoryId?: string ) { @@ -346,7 +347,7 @@ export async function getLogEntryExamples( const customSettings = decodeOrThrow(jobCustomSettingsRT)(mlJob.custom_settings); const indices = customSettings?.logs_source_config?.indexPattern; const timestampField = customSettings?.logs_source_config?.timestampField; - const tiebreakerField = sourceConfiguration.configuration.fields.tiebreaker; + const { tiebreakerField, runtimeMappings } = resolvedSourceConfiguration; if (indices == null || timestampField == null) { throw new InsufficientLogAnalysisMlJobConfigurationError( @@ -361,6 +362,7 @@ export async function getLogEntryExamples( context, sourceId, indices, + runtimeMappings, timestampField, tiebreakerField, startTime, @@ -385,6 +387,7 @@ export async function fetchLogEntryExamples( context: InfraPluginRequestHandlerContext & { infra: Required }, sourceId: string, indices: string, + runtimeMappings: estypes.RuntimeFields, timestampField: string, tiebreakerField: string, startTime: number, @@ -431,6 +434,7 @@ export async function fetchLogEntryExamples( 'search', createLogEntryExamplesQuery( indices, + runtimeMappings, timestampField, tiebreakerField, startTime, diff --git a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts index 80061dac0a144..aea946ae87e74 100644 --- a/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts +++ b/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts @@ -5,6 +5,7 @@ * 2.0. */ +import type { estypes } from '@elastic/elasticsearch'; import type { ILegacyScopedClusterClient } from 'src/core/server'; import { compareDatasetsByMaximumAnomalyScore, @@ -14,6 +15,7 @@ import { CategoriesSort, } from '../../../common/log_analysis'; import { LogEntryContext } from '../../../common/log_entry'; +import type { ResolvedLogSourceConfiguration } from '../../../common/log_sources'; import { startTracingSpan } from '../../../common/performance_tracing'; import { decodeOrThrow } from '../../../common/runtime_types'; import type { MlAnomalyDetectors, MlSystem } from '../../types'; @@ -36,7 +38,6 @@ import { createTopLogEntryCategoriesQuery, topLogEntryCategoriesResponseRT, } from './queries/top_log_entry_categories'; -import { InfraSource } from '../sources'; import { fetchMlJob, getLogEntryDatasets } from './common'; export async function getTopLogEntryCategories( @@ -147,7 +148,7 @@ export async function getLogEntryCategoryExamples( endTime: number, categoryId: number, exampleCount: number, - sourceConfiguration: InfraSource + resolvedSourceConfiguration: ResolvedLogSourceConfiguration ) { const finalizeLogEntryCategoryExamplesSpan = startTracingSpan('get category example log entries'); @@ -165,7 +166,7 @@ export async function getLogEntryCategoryExamples( const customSettings = decodeOrThrow(jobCustomSettingsRT)(mlJob.custom_settings); const indices = customSettings?.logs_source_config?.indexPattern; const timestampField = customSettings?.logs_source_config?.timestampField; - const tiebreakerField = sourceConfiguration.configuration.fields.tiebreaker; + const { tiebreakerField, runtimeMappings } = resolvedSourceConfiguration; if (indices == null || timestampField == null) { throw new InsufficientLogAnalysisMlJobConfigurationError( @@ -189,6 +190,7 @@ export async function getLogEntryCategoryExamples( } = await fetchLogEntryCategoryExamples( context, indices, + runtimeMappings, timestampField, tiebreakerField, startTime, @@ -402,6 +404,7 @@ async function fetchTopLogEntryCategoryHistograms( async function fetchLogEntryCategoryExamples( requestContext: { core: { elasticsearch: { legacy: { client: ILegacyScopedClusterClient } } } }, indices: string, + runtimeMappings: estypes.RuntimeFields, timestampField: string, tiebreakerField: string, startTime: number, @@ -418,6 +421,7 @@ async function fetchLogEntryCategoryExamples( 'search', createLogEntryCategoryExamplesQuery( indices, + runtimeMappings, timestampField, tiebreakerField, startTime, diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts index cbaad4be7ee18..f06dcd43a9156 100644 --- a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts +++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts @@ -5,20 +5,21 @@ * 2.0. */ +import type { estypes } from '@elastic/elasticsearch'; import * as rt from 'io-ts'; - import { commonSearchSuccessResponseFieldsRT } from '../../../utils/elasticsearch_runtime_types'; import { defaultRequestParameters } from './common'; export const createLogEntryCategoryExamplesQuery = ( indices: string, + runtimeMappings: estypes.RuntimeFields, timestampField: string, tiebreakerField: string, startTime: number, endTime: number, categoryQuery: string, exampleCount: number -) => ({ +): estypes.SearchRequest => ({ ...defaultRequestParameters, body: { query: { @@ -43,6 +44,7 @@ export const createLogEntryCategoryExamplesQuery = ( ], }, }, + runtime_mappings: runtimeMappings, sort: [{ [timestampField]: 'asc' }, { [tiebreakerField]: 'asc' }], _source: false, fields: ['event.dataset', 'message', 'container.id', 'host.name', 'log.file.path'], diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts index fca9c470f510f..1e8cbe247dd50 100644 --- a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts +++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts @@ -5,14 +5,15 @@ * 2.0. */ +import type { estypes } from '@elastic/elasticsearch'; import * as rt from 'io-ts'; - +import { partitionField } from '../../../../common/log_analysis'; import { commonSearchSuccessResponseFieldsRT } from '../../../utils/elasticsearch_runtime_types'; import { defaultRequestParameters } from './common'; -import { partitionField } from '../../../../common/log_analysis'; export const createLogEntryExamplesQuery = ( indices: string, + runtimeMappings: estypes.RuntimeFields, timestampField: string, tiebreakerField: string, startTime: number, @@ -20,7 +21,7 @@ export const createLogEntryExamplesQuery = ( dataset: string, exampleCount: number, categoryQuery?: string -) => ({ +): estypes.SearchRequest => ({ ...defaultRequestParameters, body: { query: { @@ -61,7 +62,7 @@ export const createLogEntryExamplesQuery = ( match: { message: { query: categoryQuery, - operator: 'AND', + operator: 'AND' as const, }, }, }, @@ -70,6 +71,7 @@ export const createLogEntryExamplesQuery = ( ], }, }, + runtime_mappings: runtimeMappings, sort: [{ [timestampField]: 'asc' }, { [tiebreakerField]: 'asc' }], _source: false, fields: ['event.dataset', 'message'], diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts index d53ef3f3acdad..71558f97cf2bc 100644 --- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts +++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_category_examples.ts @@ -16,6 +16,7 @@ import type { InfraBackendLibs } from '../../../lib/infra_types'; import { getLogEntryCategoryExamples } from '../../../lib/log_analysis'; import { assertHasInfraMlPlugins } from '../../../utils/request_context'; import { isMlPrivilegesError } from '../../../lib/log_analysis/errors'; +import { resolveLogSourceConfiguration } from '../../../../common/log_sources'; export const initGetLogEntryCategoryExamplesRoute = ({ framework, sources }: InfraBackendLibs) => { framework.registerRoute( @@ -40,6 +41,10 @@ export const initGetLogEntryCategoryExamplesRoute = ({ framework, sources }: Inf requestContext.core.savedObjects.client, sourceId ); + const resolvedSourceConfiguration = await resolveLogSourceConfiguration( + sourceConfiguration.configuration, + await framework.getIndexPatternsServiceWithRequestContext(requestContext) + ); try { assertHasInfraMlPlugins(requestContext); @@ -51,7 +56,7 @@ export const initGetLogEntryCategoryExamplesRoute = ({ framework, sources }: Inf endTime, categoryId, exampleCount, - sourceConfiguration + resolvedSourceConfiguration ); return response.ok({ diff --git a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts index f4d50f242686e..83e6934d1b7a4 100644 --- a/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts +++ b/x-pack/plugins/infra/server/routes/log_analysis/results/log_entry_examples.ts @@ -16,6 +16,7 @@ import { LOG_ANALYSIS_GET_LOG_ENTRY_RATE_EXAMPLES_PATH, } from '../../../../common/http_api/log_analysis'; import { isMlPrivilegesError } from '../../../lib/log_analysis/errors'; +import { resolveLogSourceConfiguration } from '../../../../common/log_sources'; export const initGetLogEntryExamplesRoute = ({ framework, sources }: InfraBackendLibs) => { framework.registerRoute( @@ -41,6 +42,10 @@ export const initGetLogEntryExamplesRoute = ({ framework, sources }: InfraBacken requestContext.core.savedObjects.client, sourceId ); + const resolvedSourceConfiguration = await resolveLogSourceConfiguration( + sourceConfiguration.configuration, + await framework.getIndexPatternsServiceWithRequestContext(requestContext) + ); try { assertHasInfraMlPlugins(requestContext); @@ -52,7 +57,7 @@ export const initGetLogEntryExamplesRoute = ({ framework, sources }: InfraBacken endTime, dataset, exampleCount, - sourceConfiguration, + resolvedSourceConfiguration, framework.callWithRequest, categoryId ); diff --git a/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts b/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts index 61a426ab40f0a..950ecc98619ee 100644 --- a/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts +++ b/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts @@ -6,6 +6,7 @@ */ import Boom from '@hapi/boom'; +import type { estypes } from '@elastic/elasticsearch'; import { InfraBackendLibs } from '../../../lib/infra_types'; import { @@ -31,7 +32,7 @@ export const initValidateLogAnalysisDatasetsRoute = ({ framework.router.handleLegacyErrors(async (requestContext, request, response) => { try { const { - data: { indices, timestampField, startTime, endTime }, + data: { indices, timestampField, startTime, endTime, runtimeMappings }, } = request.body; const datasets = await Promise.all( @@ -41,7 +42,8 @@ export const initValidateLogAnalysisDatasetsRoute = ({ timestampField, indexName, startTime, - endTime + endTime, + runtimeMappings as estypes.RuntimeFields ); return { diff --git a/x-pack/plugins/infra/server/routes/log_analysis/validation/indices.ts b/x-pack/plugins/infra/server/routes/log_analysis/validation/indices.ts index 463ac77891263..4fd7096db06eb 100644 --- a/x-pack/plugins/infra/server/routes/log_analysis/validation/indices.ts +++ b/x-pack/plugins/infra/server/routes/log_analysis/validation/indices.ts @@ -36,7 +36,7 @@ export const initValidateLogAnalysisIndicesRoute = ({ framework }: InfraBackendL fold(throwErrors(Boom.badRequest), identity) ); - const { fields, indices } = payload.data; + const { fields, indices, runtimeMappings } = payload.data; const errors: ValidationIndicesError[] = []; // Query each pattern individually, to map correctly the errors @@ -47,6 +47,9 @@ export const initValidateLogAnalysisIndicesRoute = ({ framework }: InfraBackendL fields: fields.map((field) => field.name), ignore_unavailable: true, index, + body: { + runtime_mappings: runtimeMappings, + }, }); if (fieldCaps.indices.length === 0) { diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts index 7152d76afbdbe..44e5f9d445c3d 100644 --- a/x-pack/plugins/maps/common/constants.ts +++ b/x-pack/plugins/maps/common/constants.ts @@ -82,7 +82,7 @@ export enum SOURCE_TYPES { ES_SEARCH = 'ES_SEARCH', ES_PEW_PEW = 'ES_PEW_PEW', ES_TERM_SOURCE = 'ES_TERM_SOURCE', - EMS_XYZ = 'EMS_XYZ', // identifies a custom TMS source. Name is a little unfortunate. + EMS_XYZ = 'EMS_XYZ', // identifies a custom TMS source. EMS-prefix in the name is a little unfortunate :( WMS = 'WMS', KIBANA_TILEMAP = 'KIBANA_TILEMAP', REGIONMAP_FILE = 'REGIONMAP_FILE', diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json index ffedf855c6d9c..aa643b431721c 100644 --- a/x-pack/plugins/maps/kibana.json +++ b/x-pack/plugins/maps/kibana.json @@ -36,6 +36,7 @@ "requiredBundles": [ "kibanaReact", "kibanaUtils", - "home" + "home", + "mapsEms" ] } diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx index a73449b0fa718..de889608300bd 100644 --- a/x-pack/plugins/maps/public/classes/layers/layer.tsx +++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx @@ -10,7 +10,7 @@ import { Map as MbMap } from 'mapbox-gl'; import { Query } from 'src/plugins/data/public'; import _ from 'lodash'; -import React, { ReactElement } from 'react'; +import React, { ReactElement, ReactNode } from 'react'; import { EuiIcon } from '@elastic/eui'; import uuid from 'uuid/v4'; import { FeatureCollection } from 'geojson'; @@ -100,7 +100,7 @@ export interface ILayer { } export type CustomIconAndTooltipContent = { - icon: ReactElement | null; + icon: ReactNode; tooltipContent?: string | null; areResultsTrimmed?: boolean; }; diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/tooltip_header.test.js.snap b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/footer.test.js.snap similarity index 63% rename from x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/tooltip_header.test.js.snap rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/footer.test.js.snap index b5fe334f8415e..6840456741e03 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/tooltip_header.test.js.snap +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/footer.test.js.snap @@ -1,7 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`TooltipHeader multiple features, multiple layers: locked should show pagination controls, features count, layer select, and close button 1`] = ` +exports[`Footer multiple features, multiple layers: locked should show pagination controls, features count, and layer select 1`] = ` + - - - - `; -exports[`TooltipHeader multiple features, multiple layers: mouseover (unlocked) should only show features count 1`] = ` +exports[`Footer multiple features, multiple layers: mouseover (unlocked) should only show features count 1`] = ` + - `; -exports[`TooltipHeader multiple features, single layer: locked should show pagination controls, features count, and close button 1`] = ` +exports[`Footer multiple features, single layer: locked should show pagination controls and features count 1`] = ` + - - - - `; -exports[`TooltipHeader multiple features, single layer: mouseover (unlocked) should only show features count 1`] = ` +exports[`Footer multiple features, single layer: mouseover (unlocked) should only show features count 1`] = ` + - - -`; - -exports[`TooltipHeader single feature: locked should show close button when locked 1`] = ` - - - - - - - - `; -exports[`TooltipHeader single feature: mouseover (unlocked) should not render header 1`] = `""`; +exports[`Footer single feature: mouseover (unlocked) should not render header 1`] = `""`; diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/header.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/header.test.tsx.snap new file mode 100644 index 0000000000000..db4a2640357bf --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/__snapshots__/header.test.tsx.snap @@ -0,0 +1,111 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`isLocked 1`] = ` + + + + + mockIcon + + + + +

+ myLayerName +

+ + + + + + + + +`; + +exports[`render 1`] = ` + + + + + mockIcon + + + + +

+ myLayerName +

+ + + + + +`; + +exports[`should only show close button when layer name is not yet loaded 1`] = ` + + + + + + + + + +`; diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/_index.scss b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/_index.scss index abd747c8fa47a..92df0ffbaad92 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/_index.scss +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/_index.scss @@ -30,3 +30,9 @@ justify-content: flex-end; } } + +.mapFeatureTooltip_layerIcon { + img { + margin-bottom: 0; + } +} diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/features_tooltip.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/features_tooltip.js index 48534f8bcd3ac..be8e960471efa 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/features_tooltip.js +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/features_tooltip.js @@ -10,7 +10,8 @@ import { EuiIcon, EuiLink } from '@elastic/eui'; import { FeatureProperties } from './feature_properties'; import { GEO_JSON_TYPE, ES_GEO_FIELD_TYPE } from '../../../../common/constants'; import { FeatureGeometryFilterForm } from './feature_geometry_filter_form'; -import { TooltipHeader } from './tooltip_header'; +import { Footer } from './footer'; +import { Header } from './header'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -167,12 +168,12 @@ export class FeaturesTooltip extends Component { return ( - {this._renderActions(geoFields)} +
); } diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/footer.js similarity index 84% rename from x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.js rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/footer.js index f9a6ecfc06cd4..559e3fb18c182 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.js +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/footer.js @@ -7,7 +7,6 @@ import React, { Component, Fragment } from 'react'; import { - EuiButtonIcon, EuiPagination, EuiSelect, EuiHorizontalRule, @@ -22,7 +21,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; const ALL_LAYERS = '_ALL_LAYERS_'; const DEFAULT_PAGE_NUMBER = 0; -export class TooltipHeader extends Component { +export class Footer extends Component { state = { filteredFeatures: this.props.features, pageNumber: DEFAULT_PAGE_NUMBER, @@ -121,11 +120,11 @@ export class TooltipHeader extends Component { const { filteredFeatures, pageNumber, selectedLayerId, layerOptions } = this.state; const isLayerSelectVisible = isLocked && layerOptions.length > 1; - const headerItems = []; + const items = []; // Pagination controls if (isLocked && filteredFeatures.length > 1) { - headerItems.push( + items.push( 1) { - headerItems.push( + items.push( ); - } - - headerItems.push( - - - - ); - } - - if (headerItems.length === 0) { - return null; - } - - return ( + return items.length ? ( + + - {headerItems} + {items} - - - ); + ) : null; } } diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.test.js b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/footer.test.js similarity index 72% rename from x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.test.js rename to x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/footer.test.js index 8ab8fdbc9eabf..e794588cff435 100644 --- a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/tooltip_header.test.js +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/footer.test.js @@ -7,7 +7,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { TooltipHeader } from './tooltip_header'; +import { Footer } from './footer'; class MockLayer { constructor(id) { @@ -22,7 +22,6 @@ class MockLayer { } const defaultProps = { - onClose: () => {}, isLocked: false, findLayerById: (id) => { return new MockLayer(id); @@ -30,7 +29,7 @@ const defaultProps = { setCurrentFeature: () => {}, }; -describe('TooltipHeader', () => { +describe('Footer', () => { describe('single feature:', () => { const SINGLE_FEATURE = [ { @@ -40,21 +39,7 @@ describe('TooltipHeader', () => { ]; describe('mouseover (unlocked)', () => { test('should not render header', async () => { - const component = shallow(); - - // Ensure all promises resolve - await new Promise((resolve) => process.nextTick(resolve)); - // Ensure the state changes are reflected - component.update(); - - expect(component).toMatchSnapshot(); - }); - }); - describe('locked', () => { - test('should show close button when locked', async () => { - const component = shallow( - - ); + const component = shallow(
); // Ensure all promises resolve await new Promise((resolve) => process.nextTick(resolve)); @@ -80,7 +65,7 @@ describe('TooltipHeader', () => { describe('mouseover (unlocked)', () => { test('should only show features count', async () => { const component = shallow( - +
); // Ensure all promises resolve @@ -92,9 +77,9 @@ describe('TooltipHeader', () => { }); }); describe('locked', () => { - test('should show pagination controls, features count, and close button', async () => { + test('should show pagination controls and features count', async () => { const component = shallow( - +
); // Ensure all promises resolve @@ -125,7 +110,7 @@ describe('TooltipHeader', () => { describe('mouseover (unlocked)', () => { test('should only show features count', async () => { const component = shallow( - +
); // Ensure all promises resolve @@ -137,9 +122,9 @@ describe('TooltipHeader', () => { }); }); describe('locked', () => { - test('should show pagination controls, features count, layer select, and close button', async () => { + test('should show pagination controls, features count, and layer select', async () => { const component = shallow( - +
); // Ensure all promises resolve diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/header.test.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/header.test.tsx new file mode 100644 index 0000000000000..a52ee48d38b97 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/header.test.tsx @@ -0,0 +1,61 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { Header } from './header'; +import { ILayer } from '../../../classes/layers/layer'; + +const layerMock = ({ + getDisplayName: async () => { + return 'myLayerName'; + }, + getCustomIconAndTooltipContent: () => { + return { + icon: mockIcon, + }; + }, +} as unknown) as ILayer; + +const defaultProps = { + findLayerById: (layerId: string) => { + return layerMock; + }, + isLocked: false, + layerId: 'myLayerId', + onClose: () => { + return; + }, +}; + +test('render', async () => { + const component = shallow(
); + + // Ensure all promises resolve + await new Promise((resolve) => process.nextTick(resolve)); + // Ensure the state changes are reflected + component.update(); + + expect(component).toMatchSnapshot(); +}); + +test('isLocked', async () => { + const component = shallow(
); + + // Ensure all promises resolve + await new Promise((resolve) => process.nextTick(resolve)); + // Ensure the state changes are reflected + component.update(); + + expect(component).toMatchSnapshot(); +}); + +// Test is sync to show render before async state is set. +test('should only show close button when layer name is not yet loaded', () => { + const component = shallow(
); + expect(component).toMatchSnapshot(); +}); diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/header.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/header.tsx new file mode 100644 index 0000000000000..4fe9c3b4e8550 --- /dev/null +++ b/x-pack/plugins/maps/public/connected_components/mb_map/features_tooltip/header.tsx @@ -0,0 +1,110 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { Component, Fragment, ReactNode } from 'react'; +import { i18n } from '@kbn/i18n'; +import { + EuiButtonIcon, + EuiHorizontalRule, + EuiFlexGroup, + EuiFlexItem, + EuiTextColor, +} from '@elastic/eui'; +import { ILayer } from '../../../classes/layers/layer'; + +interface Props { + findLayerById: (layerId: string) => ILayer | undefined; + isLocked: boolean; + layerId: string; + onClose: () => void; +} + +interface State { + layerIcon: ReactNode; + layerName: string | null; +} + +export class Header extends Component { + private _isMounted = false; + state: State = { + layerIcon: null, + layerName: null, + }; + + componentDidMount() { + this._isMounted = true; + this._loadLayerState(); + } + + componentWillUnmount() { + this._isMounted = false; + } + + async _loadLayerState() { + const layer = this.props.findLayerById(this.props.layerId); + if (!layer) { + return; + } + const layerName = await layer.getDisplayName(); + const customIconAndTooltipContent = layer.getCustomIconAndTooltipContent(); + if (this._isMounted) { + this.setState({ layerIcon: customIconAndTooltipContent.icon, layerName }); + } + } + + render() { + const items: ReactNode[] = []; + if (this.state.layerIcon) { + items.push( + + {this.state.layerIcon} + + ); + } + + if (this.state.layerName) { + items.push( + + +

+ {this.state.layerName} +

+ + + ); + } + + if (this.props.isLocked) { + // When close button is the only item, add empty FlexItem to push close button to right + if (items.length === 0) { + items.push(); + } + + items.push( + + + + ); + } + + return items.length ? ( + + + {items} + + + + ) : null; + } +} diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_button/toc_entry_button.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_button/toc_entry_button.tsx index 385fac4b2021b..058a3b82224b9 100644 --- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_button/toc_entry_button.tsx +++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_button/toc_entry_button.tsx @@ -5,19 +5,19 @@ * 2.0. */ -import React, { Component, Fragment, ReactElement } from 'react'; +import React, { Component, Fragment, ReactNode } from 'react'; import { EuiButtonEmpty, EuiIcon, EuiToolTip, EuiLoadingSpinner } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { ILayer } from '../../../../../../classes/layers/layer'; interface Footnote { - icon: ReactElement; + icon: ReactNode; message?: string | null; } interface IconAndTooltipContent { - icon?: ReactElement | null; + icon?: ReactNode; tooltipContent?: string | null; footnotes: Footnote[]; } diff --git a/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts b/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts index 8ad12b0ba8307..ded96266ee75f 100644 --- a/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts +++ b/x-pack/plugins/maps/server/maps_telemetry/collectors/register.ts @@ -31,6 +31,360 @@ export function registerMapsUsageCollector( geoShapeAggLayersCount: { type: 'long' }, mapsTotalCount: { type: 'long' }, timeCaptured: { type: 'date' }, + layerTypes: { + ems_basemap: { + min: { type: 'long', _meta: { description: 'min number of ems basemap layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of ems basemap layers per map' } }, + avg: { + type: 'float', + _meta: { description: 'avg number of ems basemap layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of ems basemap layers in cluster' }, + }, + }, + ems_region: { + min: { type: 'long', _meta: { description: 'min number of ems file layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of ems file layers per map' } }, + avg: { type: 'float', _meta: { description: 'avg number of ems file layers per map' } }, + total: { + type: 'long', + _meta: { description: 'total number of file layers in cluster' }, + }, + }, + es_agg_clusters: { + min: { type: 'long', _meta: { description: 'min number of es cluster layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of es cluster layers per map' } }, + avg: { type: 'float', _meta: { description: 'avg number of es cluster layers per map' } }, + total: { + type: 'long', + _meta: { description: 'total number of es cluster layers in cluster' }, + }, + }, + es_agg_grids: { + min: { type: 'long', _meta: { description: 'min number of es grid layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of es grid layers per map' } }, + avg: { type: 'float', _meta: { description: 'avg number of es grid layers per map' } }, + total: { + type: 'long', + _meta: { description: 'total number of es grid layers in cluster' }, + }, + }, + es_agg_heatmap: { + min: { type: 'long', _meta: { description: 'min number of es heatmap layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of es heatmap layers per map' } }, + avg: { type: 'float', _meta: { description: 'avg number of es heatmap layers per map' } }, + total: { + type: 'long', + _meta: { description: 'total number of es heatmap layers in cluster' }, + }, + }, + es_top_hits: { + min: { type: 'long', _meta: { description: 'min number of es top hits layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of es top hits layers per map' } }, + avg: { + type: 'float', + _meta: { description: 'avg number of es top hits layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of es top hits layers in cluster' }, + }, + }, + es_docs: { + min: { type: 'long', _meta: { description: 'min number of es document layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of es document layers per map' } }, + avg: { + type: 'float', + _meta: { description: 'avg number of es document layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of es document layers in cluster' }, + }, + }, + es_point_to_point: { + min: { + type: 'long', + _meta: { description: 'min number of es point-to-point layers per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of es point-to-point layers per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of es point-to-point layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of es point-to-point layers in cluster' }, + }, + }, + es_tracks: { + min: { type: 'long', _meta: { description: 'min number of es track layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of es track layers per map' } }, + avg: { + type: 'float', + _meta: { description: 'avg number of es track layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of es track layers in cluster' }, + }, + }, + kbn_region: { + min: { type: 'long', _meta: { description: 'min number of kbn region layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of kbn region layers per map' } }, + avg: { + type: 'float', + _meta: { description: 'avg number of kbn region layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of kbn region layers in cluster' }, + }, + }, + kbn_tms_raster: { + min: { type: 'long', _meta: { description: 'min number of kbn tms layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of kbn tms layers per map' } }, + avg: { + type: 'float', + _meta: { description: 'avg number of kbn tms layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of kbn tms layers in cluster' }, + }, + }, + ux_tms_mvt: { + min: { type: 'long', _meta: { description: 'min number of ux tms-mvt layers per map' } }, + max: { type: 'long', _meta: { description: 'max number of ux tms-mvt layers per map' } }, + avg: { + type: 'float', + _meta: { description: 'avg number of ux tms-mvt layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of ux tms-mvt layers in cluster' }, + }, + }, + ux_tms_raster: { + min: { + type: 'long', + _meta: { description: 'min number of ux tms-raster layers per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of ux tms-raster layers per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of ux tms-raster layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of ux-tms raster layers in cluster' }, + }, + }, + ux_wms: { + min: { + type: 'long', + _meta: { description: 'min number of ux wms layers per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of ux wms layers per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of ux wms layers per map' }, + }, + total: { + type: 'long', + _meta: { description: 'total number of ux wms layers in cluster' }, + }, + }, + }, + scalingOptions: { + limit: { + min: { + type: 'long', + _meta: { description: 'min number of es doc layers with limit scaling option per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of es doc layers with limit scaling option per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of es doc layers with limit scaling option per map' }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of es doc layers with limit scaling option in cluster', + }, + }, + }, + clusters: { + min: { + type: 'long', + _meta: { + description: 'min number of es doc layers with blended scaling option per map', + }, + }, + max: { + type: 'long', + _meta: { + description: 'max number of es doc layers with blended scaling option per map', + }, + }, + avg: { + type: 'float', + _meta: { + description: 'avg number of es doc layers with blended scaling option per map', + }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of es doc layers with blended scaling option in cluster', + }, + }, + }, + mvt: { + min: { + type: 'long', + _meta: { description: 'min number of es doc layers with mvt scaling option per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of es doc layers with mvt scaling option per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of es doc layers with mvt scaling option per map' }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of es doc layers with mvt scaling option in cluster', + }, + }, + }, + }, + joins: { + term: { + min: { + type: 'long', + _meta: { description: 'min number of layers with term joins per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of layers with term joins per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of layers with term joins per map' }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of layers with term joins in cluster', + }, + }, + }, + }, + basemaps: { + auto: { + min: { + type: 'long', + _meta: { description: 'min number of ems basemap layers with auto-style per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of ems basemap layers with auto-style per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of ems basemap layers with auto-style per map' }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of ems basemap layers with auto-style in cluster', + }, + }, + }, + dark: { + min: { + type: 'long', + _meta: { description: 'min number of ems basemap layers with dark-style per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of ems basemap layers with dark-style per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of ems basemap layers with dark-style per map' }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of ems basemap layers with dark-style in cluster', + }, + }, + }, + roadmap: { + min: { + type: 'long', + _meta: { description: 'min number of ems basemap layers with roadmap-style per map' }, + }, + max: { + type: 'long', + _meta: { description: 'max number of ems basemap layers with roadmap-style per map' }, + }, + avg: { + type: 'float', + _meta: { description: 'avg number of ems basemap layers with roadmap-style per map' }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of ems basemap layers with roadmap-style in cluster', + }, + }, + }, + roadmap_desaturated: { + min: { + type: 'long', + _meta: { + description: 'min number of ems basemap layers with desaturated-style per map', + }, + }, + max: { + type: 'long', + _meta: { + description: 'max number of ems basemap layers with desaturated-style per map', + }, + }, + avg: { + type: 'float', + _meta: { + description: 'avg number of ems basemap layers with desaturated-style per map', + }, + }, + total: { + type: 'long', + _meta: { + description: 'total number of ems basemap layers with desaturated-style in cluster', + }, + }, + }, + }, attributesPerMap: { dataSourcesCount: { min: { type: 'long' }, diff --git a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.test.js b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.test.js index 8725e672ec368..c9720063290b0 100644 --- a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.test.js +++ b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.test.js @@ -74,73 +74,136 @@ describe('buildMapsSavedObjectsTelemetry', () => { test('returns zeroed telemetry data when there are no saved objects', async () => { const result = buildMapsSavedObjectsTelemetry([]); - expect(result).toMatchObject({ - attributesPerMap: { - dataSourcesCount: { - avg: 0, - max: 0, - min: 0, - }, - emsVectorLayersCount: {}, - layerTypesCount: {}, - layersCount: { - avg: 0, - max: 0, - min: 0, - }, + expect(result.layerTypes).toEqual({}); + expect(result.scalingOptions).toEqual({}); + expect(result.joins).toEqual({}); + expect(result.basemaps).toEqual({}); + expect(result.attributesPerMap).toEqual({ + dataSourcesCount: { + avg: 0, + max: 0, + min: 0, + }, + emsVectorLayersCount: {}, + layerTypesCount: {}, + layersCount: { + avg: 0, + max: 0, + min: 0, }, - mapsTotalCount: 0, }); + expect(result.mapsTotalCount).toEqual(0); + expect(new Date(Date.parse(result.timeCaptured)).toISOString()).toEqual(result.timeCaptured); }); test('returns expected telemetry data from saved objects', async () => { const layerLists = getLayerLists(mapSavedObjects); const result = buildMapsSavedObjectsTelemetry(layerLists); - expect(result).toMatchObject({ - attributesPerMap: { - dataSourcesCount: { - avg: 2, - max: 3, + expect(result.layerTypes).toEqual({ + ems_basemap: { + avg: 0.6, + max: 1, + min: 1, + total: 3, + }, + ems_region: { + avg: 0.6, + max: 1, + min: 1, + total: 3, + }, + es_agg_clusters: { + avg: 0.4, + max: 1, + min: 1, + total: 2, + }, + es_agg_heatmap: { + avg: 0.2, + max: 1, + min: 1, + total: 1, + }, + es_docs: { + avg: 0.2, + max: 1, + min: 1, + total: 1, + }, + }); + expect(result.scalingOptions).toEqual({ + limit: { + avg: 0.2, + max: 1, + min: 1, + total: 1, + }, + }); + expect(result.joins).toEqual({ + term: { + avg: 0.2, + max: 1, + min: 1, + total: 1, + }, + }); + expect(result.basemaps).toEqual({ + roadmap: { + avg: 0.6, + max: 1, + min: 1, + total: 3, + }, + }); + expect(result.attributesPerMap).toEqual({ + dataSourcesCount: { + avg: 2, + max: 3, + min: 1, + }, + emsVectorLayersCount: { + canada_provinces: { + avg: 0.2, + max: 1, min: 1, }, - emsVectorLayersCount: { - canada_provinces: { - avg: 0.2, - max: 1, - min: 1, - }, - france_departments: { - avg: 0.2, - max: 1, - min: 1, - }, - italy_provinces: { - avg: 0.2, - max: 1, - min: 1, - }, + france_departments: { + avg: 0.2, + max: 1, + min: 1, }, - layerTypesCount: { - TILE: { - avg: 0.6, - max: 1, - min: 1, - }, - VECTOR: { - avg: 1.2, - max: 2, - min: 1, - }, + italy_provinces: { + avg: 0.2, + max: 1, + min: 1, }, - layersCount: { - avg: 2, - max: 3, + }, + layerTypesCount: { + HEATMAP: { + avg: 0.2, + max: 1, + min: 1, + }, + TILE: { + avg: 0.6, + max: 1, min: 1, }, + VECTOR: { + avg: 1.2, + max: 2, + min: 1, + }, + }, + layersCount: { + avg: 2, + max: 3, + min: 1, }, - mapsTotalCount: 5, }); + expect(result.mapsTotalCount).toEqual(5); + expect(new Date(Date.parse(result.timeCaptured)).toISOString()).toEqual(result.timeCaptured); }); test('returns expected telemetry data from index patterns', async () => { diff --git a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts index 569f7e17896f2..d7a4bcf33ea3b 100644 --- a/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts +++ b/x-pack/plugins/maps/server/maps_telemetry/maps_telemetry.ts @@ -25,6 +25,16 @@ import { MapSavedObject, MapSavedObjectAttributes } from '../../common/map_saved import { getIndexPatternsService, getInternalRepository } from '../kibana_server_services'; import { MapsConfigType } from '../../config'; import { injectReferences } from '././../../common/migrations/references'; +import { + getBaseMapsPerCluster, + getScalingOptionsPerCluster, + getTelemetryLayerTypesPerCluster, + getTermJoinsPerCluster, + TELEMETRY_BASEMAP_COUNTS_PER_CLUSTER, + TELEMETRY_LAYER_TYPE_COUNTS_PER_CLUSTER, + TELEMETRY_SCALING_OPTION_COUNTS_PER_CLUSTER, + TELEMETRY_TERM_JOIN_COUNTS_PER_CLUSTER, +} from './util'; interface Settings { showMapVisualizationTypes: boolean; @@ -52,6 +62,10 @@ export interface GeoIndexPatternsUsage { export interface LayersStatsUsage { mapsTotalCount: number; timeCaptured: string; + layerTypes: TELEMETRY_LAYER_TYPE_COUNTS_PER_CLUSTER; + scalingOptions: TELEMETRY_SCALING_OPTION_COUNTS_PER_CLUSTER; + joins: TELEMETRY_TERM_JOIN_COUNTS_PER_CLUSTER; + basemaps: TELEMETRY_BASEMAP_COUNTS_PER_CLUSTER; attributesPerMap: { dataSourcesCount: { min: number; @@ -246,11 +260,20 @@ export function buildMapsSavedObjectsTelemetry(layerLists: LayerDescriptor[][]): const dataSourcesCountSum = _.sum(dataSourcesCount); const layersCountSum = _.sum(layersCount); + const telemetryLayerTypeCounts = getTelemetryLayerTypesPerCluster(layerLists); + const scalingOptions = getScalingOptionsPerCluster(layerLists); + const joins = getTermJoinsPerCluster(layerLists); + const basemaps = getBaseMapsPerCluster(layerLists); + return { // Total count of maps mapsTotalCount: mapsCount, // Time of capture timeCaptured: new Date().toISOString(), + layerTypes: telemetryLayerTypeCounts, + scalingOptions, + joins, + basemaps, attributesPerMap: { // Count of data sources per map dataSourcesCount: { diff --git a/x-pack/plugins/maps/server/maps_telemetry/test_resources/sample_map_saved_objects.json b/x-pack/plugins/maps/server/maps_telemetry/test_resources/sample_map_saved_objects.json index 82a8035c77dc7..3adaaaf091e08 100644 --- a/x-pack/plugins/maps/server/maps_telemetry/test_resources/sample_map_saved_objects.json +++ b/x-pack/plugins/maps/server/maps_telemetry/test_resources/sample_map_saved_objects.json @@ -21,7 +21,7 @@ "title": "France Map", "description": "", "mapStateJSON": "{\"zoom\":3.43,\"center\":{\"lon\":-16.30411,\"lat\":42.88411},\"timeFilters\":{\"from\":\"now-15w\",\"to\":\"now\"},\"refreshConfig\":{\"isPaused\":false,\"interval\":0},\"query\":{\"query\":\"\",\"language\":\"lucene\"}}", - "layerListJSON": "[{\"sourceDescriptor\":{\"type\":\"EMS_TMS\",\"id\":\"road_map\"},\"id\":\"csq5v\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":0.65,\"visible\":true,\"style\":{\"type\":\"TILE\",\"properties\":{}},\"type\":\"TILE\"},{\"sourceDescriptor\":{\"type\":\"EMS_FILE\",\"id\":\"france_departments\"},\"id\":\"65xbw\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":0.25,\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"fillColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#19c1e6\"}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":10}}}},\"type\":\"VECTOR\"},{\"sourceDescriptor\":{\"id\":\"240125db-e612-4001-b853-50107e55d984\",\"type\":\"ES_SEARCH\",\"indexPatternId\":\"ff959d40-b880-11e8-a6d9-e546fe2bba5f\",\"geoField\":\"geoip.location\",\"limit\":2048,\"filterByMapBounds\":true,\"tooltipProperties\":[]},\"id\":\"mdae9\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":0.75,\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"fillColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#1ce619\"}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":10}}}},\"type\":\"VECTOR\"}]", + "layerListJSON": "[{\"sourceDescriptor\":{\"type\":\"EMS_TMS\",\"id\":\"road_map\"},\"id\":\"csq5v\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":0.65,\"visible\":true,\"style\":{\"type\":\"TILE\",\"properties\":{}},\"type\":\"TILE\"},{\"sourceDescriptor\":{\"type\":\"EMS_FILE\",\"id\":\"france_departments\"},\"id\":\"65xbw\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":0.25,\"visible\":true,\"joins\":[{\"leftField\":\"iso_3166_2\",\"right\":{\"id\":\"6a263f96-7a96-4f5a-a00e-c89178c1d017\"}}],\"style\":{\"type\":\"VECTOR\",\"properties\":{\"fillColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#19c1e6\"}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":10}}}},\"type\":\"VECTOR\"},{\"sourceDescriptor\":{\"id\":\"240125db-e612-4001-b853-50107e55d984\",\"type\":\"ES_SEARCH\",\"scalingType\":\"LIMIT\",\"indexPatternId\":\"ff959d40-b880-11e8-a6d9-e546fe2bba5f\",\"geoField\":\"geoip.location\",\"limit\":2048,\"filterByMapBounds\":true,\"tooltipProperties\":[]},\"id\":\"mdae9\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":0.75,\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"fillColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#1ce619\"}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":10}}}},\"type\":\"VECTOR\"}]", "uiStateJSON": "{}" }, "references": [ diff --git a/x-pack/plugins/maps/server/maps_telemetry/util.ts b/x-pack/plugins/maps/server/maps_telemetry/util.ts new file mode 100644 index 0000000000000..c739f4a539e1e --- /dev/null +++ b/x-pack/plugins/maps/server/maps_telemetry/util.ts @@ -0,0 +1,296 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { + EMSTMSSourceDescriptor, + ESGeoGridSourceDescriptor, + ESSearchSourceDescriptor, + LayerDescriptor, +} from '../../common/descriptor_types'; +import { LAYER_TYPE, RENDER_AS, SCALING_TYPES, SOURCE_TYPES } from '../../common'; +import { + DEFAULT_EMS_DARKMAP_ID, + DEFAULT_EMS_ROADMAP_DESATURATED_ID, + DEFAULT_EMS_ROADMAP_ID, +} from '../../../../../src/plugins/maps_ems/common/'; + +// lowercase is on purpose, so it matches lowercase es-field-names of the maps-telemetry schema +export enum TELEMETRY_LAYER_TYPE { + ES_DOCS = 'es_docs', + ES_TOP_HITS = 'es_top_hits', + ES_TRACKS = 'es_tracks', + ES_POINT_TO_POINT = 'es_point_to_point', + ES_AGG_CLUSTERS = 'es_agg_clusters', + ES_AGG_GRIDS = 'es_agg_grids', + ES_AGG_HEATMAP = 'es_agg_heatmap', + EMS_REGION = 'ems_region', + EMS_BASEMAP = 'ems_basemap', + KBN_REGION = 'kbn_region', + KBN_TMS_RASTER = 'kbn_tms_raster', + UX_TMS_RASTER = 'ux_tms_raster', // configured in the UX layer wizard of Maps + UX_TMS_MVT = 'ux_tms_mvt', // configured in the UX layer wizard of Maps + UX_WMS = 'ux_wms', // configured in the UX layer wizard of Maps +} + +interface ClusterCountStats { + min: number; + max: number; + total: number; + avg: number; +} + +export type TELEMETRY_LAYER_TYPE_COUNTS_PER_CLUSTER = { + [key in TELEMETRY_LAYER_TYPE]?: ClusterCountStats; +}; + +export enum TELEMETRY_EMS_BASEMAP_TYPES { + ROADMAP_DESATURATED = 'roadmap_desaturated', + ROADMAP = 'roadmap', + AUTO = 'auto', + DARK = 'dark', +} + +export type TELEMETRY_BASEMAP_COUNTS_PER_CLUSTER = { + [key in TELEMETRY_EMS_BASEMAP_TYPES]?: ClusterCountStats; +}; + +export enum TELEMETRY_SCALING_OPTIONS { + LIMIT = 'limit', + MVT = 'mvt', + CLUSTERS = 'clusters', +} + +export type TELEMETRY_SCALING_OPTION_COUNTS_PER_CLUSTER = { + [key in TELEMETRY_SCALING_OPTIONS]?: ClusterCountStats; +}; + +const TELEMETRY_TERM_JOIN = 'term'; +export interface TELEMETRY_TERM_JOIN_COUNTS_PER_CLUSTER { + [TELEMETRY_TERM_JOIN]?: ClusterCountStats; +} + +// These capture a particular "combo" of source and layer-settings. +// They are mutually exclusive (ie. a layerDescriptor can only be a single telemetry_layer_type) +// They are more useful from a telemetry-perspective than: +// - an actual SourceType (which does not say enough about how it looks on a map) +// - an actual LayerType (which is too coarse and does not say much about what kind of data) +export function getTelemetryLayerType( + layerDescriptor: LayerDescriptor +): TELEMETRY_LAYER_TYPE | null { + if (!layerDescriptor.sourceDescriptor) { + return null; + } + + if (layerDescriptor.type === LAYER_TYPE.HEATMAP) { + return TELEMETRY_LAYER_TYPE.ES_AGG_HEATMAP; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.EMS_FILE) { + return TELEMETRY_LAYER_TYPE.EMS_REGION; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.EMS_TMS) { + return TELEMETRY_LAYER_TYPE.EMS_BASEMAP; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.KIBANA_TILEMAP) { + return TELEMETRY_LAYER_TYPE.KBN_TMS_RASTER; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.REGIONMAP_FILE) { + return TELEMETRY_LAYER_TYPE.KBN_REGION; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.EMS_XYZ) { + return TELEMETRY_LAYER_TYPE.UX_TMS_RASTER; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.WMS) { + return TELEMETRY_LAYER_TYPE.UX_WMS; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.MVT_SINGLE_LAYER) { + return TELEMETRY_LAYER_TYPE.UX_TMS_MVT; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.ES_GEO_LINE) { + return TELEMETRY_LAYER_TYPE.ES_TRACKS; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.ES_PEW_PEW) { + return TELEMETRY_LAYER_TYPE.ES_POINT_TO_POINT; + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.ES_SEARCH) { + const sourceDescriptor = layerDescriptor.sourceDescriptor as ESSearchSourceDescriptor; + + if (sourceDescriptor.scalingType === SCALING_TYPES.TOP_HITS) { + return TELEMETRY_LAYER_TYPE.ES_TOP_HITS; + } else { + return TELEMETRY_LAYER_TYPE.ES_DOCS; + } + } + + if (layerDescriptor.sourceDescriptor.type === SOURCE_TYPES.ES_GEO_GRID) { + const sourceDescriptor = layerDescriptor.sourceDescriptor as ESGeoGridSourceDescriptor; + if (sourceDescriptor.requestType === RENDER_AS.POINT) { + return TELEMETRY_LAYER_TYPE.ES_AGG_CLUSTERS; + } else if (sourceDescriptor.requestType === RENDER_AS.GRID) { + return TELEMETRY_LAYER_TYPE.ES_AGG_GRIDS; + } + } + + return null; +} + +function getScalingOption(layerDescriptor: LayerDescriptor): TELEMETRY_SCALING_OPTIONS | null { + if ( + !layerDescriptor.sourceDescriptor || + layerDescriptor.sourceDescriptor.type !== SOURCE_TYPES.ES_SEARCH || + !(layerDescriptor.sourceDescriptor as ESSearchSourceDescriptor).scalingType + ) { + return null; + } + + const descriptor = layerDescriptor.sourceDescriptor as ESSearchSourceDescriptor; + + if (descriptor.scalingType === SCALING_TYPES.CLUSTERS) { + return TELEMETRY_SCALING_OPTIONS.CLUSTERS; + } + + if (descriptor.scalingType === SCALING_TYPES.MVT) { + return TELEMETRY_SCALING_OPTIONS.MVT; + } + + if (descriptor.scalingType === SCALING_TYPES.LIMIT) { + return TELEMETRY_SCALING_OPTIONS.LIMIT; + } + + return null; +} + +export function getCountsByMap( + layerDescriptors: LayerDescriptor[], + mapToKey: (layerDescriptor: LayerDescriptor) => string | null +): { [key: string]: number } { + const counts: { [key: string]: number } = {}; + layerDescriptors.forEach((layerDescriptor: LayerDescriptor) => { + const scalingOption = mapToKey(layerDescriptor); + if (!scalingOption) { + return; + } + + if (!counts[scalingOption]) { + counts[scalingOption] = 1; + } else { + (counts[scalingOption] as number) += 1; + } + }); + return counts; +} + +export function getCountsByCluster( + layerLists: LayerDescriptor[][], + mapToKey: (layerDescriptor: LayerDescriptor) => string | null +): { [key: string]: ClusterCountStats } { + const counts = layerLists.map((layerDescriptors: LayerDescriptor[]) => { + return getCountsByMap(layerDescriptors, mapToKey); + }); + const clusterCounts: { [key: string]: ClusterCountStats } = {}; + + counts.forEach((count) => { + for (const key in count) { + if (!count.hasOwnProperty(key)) { + continue; + } + + if (!clusterCounts[key]) { + clusterCounts[key] = { + min: count[key] as number, + max: count[key] as number, + total: count[key] as number, + avg: count[key] as number, + }; + } else { + (clusterCounts[key] as ClusterCountStats).min = Math.min( + count[key] as number, + (clusterCounts[key] as ClusterCountStats).min + ); + (clusterCounts[key] as ClusterCountStats).max = Math.max( + count[key] as number, + (clusterCounts[key] as ClusterCountStats).max + ); + (clusterCounts[key] as ClusterCountStats).total = + (count[key] as number) + (clusterCounts[key] as ClusterCountStats).total; + } + } + }); + + for (const key in clusterCounts) { + if (clusterCounts.hasOwnProperty(key)) { + clusterCounts[key].avg = clusterCounts[key].total / layerLists.length; + } + } + + return clusterCounts; +} + +export function getScalingOptionsPerCluster(layerLists: LayerDescriptor[][]) { + return getCountsByCluster(layerLists, getScalingOption); +} + +export function getTelemetryLayerTypesPerCluster( + layerLists: LayerDescriptor[][] +): TELEMETRY_LAYER_TYPE_COUNTS_PER_CLUSTER { + return getCountsByCluster(layerLists, getTelemetryLayerType); +} + +export function getTermJoinsPerCluster( + layerLists: LayerDescriptor[][] +): TELEMETRY_TERM_JOIN_COUNTS_PER_CLUSTER { + return getCountsByCluster(layerLists, (layerDescriptor: LayerDescriptor) => { + return layerDescriptor.type === LAYER_TYPE.VECTOR && + layerDescriptor.joins && + layerDescriptor.joins.length + ? TELEMETRY_TERM_JOIN + : null; + }); +} + +export function getBaseMapsPerCluster( + layerLists: LayerDescriptor[][] +): TELEMETRY_BASEMAP_COUNTS_PER_CLUSTER { + return getCountsByCluster(layerLists, (layerDescriptor: LayerDescriptor) => { + if ( + !layerDescriptor.sourceDescriptor || + layerDescriptor.sourceDescriptor.type !== SOURCE_TYPES.EMS_TMS + ) { + return null; + } + + const descriptor = layerDescriptor.sourceDescriptor as EMSTMSSourceDescriptor; + + if (descriptor.isAutoSelect) { + return TELEMETRY_EMS_BASEMAP_TYPES.AUTO; + } + + // This needs to be hardcoded. + if (descriptor.id === DEFAULT_EMS_ROADMAP_ID) { + return TELEMETRY_EMS_BASEMAP_TYPES.ROADMAP; + } + + if (descriptor.id === DEFAULT_EMS_ROADMAP_DESATURATED_ID) { + return TELEMETRY_EMS_BASEMAP_TYPES.ROADMAP_DESATURATED; + } + + if (descriptor.id === DEFAULT_EMS_DARKMAP_ID) { + return TELEMETRY_EMS_BASEMAP_TYPES.DARK; + } + + return TELEMETRY_EMS_BASEMAP_TYPES.ROADMAP; + }); +} diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts index 5d7f3f934700b..2eb4242b7931e 100644 --- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts +++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts @@ -5,48 +5,14 @@ * 2.0. */ -import type { estypes } from '@elastic/elasticsearch'; -// import { IndexPatternTitle } from '../kibana'; -// import { RuntimeMappings } from '../fields'; -// import { JobId } from './job'; +import { estypes } from '@elastic/elasticsearch'; + export type DatafeedId = string; export type Datafeed = estypes.Datafeed; -// export interface Datafeed extends estypes.DatafeedConfig { -// runtime_mappings?: RuntimeMappings; -// aggs?: Aggregation; -// } -// export interface Datafeed { -// datafeed_id: DatafeedId; -// aggregations?: Aggregation; -// aggs?: Aggregation; -// chunking_config?: ChunkingConfig; -// frequency?: string; -// indices: IndexPatternTitle[]; -// indexes?: IndexPatternTitle[]; // The datafeed can contain indexes and indices -// job_id: JobId; -// query: object; -// query_delay?: string; -// script_fields?: Record; -// runtime_mappings?: RuntimeMappings; -// scroll_size?: number; -// delayed_data_check_config?: object; -// indices_options?: IndicesOptions; -// } export type ChunkingConfig = estypes.ChunkingConfig; -// export interface ChunkingConfig { -// mode: 'auto' | 'manual' | 'off'; -// time_span?: string; -// } - export type Aggregation = Record; export type IndicesOptions = estypes.IndicesOptions; -// export interface IndicesOptions { -// expand_wildcards?: 'all' | 'open' | 'closed' | 'hidden' | 'none'; -// ignore_unavailable?: boolean; -// allow_no_indices?: boolean; -// ignore_throttled?: boolean; -// } diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts index f13aa1843660e..dd0d3a5001f84 100644 --- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts +++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts @@ -5,22 +5,6 @@ * 2.0. */ -import { Node } from './job_stats'; -import { DATAFEED_STATE } from '../../constants/states'; +import { estypes } from '@elastic/elasticsearch'; -export interface DatafeedStats { - datafeed_id: string; - state: DATAFEED_STATE; - node: Node; - assignment_explanation: string; - timing_stats: TimingStats; -} - -interface TimingStats { - job_id: string; - search_count: number; - bucket_count: number; - total_search_time_ms: number; - average_search_time_per_bucket_ms: number; - exponential_average_search_time_per_hour_ms: number; -} +export type DatafeedStats = estypes.DatafeedStats; diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts index 5e1d5e009a764..68544e7cb828f 100644 --- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts +++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts @@ -6,103 +6,27 @@ */ import { estypes } from '@elastic/elasticsearch'; -import { UrlConfig } from '../custom_urls'; -import { CREATED_BY_LABEL } from '../../constants/new_job'; export type JobId = string; export type BucketSpan = string; -export interface CustomSettings { - custom_urls?: UrlConfig[]; - created_by?: CREATED_BY_LABEL; - job_tags?: { - [tag: string]: string; - }; -} - export type Job = estypes.Job; -// export interface Job { -// job_id: JobId; -// analysis_config: AnalysisConfig; -// analysis_limits?: AnalysisLimits; -// background_persist_interval?: string; -// custom_settings?: CustomSettings; -// data_description: DataDescription; -// description: string; -// groups: string[]; -// model_plot_config?: ModelPlotConfig; -// model_snapshot_retention_days?: number; -// daily_model_snapshot_retention_after_days?: number; -// renormalization_window_days?: number; -// results_index_name?: string; -// results_retention_days?: number; - -// // optional properties added when the job has been created -// create_time?: number; -// finished_time?: number; -// job_type?: 'anomaly_detector'; -// job_version?: string; -// model_snapshot_id?: string; -// deleting?: boolean; -// } export type AnalysisConfig = estypes.AnalysisConfig; -// export interface AnalysisConfig { -// bucket_span: BucketSpan; -// categorization_field_name?: string; -// categorization_filters?: string[]; -// categorization_analyzer?: object | string; -// detectors: Detector[]; -// influencers: string[]; -// latency?: number; -// multivariate_by_fields?: boolean; -// summary_count_field_name?: string; -// per_partition_categorization?: PerPartitionCategorization; -// } export type Detector = estypes.Detector; -// export interface Detector { -// by_field_name?: string; -// detector_description?: string; -// detector_index?: number; -// exclude_frequent?: string; -// field_name?: string; -// function: string; -// over_field_name?: string; -// partition_field_name?: string; -// use_null?: boolean; -// custom_rules?: CustomRule[]; -// } export type AnalysisLimits = estypes.AnalysisLimits; -// export interface AnalysisLimits { -// categorization_examples_limit?: number; -// model_memory_limit: string; -// } export type DataDescription = estypes.DataDescription; -// export interface DataDescription { -// format?: string; -// time_field: string; -// time_format?: string; -// } export type ModelPlotConfig = estypes.ModelPlotConfig; -// export interface ModelPlotConfig { -// enabled?: boolean; -// annotations_enabled?: boolean; -// terms?: string; -// } export type CustomRule = estypes.DetectionRule; -// TODO, finish this when it's needed -// export interface CustomRule { -// actions: string[]; -// scope?: object; -// conditions: any[]; -// } export interface PerPartitionCategorization { enabled?: boolean; stop_on_warn?: boolean; } + +export type CustomSettings = estypes.CustomSettings; diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts index 1fd69d0c5f0b1..a53f1f2486699 100644 --- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts +++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts @@ -5,93 +5,25 @@ * 2.0. */ -import { JOB_STATE } from '../../constants/states'; +import { estypes } from '@elastic/elasticsearch'; -export interface JobStats { - job_id: string; - data_counts: DataCounts; +export type JobStats = estypes.JobStats & { model_size_stats: ModelSizeStats; - forecasts_stats: ForecastsStats; - state: JOB_STATE; - node: Node; - assignment_explanation: string; - open_time: string; timing_stats: TimingStats; -} +}; -export interface DataCounts { - job_id: string; - processed_record_count: number; - processed_field_count: number; - input_bytes: number; - input_field_count: number; - invalid_date_count: number; - missing_field_count: number; - out_of_order_timestamp_count: number; - empty_bucket_count: number; - sparse_bucket_count: number; - bucket_count: number; - earliest_record_timestamp: number; - latest_record_timestamp: number; - last_data_time: number; - input_record_count: number; - latest_empty_bucket_timestamp: number; - latest_sparse_bucket_timestamp: number; - latest_bucket_timestamp?: number; // stat added by the UI -} +export type DataCounts = estypes.DataCounts; -export interface ModelSizeStats { - job_id: string; - result_type: string; - model_bytes: number; +export type ModelSizeStats = estypes.ModelSizeStats & { model_bytes_exceeded: number; model_bytes_memory_limit: number; peak_model_bytes?: number; - total_by_field_count: number; - total_over_field_count: number; - total_partition_field_count: number; - bucket_allocation_failures_count: number; - memory_status: 'ok' | 'soft_limit' | 'hard_limit'; - categorized_doc_count: number; - total_category_count: number; - frequent_category_count: number; - rare_category_count: number; - dead_category_count: number; - categorization_status: 'ok' | 'warn'; - log_time: number; - timestamp: number; -} +}; -export interface ForecastsStats { - total: number; - forecasted_jobs: number; - memory_bytes?: any; - records?: any; - processing_time_ms?: any; - status?: any; -} +export type TimingStats = estypes.TimingStats & { + total_bucket_processing_time_ms: number; +}; -export interface Node { - id: string; - name: string; - ephemeral_id: string; - transport_address: string; - attributes: { - 'transform.remote_connect'?: boolean; - 'ml.machine_memory'?: number; - 'xpack.installed'?: boolean; - 'transform.node'?: boolean; - 'ml.max_open_jobs'?: number; - }; -} +export type ForecastsStats = estypes.JobForecastStatistics; -interface TimingStats { - job_id: string; - bucket_count: number; - total_bucket_processing_time_ms: number; - minimum_bucket_processing_time_ms: number; - maximum_bucket_processing_time_ms: number; - average_bucket_processing_time_ms: number; - exponential_average_bucket_processing_time_ms: number; - exponential_average_bucket_processing_time_per_hour_ms: number; -} +export type Node = estypes.DiscoveryNode; diff --git a/x-pack/plugins/ml/common/util/job_utils.ts b/x-pack/plugins/ml/common/util/job_utils.ts index 78e565a491386..7e6d84f9efed7 100644 --- a/x-pack/plugins/ml/common/util/job_utils.ts +++ b/x-pack/plugins/ml/common/util/job_utils.ts @@ -8,7 +8,7 @@ import { each, isEmpty, isEqual, pick } from 'lodash'; import semverGte from 'semver/functions/gte'; import moment, { Duration } from 'moment'; -import type { estypes } from '@elastic/elasticsearch'; +import { estypes } from '@elastic/elasticsearch'; // @ts-ignore import numeral from '@elastic/numeral'; import { i18n } from '@kbn/i18n'; @@ -819,7 +819,7 @@ export function getLatestDataOrBucketTimestamp( * in the job wizards and so would be lost in a clone. */ export function processCreatedBy(customSettings: CustomSettings) { - if (Object.values(CREATED_BY_LABEL).includes(customSettings.created_by!)) { + if (Object.values(CREATED_BY_LABEL).includes(customSettings.created_by as CREATED_BY_LABEL)) { delete customSettings.created_by; } } diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json index 4955c1af5674d..f61ab17646b65 100644 --- a/x-pack/plugins/ml/kibana.json +++ b/x-pack/plugins/ml/kibana.json @@ -10,7 +10,7 @@ "data", "cloud", "features", - "fileUpload", + "fileDataVisualizer", "licensing", "share", "embeddable", diff --git a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts index 77381c8728a48..ad47e84319e4a 100644 --- a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts +++ b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts @@ -24,5 +24,5 @@ export const createMlStartDepsMock = () => ({ maps: jest.fn(), lens: lensPluginMock.createStartContract(), triggersActionsUi: triggersActionsUiMock.createStart(), - fileUpload: jest.fn(), + fileDataVisualizer: jest.fn(), }); diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx index 5f72d49e4672e..e2fbcc77f2767 100644 --- a/x-pack/plugins/ml/public/application/app.tsx +++ b/x-pack/plugins/ml/public/application/app.tsx @@ -82,7 +82,7 @@ const App: FC = ({ coreStart, deps, appMountParams }) => { embeddable: deps.embeddable, maps: deps.maps, triggersActionsUi: deps.triggersActionsUi, - fileUpload: deps.fileUpload, + fileDataVisualizer: deps.fileDataVisualizer, ...coreStart, }; @@ -125,7 +125,7 @@ export const renderApp = ( security: deps.security, urlGenerators: deps.share.urlGenerators, maps: deps.maps, - fileUpload: deps.fileUpload, + fileDataVisualizer: deps.fileDataVisualizer, }); appMountParams.onAppLeave((actions) => actions.default()); diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table.test.js b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table.test.js index 2b3e14308497a..d474969475d64 100644 --- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table.test.js +++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table.test.js @@ -65,20 +65,20 @@ describe('AnomaliesTable', () => { expect(columns).toEqual( expect.arrayContaining([ expect.objectContaining({ - name: 'time', + name: 'Time', }), expect.objectContaining({ - name: 'severity', + field: 'severity', }), expect.objectContaining({ - name: 'detector', + name: 'Detector', }), expect.objectContaining({ field: 'entityValue', - name: 'found for', + name: 'Found for', }), expect.objectContaining({ - name: 'influenced by', + name: 'Influenced by', }), expect.objectContaining({ field: 'actualSort', @@ -87,10 +87,10 @@ describe('AnomaliesTable', () => { field: 'typicalSort', }), expect.objectContaining({ - name: 'description', + name: 'Description', }), expect.objectContaining({ - name: 'category examples', + name: 'Category examples', }), ]) ); @@ -120,7 +120,7 @@ describe('AnomaliesTable', () => { expect(columns).toEqual( expect.not.arrayContaining([ expect.objectContaining({ - name: 'found for', + name: 'Found for', }), ]) ); @@ -150,7 +150,7 @@ describe('AnomaliesTable', () => { expect(columns).toEqual( expect.not.arrayContaining([ expect.objectContaining({ - name: 'influenced by', + name: 'Influenced by', }), ]) ); @@ -180,7 +180,7 @@ describe('AnomaliesTable', () => { expect(columns).toEqual( expect.not.arrayContaining([ expect.objectContaining({ - name: 'actual', + name: 'Actual', }), ]) ); @@ -210,7 +210,7 @@ describe('AnomaliesTable', () => { expect(columns).toEqual( expect.not.arrayContaining([ expect.objectContaining({ - name: 'typical', + name: 'Typical', }), ]) ); @@ -240,7 +240,7 @@ describe('AnomaliesTable', () => { expect(columns).toEqual( expect.arrayContaining([ expect.objectContaining({ - name: 'job ID', + name: 'Job ID', }), ]) ); diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js index 0e810ec0dfdc2..1f3979e6efe29 100644 --- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js +++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js @@ -99,7 +99,7 @@ export function getColumns( field: 'time', 'data-test-subj': 'mlAnomaliesListColumnTime', name: i18n.translate('xpack.ml.anomaliesTable.timeColumnName', { - defaultMessage: 'time', + defaultMessage: 'Time', }), dataType: 'date', scope: 'row', @@ -110,9 +110,21 @@ export function getColumns( { field: 'severity', 'data-test-subj': 'mlAnomaliesListColumnSeverity', - name: i18n.translate('xpack.ml.anomaliesTable.severityColumnName', { - defaultMessage: 'severity', - }), + name: ( + + + {i18n.translate('xpack.ml.anomaliesTable.severityColumnName', { + defaultMessage: 'Severity', + })} + + + + ), render: (score, item) => ( ), @@ -122,7 +134,7 @@ export function getColumns( field: 'detector', 'data-test-subj': 'mlAnomaliesListColumnDetector', name: i18n.translate('xpack.ml.anomaliesTable.detectorColumnName', { - defaultMessage: 'detector', + defaultMessage: 'Detector', }), render: (detectorDescription, item) => ( @@ -137,7 +149,7 @@ export function getColumns( field: 'entityValue', 'data-test-subj': 'mlAnomaliesListColumnFoundFor', name: i18n.translate('xpack.ml.anomaliesTable.entityValueColumnName', { - defaultMessage: 'found for', + defaultMessage: 'Found for', }), render: (entityValue, item) => ( ( ( @@ -258,7 +270,7 @@ export function getColumns( field: 'jobId', 'data-test-subj': 'mlAnomaliesListColumnJobID', name: i18n.translate('xpack.ml.anomaliesTable.jobIdColumnName', { - defaultMessage: 'job ID', + defaultMessage: 'Job ID', }), sortable: true, }); @@ -269,7 +281,7 @@ export function getColumns( columns.push({ 'data-test-subj': 'mlAnomaliesListColumnCategoryExamples', name: i18n.translate('xpack.ml.anomaliesTable.categoryExamplesColumnName', { - defaultMessage: 'category examples', + defaultMessage: 'Category examples', }), truncateText: true, render: (item) => { @@ -299,7 +311,7 @@ export function getColumns( columns.push({ 'data-test-subj': 'mlAnomaliesListColumnAction', name: i18n.translate('xpack.ml.anomaliesTable.actionsColumnName', { - defaultMessage: 'actions', + defaultMessage: 'Actions', }), render: (item) => { if (showLinksMenuForItem(item, showViewSeriesLink) === true) { diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js index 8efa5f9e5909d..20e426ac37997 100644 --- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js +++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.js @@ -123,14 +123,14 @@ function getDetailsItems(anomaly, examples, filter) { } items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.timeTitle', { - defaultMessage: 'time', + defaultMessage: 'Time', }), description: timeDesc, }); items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.functionTitle', { - defaultMessage: 'function', + defaultMessage: 'Function', }), description: source.function !== ML_JOB_AGGREGATION.METRIC ? source.function : source.function_description, @@ -139,7 +139,7 @@ function getDetailsItems(anomaly, examples, filter) { if (source.field_name !== undefined) { items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.fieldNameTitle', { - defaultMessage: 'fieldName', + defaultMessage: 'Field name', }), description: source.field_name, }); @@ -149,7 +149,7 @@ function getDetailsItems(anomaly, examples, filter) { if (anomaly.actual !== undefined && showActualForFunction(functionDescription) === true) { items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.actualTitle', { - defaultMessage: 'actual', + defaultMessage: 'Actual', }), description: formatValue(anomaly.actual, source.function, undefined, source), }); @@ -158,7 +158,7 @@ function getDetailsItems(anomaly, examples, filter) { if (anomaly.typical !== undefined && showTypicalForFunction(functionDescription) === true) { items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.typicalTitle', { - defaultMessage: 'typical', + defaultMessage: 'Typical', }), description: formatValue(anomaly.typical, source.function, undefined, source), }); @@ -166,7 +166,7 @@ function getDetailsItems(anomaly, examples, filter) { items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.jobIdTitle', { - defaultMessage: 'job ID', + defaultMessage: 'Job ID', }), description: anomaly.jobId, }); @@ -177,7 +177,7 @@ function getDetailsItems(anomaly, examples, filter) { ) { items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.multiBucketImpactTitle', { - defaultMessage: 'multi-bucket impact', + defaultMessage: 'Multi-bucket impact', }), description: getMultiBucketImpactLabel(source.multi_bucket_impact), }); @@ -185,7 +185,7 @@ function getDetailsItems(anomaly, examples, filter) { items.push({ title: i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.probabilityTitle', { - defaultMessage: 'probability', + defaultMessage: 'Probability', }), description: source.probability, }); @@ -565,7 +565,7 @@ export class AnomalyDetails extends Component { this.toggleAllInfluencers()}> )} diff --git a/x-pack/plugins/ml/public/application/components/data_grid/common.ts b/x-pack/plugins/ml/public/application/components/data_grid/common.ts index b897ca3dccc51..24a3cfb70d18d 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/common.ts +++ b/x-pack/plugins/ml/public/application/components/data_grid/common.ts @@ -6,6 +6,7 @@ */ import moment from 'moment-timezone'; +import { estypes } from '@elastic/elasticsearch'; import { useEffect, useMemo } from 'react'; import { @@ -18,7 +19,6 @@ import { i18n } from '@kbn/i18n'; import { CoreSetup } from 'src/core/public'; -import type { estypes } from '@elastic/elasticsearch'; import { IndexPattern, IFieldType, diff --git a/x-pack/plugins/ml/public/application/components/navigation_menu/main_tabs.tsx b/x-pack/plugins/ml/public/application/components/navigation_menu/main_tabs.tsx index 3a6979d021c8b..0f381fb7acee9 100644 --- a/x-pack/plugins/ml/public/application/components/navigation_menu/main_tabs.tsx +++ b/x-pack/plugins/ml/public/application/components/navigation_menu/main_tabs.tsx @@ -161,14 +161,16 @@ export const MainTabs: FC = ({ tabId, disableLinks }) => { const defaultPathId = (TAB_DATA[id].pathId || id) as MlUrlGeneratorState['page']; return disabled ? ( - - {tab.name} - +
+ + {tab.name} + +
) : (
{ licenseManagement, http: { basePath }, docLinks, - fileUpload, + fileDataVisualizer, }, } = useMlKibana(); @@ -68,12 +68,12 @@ export const DatavisualizerSelector: FC = () => { licenseManagement.enabled === true && isFullLicense() === false; - if (fileUpload === undefined) { + if (fileDataVisualizer === undefined) { // eslint-disable-next-line no-console - console.error('File upload plugin not available'); + console.error('File data visualizer plugin not available'); return null; } - const maxFileSize = fileUpload.getMaxBytesFormatted(); + const maxFileSize = fileDataVisualizer.getMaxBytesFormatted(); return ( diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats/_field_stats_card.scss b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats/_field_stats_card.scss deleted file mode 100644 index d0af6d3f01d2f..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats/_field_stats_card.scss +++ /dev/null @@ -1,150 +0,0 @@ -.card-container { - display: inline-grid; - display: -ms-inline-grid; - padding: 0 10px 10px 0; -} - -.ml-field-data-card { - // These styles should all be removed once the file data visualizer is using - // the same field_data_card component as the index based data visualizer. - height: 408px; - box-shadow: none; - border-color: $euiBorderColor; - - // Note the names of these styles need to match the type of the field they are displaying. - .boolean { - color: $euiColorVis5; - border-color: $euiColorVis5; - } - - .date { - color: $euiColorVis7; - border-color: $euiColorVis7; - } - - .document_count { - color: $euiColorVis2; - border-color: $euiColorVis2; - } - - .geo_point { - color: $euiColorVis8; - border-color: $euiColorVis8; - } - - .ip { - color: $euiColorVis3; - border-color: $euiColorVis3; - } - - .keyword { - color: $euiColorVis0; - border-color: $euiColorVis0; - } - - .number { - color: $euiColorVis1; - border-color: $euiColorVis1; - } - - .text { - color: $euiColorVis9; - border-color: $euiColorVis9; - } - - .type-other, - .unknown { - color: $euiColorVis6; - border-color: $euiColorVis6; - } - - // Use euiPanel styling - @include euiPanel($selector: '.card-contents'); - - .stats { - text-align: center; - } - - .stat { - padding-bottom: 6px; - } - - .stat.heading { - padding-bottom: 0; - } - - .stat.min, - .stat.max, - .stat.median { - width: 30%; - display: inline-block; - } - - .stat.min.value, - .stat.max.value, - .stat.median.value { - font-size: $euiFontSizeS; - @include euiTextTruncate; - } - - .valueWrapper { - display: inline; - } - - .not-exist-message { - padding: 50px 30px 0 30px; - text-align: center; - } - - .sampled-message { - font-size: 11px; - color: #555555; - text-align: center; - padding-top: 3px; - } - - .text-code { - font-family: $euiCodeFontFamily; - } - - .details-select { - text-align: center; - margin-top: 5px; - margin-bottom: 5px; - } - - .details-container { - padding-top: 5px; - } - - .top-value { - height: 21px; - font-size: 13px; - - .field-label { - @include euiTextTruncate; - - display: inline-block; - width: 100px; - text-align: right; - } - - .count-label { - display: inline-block; - width: 70px; - text-align: left; - overflow: hidden; - text-overflow: ellipsis; - } - - .top-value-bar-holder { - display: inline-block; - width: 160px; - } - - .top-value-bar { - height: 15px; - min-width: 3px; - } - } -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats/_fields_stats.scss b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats/_fields_stats.scss deleted file mode 100644 index 5decacfe1b7b8..0000000000000 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/fields_stats/_fields_stats.scss +++ /dev/null @@ -1,6 +0,0 @@ -.fields-stats { - padding: 10px; -} -.field { - margin-bottom: 10px; -} diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx index a05677918da72..3b4cfbf33fbfc 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/file_datavisualizer.tsx @@ -5,34 +5,32 @@ * 2.0. */ -import React, { FC, Fragment } from 'react'; -import { IUiSettingsClient } from 'kibana/public'; +import React, { FC, Fragment, useState, useEffect } from 'react'; import { useTimefilter } from '../../contexts/kibana'; import { NavigationMenu } from '../../components/navigation_menu'; -import { getIndexPatternsContract } from '../../util/index_utils'; import { HelpMenu } from '../../components/help_menu'; import { useMlKibana } from '../../contexts/kibana'; -// @ts-ignore -import { FileDataVisualizerView } from './components/file_datavisualizer_view/index'; - -export interface FileDataVisualizerPageProps { - kibanaConfig: IUiSettingsClient; -} - -export const FileDataVisualizerPage: FC = ({ kibanaConfig }) => { +export const FileDataVisualizerPage: FC = () => { useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false }); - const indexPatterns = getIndexPatternsContract(); const { - services: { docLinks }, + services: { docLinks, fileDataVisualizer }, } = useMlKibana(); - const helpLink = docLinks.links.ml.guide; + const [FileDataVisualizer, setFileDataVisualizer] = useState | null>(null); + + useEffect(() => { + if (fileDataVisualizer !== undefined) { + const { getFileDataVisualizerComponent } = fileDataVisualizer; + getFileDataVisualizerComponent().then(setFileDataVisualizer); + } + }, []); + return ( - - + {FileDataVisualizer} + ); }; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/file_based/index.tsx similarity index 100% rename from x-pack/plugins/ml/public/application/datavisualizer/file_based/index.ts rename to x-pack/plugins/ml/public/application/datavisualizer/file_based/index.tsx diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx index 7bc7260acf544..15ddf00c4e1d3 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx @@ -13,7 +13,7 @@ import { FieldTypeIcon } from '../../../../components/field_type_icon'; import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types'; import type { MlJobFieldType } from '../../../../../../common/types/field_types'; -export const ML_JOB_FIELD_TYPES_OPTIONS = { +const ML_JOB_FIELD_TYPES_OPTIONS = { [ML_JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' }, [ML_JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' }, [ML_JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' }, diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts index e0944711033a7..d35b0ae9688cf 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts @@ -7,7 +7,6 @@ export { BooleanContent } from './boolean_content'; export { DateContent } from './date_content'; -export { GeoPointContent } from '../../../file_based/components/expanded_row/geo_point_content/geo_point_content'; export { KeywordContent } from './keyword_content'; export { IpContent } from './ip_content'; export { NumberContent } from './number_content'; diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx index 2a6a681c63210..2003d07efca82 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx @@ -38,7 +38,6 @@ import { FileBasedFieldVisConfig, isIndexBasedFieldVisConfig, } from './types/field_vis_config'; -import { FileBasedNumberContentPreview } from '../file_based/components/field_data_row'; import { BooleanContentPreview } from './components/field_data_row'; const FIELD_NAME = 'fieldName'; @@ -224,8 +223,6 @@ export const DataVisualizerTable = ({ if (item.type === ML_JOB_FIELD_TYPES.NUMBER) { if (isIndexBasedFieldVisConfig(item) && item.stats?.distribution !== undefined) { return ; - } else { - return ; } } diff --git a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts index 1871e8925cb75..6d70566af1a64 100644 --- a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts +++ b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts @@ -23,6 +23,7 @@ import { loadAnomaliesTableData, loadFilteredTopInfluencers, loadTopInfluencers, + loadOverallAnnotations, AppStateSelectedCells, ExplorerJob, } from '../explorer_utils'; @@ -55,6 +56,10 @@ const memoize = any>(func: T, context?: any) => { return memoizeOne(wrapWithLastRefreshArg(func, context) as any, memoizeIsEqual); }; +const memoizedLoadOverallAnnotations = memoize( + loadOverallAnnotations +); + const memoizedLoadAnnotationsTableData = memoize( loadAnnotationsTableData ); @@ -149,9 +154,17 @@ const loadExplorerDataProvider = ( const dateFormatTz = getDateFormatTz(); + const interval = swimlaneBucketInterval.asSeconds(); + // First get the data where we have all necessary args at hand using forkJoin: // annotationsData, anomalyChartRecords, influencers, overallState, tableData, topFieldValues return forkJoin({ + overallAnnotations: memoizedLoadOverallAnnotations( + lastRefresh, + selectedJobs, + interval, + bounds + ), annotationsData: memoizedLoadAnnotationsTableData( lastRefresh, selectedCells, @@ -214,6 +227,7 @@ const loadExplorerDataProvider = ( tap(explorerService.setChartsDataLoading), mergeMap( ({ + overallAnnotations, anomalyChartRecords, influencers, overallState, @@ -271,6 +285,7 @@ const loadExplorerDataProvider = ( }), map(({ viewBySwimlaneState, filteredTopInfluencers }) => { return { + overallAnnotations, annotations: annotationsData, influencers: filteredTopInfluencers as any, loading: false, diff --git a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx index 37967d18dbbd9..38cb556aaf0d2 100644 --- a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx +++ b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx @@ -87,6 +87,7 @@ export const AnomalyTimeline: FC = React.memo( viewByPerPage, swimlaneLimit, loading, + overallAnnotations, } = explorerState; const menuItems = useMemo(() => { @@ -240,6 +241,7 @@ export const AnomalyTimeline: FC = React.memo( isLoading={loading} noDataWarning={} showTimeline={false} + annotationsData={overallAnnotations.annotationsData} /> @@ -257,6 +259,7 @@ export const AnomalyTimeline: FC = React.memo( }) } timeBuckets={timeBuckets} + showLegend={false} swimlaneData={viewBySwimlaneData as ViewBySwimLaneData} swimlaneType={SWIMLANE_TYPE.VIEW_BY} selection={selectedCells} diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts b/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts index b410449218d02..ebab308b86027 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts +++ b/x-pack/plugins/ml/public/application/explorer/explorer_utils.d.ts @@ -110,6 +110,12 @@ declare interface SwimlaneBounds { latest: number; } +export declare const loadOverallAnnotations: ( + selectedJobs: ExplorerJob[], + interval: number, + bounds: TimeRangeBounds +) => Promise; + export declare const loadAnnotationsTableData: ( selectedCells: AppStateSelectedCells | undefined, selectedJobs: ExplorerJob[], diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_utils.js b/x-pack/plugins/ml/public/application/explorer/explorer_utils.js index 69bdac060a2dc..ecf347e6b142f 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer_utils.js +++ b/x-pack/plugins/ml/public/application/explorer/explorer_utils.js @@ -385,6 +385,57 @@ export function getViewBySwimlaneOptions({ }; } +export function loadOverallAnnotations(selectedJobs, interval, bounds) { + const jobIds = selectedJobs.map((d) => d.id); + const timeRange = getSelectionTimeRange(undefined, interval, bounds); + + return new Promise((resolve) => { + ml.annotations + .getAnnotations$({ + jobIds, + earliestMs: timeRange.earliestMs, + latestMs: timeRange.latestMs, + maxAnnotations: ANNOTATIONS_TABLE_DEFAULT_QUERY_SIZE, + }) + .toPromise() + .then((resp) => { + if (resp.error !== undefined || resp.annotations === undefined) { + const errorMessage = extractErrorMessage(resp.error); + return resolve({ + annotationsData: [], + error: errorMessage !== '' ? errorMessage : undefined, + }); + } + + const annotationsData = []; + jobIds.forEach((jobId) => { + const jobAnnotations = resp.annotations[jobId]; + if (jobAnnotations !== undefined) { + annotationsData.push(...jobAnnotations); + } + }); + + return resolve({ + annotationsData: annotationsData + .sort((a, b) => { + return a.timestamp - b.timestamp; + }) + .map((d, i) => { + d.key = (i + 1).toString(); + return d; + }), + }); + }) + .catch((resp) => { + const errorMessage = extractErrorMessage(resp); + return resolve({ + annotationsData: [], + error: errorMessage !== '' ? errorMessage : undefined, + }); + }); + }); +} + export function loadAnnotationsTableData(selectedCells, selectedJobs, interval, bounds) { const jobIds = selectedCells !== undefined && selectedCells.viewByFieldName === VIEW_BY_JOB_LABEL diff --git a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts index e9527b7c232e5..faab658740a70 100644 --- a/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts +++ b/x-pack/plugins/ml/public/application/explorer/reducers/explorer_reducer/state.ts @@ -27,6 +27,7 @@ import { SWIM_LANE_DEFAULT_PAGE_SIZE } from '../../explorer_constants'; import { InfluencersFilterQuery } from '../../../../../common/types/es_client'; export interface ExplorerState { + overallAnnotations: AnnotationsTable; annotations: AnnotationsTable; anomalyChartsDataLoading: boolean; chartsData: ExplorerChartsData; @@ -65,6 +66,11 @@ function getDefaultIndexPattern() { export function getExplorerDefaultState(): ExplorerState { return { + overallAnnotations: { + error: undefined, + annotationsData: [], + aggregations: {}, + }, annotations: { error: undefined, annotationsData: [], diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx new file mode 100644 index 0000000000000..686413ff0188b --- /dev/null +++ b/x-pack/plugins/ml/public/application/explorer/swimlane_annotation_container.tsx @@ -0,0 +1,149 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import React, { FC, useEffect } from 'react'; +import d3 from 'd3'; +import { scaleTime } from 'd3-scale'; +import { i18n } from '@kbn/i18n'; +import { formatHumanReadableDateTimeSeconds } from '../../../common/util/date_utils'; +import { AnnotationsTable } from '../../../common/types/annotations'; +import { ChartTooltipService } from '../components/chart_tooltip'; + +export const Y_AXIS_LABEL_WIDTH = 170; +export const Y_AXIS_LABEL_PADDING = 8; +export const Y_AXIS_LABEL_FONT_COLOR = '#6a717d'; +const ANNOTATION_CONTAINER_HEIGHT = 12; +const ANNOTATION_MARGIN = 2; +const ANNOTATION_MIN_WIDTH = 5; +const ANNOTATION_HEIGHT = ANNOTATION_CONTAINER_HEIGHT - 2 * ANNOTATION_MARGIN; + +interface SwimlaneAnnotationContainerProps { + chartWidth: number; + domain: { + min: number; + max: number; + }; + annotationsData?: AnnotationsTable['annotationsData']; + tooltipService: ChartTooltipService; +} + +export const SwimlaneAnnotationContainer: FC = ({ + chartWidth, + domain, + annotationsData, + tooltipService, +}) => { + const canvasRef = React.useRef(null); + + useEffect(() => { + if (canvasRef.current !== null && Array.isArray(annotationsData)) { + const chartElement = d3.select(canvasRef.current); + chartElement.selectAll('*').remove(); + + const dimensions = canvasRef.current.getBoundingClientRect(); + + const startingXPos = Y_AXIS_LABEL_WIDTH + 2 * Y_AXIS_LABEL_PADDING; + const endingXPos = dimensions.width - 2 * Y_AXIS_LABEL_PADDING - 4; + + const svg = chartElement + .append('svg') + .attr('width', '100%') + .attr('height', ANNOTATION_CONTAINER_HEIGHT); + + const xScale = scaleTime().domain([domain.min, domain.max]).range([startingXPos, endingXPos]); + + // Add Annotation y axis label + svg + .append('text') + .attr('text-anchor', 'end') + .attr('class', 'swimlaneAnnotationLabel') + .text( + i18n.translate('xpack.ml.explorer.swimlaneAnnotationLabel', { + defaultMessage: 'Annotations', + }) + ) + .attr('x', Y_AXIS_LABEL_WIDTH + Y_AXIS_LABEL_PADDING) + .attr('y', ANNOTATION_CONTAINER_HEIGHT) + .style('fill', Y_AXIS_LABEL_FONT_COLOR) + .style('font-size', '12px'); + + // Add border + svg + .append('rect') + .attr('x', startingXPos) + .attr('y', 0) + .attr('height', ANNOTATION_CONTAINER_HEIGHT) + .attr('width', endingXPos - startingXPos) + .style('stroke', '#cccccc') + .style('fill', 'none') + .style('stroke-width', 1); + + // Add annotation marker + annotationsData.forEach((d) => { + const annotationWidth = d.end_timestamp + ? xScale(Math.min(d.end_timestamp, domain.max)) - + Math.max(xScale(d.timestamp), startingXPos) + : 0; + + svg + .append('rect') + .classed('mlAnnotationRect', true) + .attr('x', d.timestamp >= domain.min ? xScale(d.timestamp) : startingXPos) + .attr('y', ANNOTATION_MARGIN) + .attr('height', ANNOTATION_HEIGHT) + .attr('width', Math.max(annotationWidth, ANNOTATION_MIN_WIDTH)) + .attr('rx', ANNOTATION_MARGIN) + .attr('ry', ANNOTATION_MARGIN) + .on('mouseover', function () { + const startingTime = formatHumanReadableDateTimeSeconds(d.timestamp); + const endingTime = + d.end_timestamp !== undefined + ? formatHumanReadableDateTimeSeconds(d.end_timestamp) + : undefined; + + const timeLabel = endingTime ? `${startingTime} - ${endingTime}` : startingTime; + + const tooltipData = [ + { + label: `${d.annotation}`, + seriesIdentifier: { + key: 'anomaly_timeline', + specId: d._id ?? `${d.annotation}-${d.timestamp}-label`, + }, + valueAccessor: 'label', + }, + { + label: `${timeLabel}`, + seriesIdentifier: { + key: 'anomaly_timeline', + specId: d._id ?? `${d.annotation}-${d.timestamp}-ts`, + }, + valueAccessor: 'time', + }, + ]; + if (d.partition_field_name !== undefined && d.partition_field_value !== undefined) { + tooltipData.push({ + label: `${d.partition_field_name}: ${d.partition_field_value}`, + seriesIdentifier: { + key: 'anomaly_timeline', + specId: d._id + ? `${d._id}-partition` + : `${d.partition_field_name}-${d.partition_field_value}-label`, + }, + valueAccessor: 'partition', + }); + } + // @ts-ignore we don't need all the fields for tooltip to show + tooltipService.show(tooltipData, this); + }) + .on('mouseout', () => tooltipService.hide()); + }); + } + }, [chartWidth, domain, annotationsData]); + + return
; +}; diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx index c108257094b6a..0f445a4872417 100644 --- a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx +++ b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx @@ -38,13 +38,20 @@ import { ANOMALY_THRESHOLD, SEVERITY_COLORS } from '../../../common'; import { TimeBuckets as TimeBucketsClass } from '../util/time_buckets'; import { SWIMLANE_TYPE, SwimlaneType } from './explorer_constants'; import { mlEscape } from '../util/string_utils'; -import { FormattedTooltip } from '../components/chart_tooltip/chart_tooltip'; +import { FormattedTooltip, MlTooltipComponent } from '../components/chart_tooltip/chart_tooltip'; import { formatHumanReadableDateTime } from '../../../common/util/date_utils'; import { getFormattedSeverityScore } from '../../../common/util/anomaly_utils'; import './_explorer.scss'; import { EMPTY_FIELD_VALUE_LABEL } from '../timeseriesexplorer/components/entity_control/entity_control'; import { useUiSettings } from '../contexts/kibana'; +import { + SwimlaneAnnotationContainer, + Y_AXIS_LABEL_WIDTH, + Y_AXIS_LABEL_PADDING, + Y_AXIS_LABEL_FONT_COLOR, +} from './swimlane_annotation_container'; +import { AnnotationsTable } from '../../../common/types/annotations'; declare global { interface Window { @@ -61,8 +68,10 @@ declare global { const RESIZE_THROTTLE_TIME_MS = 500; const CELL_HEIGHT = 30; const LEGEND_HEIGHT = 34; + const Y_AXIS_HEIGHT = 24; -export const SWIM_LANE_LABEL_WIDTH = 200; + +export const SWIM_LANE_LABEL_WIDTH = Y_AXIS_LABEL_WIDTH + 2 * Y_AXIS_LABEL_PADDING; export function isViewBySwimLaneData(arg: any): arg is ViewBySwimLaneData { return arg && arg.hasOwnProperty('cardinality'); @@ -125,6 +134,7 @@ export interface SwimlaneProps { filterActive?: boolean; maskAll?: boolean; timeBuckets: InstanceType; + showLegend?: boolean; swimlaneData: OverallSwimlaneData | ViewBySwimLaneData; swimlaneType: SwimlaneType; selection?: AppStateSelectedCells; @@ -145,6 +155,7 @@ export interface SwimlaneProps { * Enables/disables timeline on the X-axis. */ showTimeline?: boolean; + annotationsData?: AnnotationsTable['annotationsData']; } /** @@ -168,6 +179,8 @@ export const SwimlaneContainer: FC = ({ timeBuckets, maskAll, showTimeline = true, + showLegend = true, + annotationsData, 'data-test-subj': dataTestSubj, }) => { const [chartWidth, setChartWidth] = useState(0); @@ -292,13 +305,14 @@ export const SwimlaneContainer: FC = ({ }, yAxisLabel: { visible: true, - width: 170, + width: Y_AXIS_LABEL_WIDTH, // eui color subdued - fill: `#6a717d`, - padding: 8, + fill: Y_AXIS_LABEL_FONT_COLOR, + padding: Y_AXIS_LABEL_PADDING, formatter: (laneLabel: string) => { return laneLabel === '' ? EMPTY_FIELD_VALUE_LABEL : laneLabel; }, + fontSize: 12, }, xAxisLabel: { visible: true, @@ -309,6 +323,7 @@ export const SwimlaneContainer: FC = ({ const scaledDateFormat = timeBuckets.getScaledDateFormat(); return moment(v).format(scaledDateFormat); }, + fontSize: 12, }, brushMask: { fill: isDarkTheme ? 'rgb(30,31,35,80%)' : 'rgb(247,247,247,50%)', @@ -354,6 +369,14 @@ export const SwimlaneContainer: FC = ({ [swimlaneData?.fieldName] ); + const xDomain = swimlaneData + ? { + min: swimlaneData.earliest * 1000, + max: swimlaneData.latest * 1000, + minInterval: swimlaneData.interval * 1000, + } + : undefined; + // A resize observer is required to compute the bucket span based on the chart width to fetch the data accordingly return ( @@ -372,77 +395,95 @@ export const SwimlaneContainer: FC = ({ }} grow={false} > -
- {showSwimlane && !isLoading && ( - - +
+ {showSwimlane && !isLoading && ( + + + + + + )} + + {isLoading && ( + - - - )} - - {isLoading && ( - - + + + )} + {!isLoading && !showSwimlane && ( + {noDataWarning}

} /> - - )} - {!isLoading && !showSwimlane && ( - {noDataWarning}} - /> - )} - + )} + + {swimlaneType === SWIMLANE_TYPE.OVERALL && + showSwimlane && + xDomain !== undefined && + !isLoading && ( + + {(tooltipService) => ( + + )} + + )} + {isPaginationVisible && ( diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts index 6693d1cd6de74..fe0329851758c 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts +++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts @@ -642,7 +642,6 @@ export class JobCreator { this._job_config.custom_settings !== undefined && this._job_config.custom_settings[setting] !== undefined ) { - // @ts-expect-error return this._job_config.custom_settings[setting]; } return null; @@ -711,13 +710,14 @@ export class JobCreator { } private _extractRuntimeMappings() { - const runtimeFieldMap = this._indexPattern.toSpec().runtimeFieldMap; + const runtimeFieldMap = this._indexPattern.toSpec().runtimeFieldMap as + | RuntimeMappings + | undefined; if (runtimeFieldMap !== undefined) { if (this._datafeed_config.runtime_mappings === undefined) { this._datafeed_config.runtime_mappings = {}; } Object.entries(runtimeFieldMap).forEach(([key, val]) => { - // @ts-expect-error this._datafeed_config.runtime_mappings![key] = val; }); } diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts index bf354b8ad984f..68476bb928121 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts +++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/default_configs.ts @@ -11,7 +11,7 @@ import { Job, Datafeed, Detector } from '../../../../../../../common/types/anoma import { splitIndexPatternNames } from '../../../../../../../common/util/job_utils'; export function createEmptyJob(): Job { - // @ts-expect-error + // @ts-expect-error incomplete job return { job_id: '', description: '', @@ -28,7 +28,7 @@ export function createEmptyJob(): Job { } export function createEmptyDatafeed(indexPatternTitle: IndexPatternTitle): Datafeed { - // @ts-expect-error + // @ts-expect-error incomplete datafeed return { datafeed_id: '', job_id: '', diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts index 670447826dcdd..7f1ee2349c2c1 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts +++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts @@ -9,7 +9,7 @@ import { Job, Datafeed } from '../../../../../../../common/types/anomaly_detecti import { filterRuntimeMappings } from './filter_runtime_mappings'; function getJob(): Job { - // @ts-expect-error + // @ts-expect-error incomplete job type for test return { job_id: 'test', description: '', diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx index 10c160f58ff77..d3108eef04983 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx @@ -171,8 +171,10 @@ export const AdvancedDetectorModal: FC = ({ byField, overField, partitionField, - // @ts-expect-error - excludeFrequent: excludeFrequentOption.label !== '' ? excludeFrequentOption.label : null, + excludeFrequent: + excludeFrequentOption.label !== '' + ? (excludeFrequentOption.label as estypes.ExcludeFrequent) + : null, description: descriptionOption !== '' ? descriptionOption : null, customRules: null, }; diff --git a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx index ae3b35bbb2b91..5b16bf8352b27 100644 --- a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx +++ b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx @@ -38,7 +38,7 @@ export const fileBasedRouteFactory = ( ], }); -const PageWrapper: FC = ({ location, deps }) => { +const PageWrapper: FC = ({ deps }) => { const { redirectToMlAccessDeniedPage } = deps; const { context } = useResolver(undefined, undefined, deps.config, { @@ -47,9 +47,10 @@ const PageWrapper: FC = ({ location, deps }) => { checkFindFileStructurePrivilege: () => checkFindFileStructurePrivilegeResolver(redirectToMlAccessDeniedPage), }); + return ( - + ); }; diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts index 88c98b888f5e6..f3f9e935a92c7 100644 --- a/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts +++ b/x-pack/plugins/ml/public/application/services/ml_api_service/annotations.ts @@ -19,9 +19,9 @@ export const annotations = { earliestMs: number; latestMs: number; maxAnnotations: number; - fields: FieldToBucket[]; - detectorIndex: number; - entities: any[]; + fields?: FieldToBucket[]; + detectorIndex?: number; + entities?: any[]; }) { const body = JSON.stringify(obj); return http$({ diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js index 3725f57eab026..9eb2390b4bf99 100644 --- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js +++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js @@ -1135,7 +1135,7 @@ class TimeseriesChartIntl extends Component { .attr('y', cxtChartHeight + swlHeight + 2) .attr('height', ANNOTATION_SYMBOL_HEIGHT) .attr('width', (d) => { - const start = this.contextXScale(moment(d.timestamp)) + 1; + const start = Math.max(this.contextXScale(moment(d.timestamp)) + 1, contextXRangeStart); const end = typeof d.end_timestamp !== 'undefined' ? this.contextXScale(moment(d.end_timestamp)) - 1 diff --git a/x-pack/plugins/ml/public/application/util/dependency_cache.ts b/x-pack/plugins/ml/public/application/util/dependency_cache.ts index 215f087020d6f..759d0dcc68741 100644 --- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts +++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts @@ -23,7 +23,7 @@ import type { IndexPatternsContract, DataPublicPluginStart } from 'src/plugins/d import type { SharePluginStart } from 'src/plugins/share/public'; import type { SecurityPluginSetup } from '../../../../security/public'; import type { MapsStartApi } from '../../../../maps/public'; -import type { FileUploadPluginStart } from '../../../../file_upload/public'; +import type { FileDataVisualizerPluginStart } from '../../../../file_data_visualizer/public'; export interface DependencyCache { timefilter: DataPublicPluginSetup['query']['timefilter'] | null; @@ -44,7 +44,7 @@ export interface DependencyCache { i18n: I18nStart | null; urlGenerators: SharePluginStart['urlGenerators'] | null; maps: MapsStartApi | null; - fileUpload: FileUploadPluginStart | null; + fileDataVisualizer: FileDataVisualizerPluginStart | null; } const cache: DependencyCache = { @@ -66,7 +66,7 @@ const cache: DependencyCache = { i18n: null, urlGenerators: null, maps: null, - fileUpload: null, + fileDataVisualizer: null, }; export function setDependencyCache(deps: Partial) { @@ -87,7 +87,7 @@ export function setDependencyCache(deps: Partial) { cache.security = deps.security || null; cache.i18n = deps.i18n || null; cache.urlGenerators = deps.urlGenerators || null; - cache.fileUpload = deps.fileUpload || null; + cache.fileDataVisualizer = deps.fileDataVisualizer || null; } export function getTimefilter() { @@ -214,9 +214,9 @@ export function clearCache() { }); } -export function getFileUpload() { - if (cache.fileUpload === null) { - throw new Error("fileUpload hasn't been initialized"); +export function getFileDataVisualizer() { + if (cache.fileDataVisualizer === null) { + throw new Error("fileDataVisualizer hasn't been initialized"); } - return cache.fileUpload; + return cache.fileDataVisualizer; } diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts index f6d5da92f5e71..1ab47256b2c2a 100644 --- a/x-pack/plugins/ml/public/plugin.ts +++ b/x-pack/plugins/ml/public/plugin.ts @@ -52,7 +52,7 @@ import { TriggersAndActionsUIPublicPluginStart, } from '../../triggers_actions_ui/public'; import { registerMlAlerts } from './alerting/register_ml_alerts'; -import { FileUploadPluginStart } from '../../file_upload/public'; +import { FileDataVisualizerPluginStart } from '../../file_data_visualizer/public'; export interface MlStartDependencies { data: DataPublicPluginStart; @@ -64,7 +64,7 @@ export interface MlStartDependencies { maps?: MapsStartApi; lens?: LensPublicStart; triggersActionsUi?: TriggersAndActionsUIPublicPluginStart; - fileUpload: FileUploadPluginStart; + fileDataVisualizer: FileDataVisualizerPluginStart; } export interface MlSetupDependencies { @@ -121,7 +121,7 @@ export class MlPlugin implements Plugin { lens: pluginsStart.lens, kibanaVersion, triggersActionsUi: pluginsStart.triggersActionsUi, - fileUpload: pluginsStart.fileUpload, + fileDataVisualizer: pluginsStart.fileDataVisualizer, }, params ); diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts index 1f5bbe8ac0fd4..1cefa48cf6c8c 100644 --- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts +++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts @@ -180,13 +180,13 @@ export function calculateModelMemoryLimitProvider( // if max_model_memory_limit has been set, // make sure the estimated value is not greater than it. if (allowMMLGreaterThanMax === false) { - // @ts-expect-error + // @ts-expect-error numeral missing value const mmlBytes = numeral(estimatedModelMemoryLimit).value(); if (maxModelMemoryLimit !== undefined) { - // @ts-expect-error + // @ts-expect-error numeral missing value const maxBytes = numeral(maxModelMemoryLimit).value(); if (mmlBytes > maxBytes) { - // @ts-expect-error + // @ts-expect-error numeral missing value modelMemoryLimit = `${Math.floor(maxBytes / numeral('1MB').value())}MB`; mmlCappedAtMax = true; } @@ -195,10 +195,10 @@ export function calculateModelMemoryLimitProvider( // if we've not already capped the estimated mml at the hard max server setting // ensure that the estimated mml isn't greater than the effective max mml if (mmlCappedAtMax === false && effectiveMaxModelMemoryLimit !== undefined) { - // @ts-expect-error + // @ts-expect-error numeral missing value const effectiveMaxMmlBytes = numeral(effectiveMaxModelMemoryLimit).value(); if (mmlBytes > effectiveMaxMmlBytes) { - // @ts-expect-error + // @ts-expect-error numeral missing value modelMemoryLimit = `${Math.floor(effectiveMaxMmlBytes / numeral('1MB').value())}MB`; } } diff --git a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts index 96bd74b9880a6..d08263f786354 100644 --- a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts +++ b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts @@ -47,8 +47,7 @@ export class CalendarManager { } async getAllCalendars() { - // @ts-expect-error missing size argument - const { body } = await this._mlClient.getCalendars({ size: 1000 }); + const { body } = await this._mlClient.getCalendars({ body: { page: { from: 0, size: 1000 } } }); const events: ScheduledEvent[] = await this._eventManager.getAllEvents(); const calendars: Calendar[] = body.calendars as Calendar[]; diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts index 4a7f08667fb10..216a4379c7c89 100644 --- a/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts +++ b/x-pack/plugins/ml/server/models/data_frame_analytics/validation.ts @@ -270,11 +270,11 @@ async function getValidationCheckMessages( }, }); - // @ts-expect-error + // @ts-expect-error incorrect search response type const totalDocs = body.hits.total.value; if (body.aggregations) { - // @ts-expect-error + // @ts-expect-error incorrect search response type Object.entries(body.aggregations).forEach(([aggName, { doc_count: docCount, value }]) => { if (docCount !== undefined) { const empty = docCount / totalDocs; diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts index 21ed258a0b764..81db7ca15b258 100644 --- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts +++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts @@ -288,7 +288,7 @@ export class DataRecognizer { body: searchBody, }); - // @ts-expect-error fix search response + // @ts-expect-error incorrect search response type return body.hits.total.value > 0; } @@ -1181,13 +1181,13 @@ export class DataRecognizer { return; } - // @ts-expect-error + // @ts-expect-error numeral missing value const maxBytes: number = numeral(maxMml.toUpperCase()).value(); for (const job of moduleConfig.jobs) { const mml = job.config?.analysis_limits?.model_memory_limit; if (mml !== undefined) { - // @ts-expect-error + // @ts-expect-error numeral missing value const mmlBytes: number = numeral(mml.toUpperCase()).value(); if (mmlBytes > maxBytes) { // if the job's mml is over the max, @@ -1306,7 +1306,7 @@ export class DataRecognizer { const job = jobs.find((j) => j.id === `${jobPrefix}${jobSpecificOverride.job_id}`); if (job !== undefined) { // delete the job_id in the override as this shouldn't be overridden - // @ts-expect-error + // @ts-expect-error missing job_id delete jobSpecificOverride.job_id; merge(job.config, jobSpecificOverride); processArrayValues(job.config, jobSpecificOverride); diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts index e7c723ba16aba..54173d75938d8 100644 --- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts +++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts @@ -674,7 +674,7 @@ export class DataVisualizer { }); const aggregations = body.aggregations; - // @ts-expect-error fix search response + // @ts-expect-error incorrect search response type const totalCount = body.hits.total.value; const stats = { totalCount, @@ -762,7 +762,7 @@ export class DataVisualizer { size, body: searchBody, }); - // @ts-expect-error fix search response + // @ts-expect-error incorrect search response type return body.hits.total.value > 0; } @@ -1249,7 +1249,7 @@ export class DataVisualizer { fieldName: field, examples: [] as any[], }; - // @ts-expect-error fix search response + // @ts-expect-error incorrect search response type if (body.hits.total.value > 0) { const hits = body.hits.hits; for (let i = 0; i < hits.length; i++) { diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts index eb4c32e1a1cc4..cfe0bcc532630 100644 --- a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts +++ b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts @@ -194,7 +194,7 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) { } const aggResult = fieldsToAgg.reduce((obj, field) => { - // @ts-expect-error fix search aggregation response + // @ts-expect-error incorrect search response type obj[field] = (aggregations[field] || { value: 0 }).value; return obj; }, {} as { [field: string]: number }); @@ -250,14 +250,14 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) { }); if (aggregations && aggregations.earliest && aggregations.latest) { - // @ts-expect-error fix search aggregation response + // @ts-expect-error incorrect search response type obj.start.epoch = aggregations.earliest.value; - // @ts-expect-error fix search aggregation response + // @ts-expect-error incorrect search response type obj.start.string = aggregations.earliest.value_as_string; - // @ts-expect-error fix search aggregation response + // @ts-expect-error incorrect search response type obj.end.epoch = aggregations.latest.value; - // @ts-expect-error fix search aggregation response + // @ts-expect-error incorrect search response type obj.end.string = aggregations.latest.value_as_string; } return obj; @@ -416,7 +416,7 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) { } const aggResult = fieldsToAgg.reduce((obj, field) => { - // @ts-expect-error fix search aggregation response + // @ts-expect-error incorrect search response type obj[field] = (aggregations[getMaxBucketAggKey(field)] || { value: 0 }).value ?? 0; return obj; }, {} as { [field: string]: number }); diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts index d0d824a88f5a9..0dcef210c10ce 100644 --- a/x-pack/plugins/ml/server/models/job_service/jobs.ts +++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts @@ -188,6 +188,7 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) { processed_record_count: job.data_counts?.processed_record_count, earliestStartTimestampMs: getEarliestDatafeedStartTime( dataCounts?.latest_record_timestamp, + // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp dataCounts?.latest_bucket_timestamp, parseTimeIntervalForJob(job.analysis_config?.bucket_span) ), @@ -203,6 +204,7 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) { earliestTimestampMs: dataCounts?.earliest_record_timestamp, latestResultsTimestampMs: getLatestDataOrBucketTimestamp( dataCounts?.latest_record_timestamp, + // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp dataCounts?.latest_bucket_timestamp ), isSingleMetricViewerJob: errorMessage === undefined, @@ -244,6 +246,7 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) { if (dataCounts !== undefined) { timeRange.to = getLatestDataOrBucketTimestamp( dataCounts.latest_record_timestamp as number, + // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp dataCounts.latest_bucket_timestamp as number ); timeRange.from = dataCounts.earliest_record_timestamp; @@ -319,7 +322,6 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) { (ds) => ds.datafeed_id === datafeed.datafeed_id ); if (datafeedStats) { - // @ts-expect-error datafeeds[datafeed.job_id] = { ...datafeed, ...datafeedStats }; } } @@ -388,7 +390,7 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) { if (jobStatsResults && jobStatsResults.jobs) { const jobStats = jobStatsResults.jobs.find((js) => js.job_id === tempJob.job_id); if (jobStats !== undefined) { - // @ts-expect-error + // @ts-expect-error @elastic-elasticsearch JobStats type is incomplete tempJob = { ...tempJob, ...jobStats }; if (jobStats.node) { tempJob.node = jobStats.node; @@ -401,6 +403,7 @@ export function jobsProvider(client: IScopedClusterClient, mlClient: MlClient) { const latestBucketTimestamp = latestBucketTimestampByJob && latestBucketTimestampByJob[tempJob.job_id]; if (latestBucketTimestamp) { + // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp tempJob.data_counts.latest_bucket_timestamp = latestBucketTimestamp; } } diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts index 82d6f6ca3e103..87715d9d85dbf 100644 --- a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts +++ b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts @@ -81,7 +81,7 @@ export function topCategoriesProvider(mlClient: MlClient) { const catCounts: Array<{ id: CategoryId; count: number; - // @ts-expect-error + // @ts-expect-error incorrect search response type }> = body.aggregations?.cat_count?.buckets.map((c: any) => ({ id: c.key, count: c.doc_count, @@ -126,7 +126,7 @@ export function topCategoriesProvider(mlClient: MlClient) { [] ); - // @ts-expect-error + // @ts-expect-error incorrect search response type return body.hits.hits?.map((c: { _source: Category }) => c._source) || []; } diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts index 64dfb84be8668..a5483491f1357 100644 --- a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts +++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts @@ -161,7 +161,7 @@ describe('ML - validateJob', () => { function: '', }); payload.job.analysis_config.detectors.push({ - // @ts-expect-error + // @ts-expect-error incorrect type on purpose for test function: undefined, }); diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts index 94e9a8dc7bffb..00a51d1e4e153 100644 --- a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts +++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts @@ -13,7 +13,7 @@ import { getMessages, MessageId, JobValidationMessage } from '../../../common/co import { VALIDATION_STATUS } from '../../../common/constants/validation'; import { basicJobValidation, uniqWithIsEqual } from '../../../common/util/job_utils'; -// @ts-expect-error +// @ts-expect-error importing js file import { validateBucketSpan } from './validate_bucket_span'; import { validateCardinality } from './validate_cardinality'; import { validateInfluencers } from './validate_influencers'; diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts index 44c5e3cabb18f..823d4c0adda49 100644 --- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts +++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts @@ -216,7 +216,7 @@ describe('ML - validateModelMemoryLimit', () => { const dtrs = createDetectors(2); const job = getJobConfig(['instance'], dtrs); const duration = { start: 0, end: 1 }; - // @ts-expect-error + // @ts-expect-error incorrect type on purpose for test delete mlInfoResponse.limits.max_model_memory_limit; job.analysis_limits!.model_memory_limit = '10mb'; diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts index 47e34626062d1..3c8a965333789 100644 --- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts +++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts @@ -69,14 +69,14 @@ export async function validateModelMemoryLimit( true, job.datafeed_config ); - // @ts-expect-error + // @ts-expect-error numeral missing value const mmlEstimateBytes: number = numeral(modelMemoryLimit).value(); let runEstimateGreaterThenMml = true; // if max_model_memory_limit has been set, // make sure the estimated value is not greater than it. if (typeof maxModelMemoryLimit !== 'undefined') { - // @ts-expect-error + // @ts-expect-error numeral missing value const maxMmlBytes: number = numeral(maxModelMemoryLimit).value(); if (mmlEstimateBytes > maxMmlBytes) { runEstimateGreaterThenMml = false; @@ -93,7 +93,7 @@ export async function validateModelMemoryLimit( // do not run this if we've already found that it's larger than // the max mml if (runEstimateGreaterThenMml && mml !== null) { - // @ts-expect-error + // @ts-expect-error numeral missing value const mmlBytes: number = numeral(mml).value(); if (mmlBytes < MODEL_MEMORY_LIMIT_MINIMUM_BYTES) { messages.push({ @@ -120,11 +120,11 @@ export async function validateModelMemoryLimit( // make sure the user defined MML is not greater than it if (mml !== null) { let maxMmlExceeded = false; - // @ts-expect-error + // @ts-expect-error numeral missing value const mmlBytes = numeral(mml).value(); if (maxModelMemoryLimit !== undefined) { - // @ts-expect-error + // @ts-expect-error numeral missing value const maxMmlBytes = numeral(maxModelMemoryLimit).value(); if (mmlBytes > maxMmlBytes) { maxMmlExceeded = true; @@ -137,7 +137,7 @@ export async function validateModelMemoryLimit( } if (effectiveMaxModelMemoryLimit !== undefined && maxMmlExceeded === false) { - // @ts-expect-error + // @ts-expect-error numeral missing value const effectiveMaxMmlBytes = numeral(effectiveMaxModelMemoryLimit).value(); if (mmlBytes > effectiveMaxMmlBytes) { messages.push({ diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.ts b/x-pack/plugins/ml/server/models/results_service/results_service.ts index 1996acd2cdb06..225a988298b1c 100644 --- a/x-pack/plugins/ml/server/models/results_service/results_service.ts +++ b/x-pack/plugins/ml/server/models/results_service/results_service.ts @@ -183,7 +183,7 @@ export function resultsServiceProvider(mlClient: MlClient) { anomalies: [], interval: 'second', }; - // @ts-expect-error update to correct search response + // @ts-expect-error incorrect search response type if (body.hits.total.value > 0) { let records: AnomalyRecordDoc[] = []; body.hits.hits.forEach((hit: any) => { @@ -402,7 +402,7 @@ export function resultsServiceProvider(mlClient: MlClient) { ); const examplesByCategoryId: { [key: string]: any } = {}; - // @ts-expect-error update to correct search response + // @ts-expect-error incorrect search response type if (body.hits.total.value > 0) { body.hits.hits.forEach((hit: any) => { if (maxExamples) { @@ -439,7 +439,7 @@ export function resultsServiceProvider(mlClient: MlClient) { ); const definition = { categoryId, terms: null, regex: null, examples: [] }; - // @ts-expect-error update to correct search response + // @ts-expect-error incorrect search response type if (body.hits.total.value > 0) { const source = body.hits.hits[0]._source; definition.categoryId = source.category_id; @@ -579,7 +579,7 @@ export function resultsServiceProvider(mlClient: MlClient) { ); if (fieldToBucket === JOB_ID) { finalResults = { - // @ts-expect-error update search response + // @ts-expect-error incorrect search response type jobs: results.aggregations?.unique_terms?.buckets.map( (b: { key: string; doc_count: number }) => b.key ), @@ -592,7 +592,7 @@ export function resultsServiceProvider(mlClient: MlClient) { }, {} ); - // @ts-expect-error update search response + // @ts-expect-error incorrect search response type results.aggregations.jobs.buckets.forEach( (bucket: { key: string | number; unique_stopped_partitions: { buckets: any[] } }) => { jobs[bucket.key] = bucket.unique_stopped_partitions.buckets.map((b) => b.key); diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json index 6b396b1c59642..d887cfc885253 100644 --- a/x-pack/plugins/ml/tsconfig.json +++ b/x-pack/plugins/ml/tsconfig.json @@ -24,7 +24,7 @@ { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" }, { "path": "../cloud/tsconfig.json" }, { "path": "../features/tsconfig.json" }, - { "path": "../file_upload/tsconfig.json" }, + { "path": "../file_data_visualizer/tsconfig.json" }, { "path": "../license_management/tsconfig.json" }, { "path": "../licensing/tsconfig.json" }, { "path": "../maps/tsconfig.json" }, diff --git a/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx b/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx index 7efddcfe66b0b..2f09b20efd8a1 100644 --- a/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx +++ b/x-pack/plugins/monitoring/public/components/apm/apm_metrics.tsx @@ -30,6 +30,11 @@ interface Props { metrics: { [key: string]: unknown }; seriesToShow: unknown[]; title: string; + summary: { + config: { + container: boolean; + }; + }; } const createCharts = (series: unknown[], props: Partial) => { @@ -42,8 +47,13 @@ const createCharts = (series: unknown[], props: Partial) => { }); }; -export const ApmMetrics = ({ stats, metrics, seriesToShow, title, ...props }: Props) => { - const topSeries = [metrics.apm_cpu, metrics.apm_memory, metrics.apm_os_load]; +export const ApmMetrics = ({ stats, metrics, seriesToShow, title, summary, ...props }: Props) => { + if (!metrics) { + return null; + } + const topSeries = [metrics.apm_cpu, metrics.apm_os_load]; + const { config } = summary || stats; + topSeries.push(config.container ? metrics.apm_memory_cgroup : metrics.apm_memory); return ( diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js index 8236dd0ff8f7f..9cce241aae3ce 100644 --- a/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js +++ b/x-pack/plugins/monitoring/public/components/cluster/overview/elasticsearch_panel.js @@ -356,7 +356,7 @@ export function ElasticsearchPanel(props) { - + diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js b/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js index 3380784b46f4b..9fe22a6a4f85b 100644 --- a/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js +++ b/x-pack/plugins/monitoring/public/components/cluster/overview/helpers.js @@ -27,16 +27,32 @@ export function HealthLabel(props) { }); } - if (props.status === 'yellow') { - return i18n.translate('xpack.monitoring.cluster.health.replicaShards', { - defaultMessage: 'Missing replica shards', - }); + const { product, status } = props; + if (product === 'es') { + if (props.status === 'yellow') { + return i18n.translate('xpack.monitoring.cluster.health.replicaShards', { + defaultMessage: 'Missing replica shards', + }); + } + + if (props.status === 'red') { + return i18n.translate('xpack.monitoring.cluster.health.primaryShards', { + defaultMessage: 'Missing primary shards', + }); + } } - if (props.status === 'red') { - return i18n.translate('xpack.monitoring.cluster.health.primaryShards', { - defaultMessage: 'Missing primary shards', - }); + if (product === 'kb' && status === 'red') { + return ( + + {i18n.translate('xpack.monitoring.cluster.health.pluginIssues', { + defaultMessage: 'Some plugins are experiencing issues. Check ', + })} + + status + + + ); } return 'N/A'; @@ -55,7 +71,7 @@ export function HealthStatusIndicator(props) { - + diff --git a/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js b/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js index 1e9b7ed1eade7..ce09621b61df3 100644 --- a/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js +++ b/x-pack/plugins/monitoring/public/components/cluster/overview/kibana_panel.js @@ -49,7 +49,7 @@ export function KibanaPanel(props) { return null; } - const statusIndicator = ; + const statusIndicator = ; const goToKibana = () => getSafeForExternalLink('#/kibana'); const goToInstances = () => getSafeForExternalLink('#/kibana/instances'); diff --git a/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap b/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap index e9c89037c9053..f2ee1b2f6c2ab 100644 --- a/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap +++ b/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap @@ -461,6 +461,32 @@ Object { "usageField": "cpuacct.total.ns", "uuidField": "beats_stats.beat.uuid", }, + "apm_cgroup_memory_limit": ApmMetric { + "app": "apm", + "derivative": false, + "description": "Memory limit of the container", + "field": "beats_stats.metrics.beat.cgroup.memory.mem.limit.bytes", + "format": "0,0.0 b", + "label": "Memory Limit", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Memory", + "units": "B", + "uuidField": "beats_stats.beat.uuid", + }, + "apm_cgroup_memory_usage": ApmMetric { + "app": "apm", + "derivative": false, + "description": "Memory usage of the container", + "field": "beats_stats.metrics.beat.cgroup.memory.mem.usage.bytes", + "format": "0,0.0 b", + "label": "Memory Utilization (cgroup)", + "metricAgg": "max", + "timestampField": "beats_stats.timestamp", + "title": "Memory", + "units": "B", + "uuidField": "beats_stats.beat.uuid", + }, "apm_cpu_total": ApmCpuUtilizationMetric { "app": "apm", "calculation": [Function], diff --git a/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js index ecbd4c4204be0..7c779f31c684b 100644 --- a/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js +++ b/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js @@ -615,4 +615,37 @@ export const metrics = { defaultMessage: 'HTTP Requests received by agent configuration managemen', }), }), + apm_cgroup_memory_usage: new ApmMetric({ + field: 'beats_stats.metrics.beat.cgroup.memory.mem.usage.bytes', + label: i18n.translate('xpack.monitoring.metrics.apmInstance.memory.memoryUsageLabel', { + defaultMessage: 'Memory Utilization (cgroup)', + }), + title: instanceMemoryTitle, + description: i18n.translate( + 'xpack.monitoring.metrics.apmInstance.memory.memoryUsageDescription', + { + defaultMessage: 'Memory usage of the container', + } + ), + format: LARGE_BYTES, + metricAgg: 'max', + units: 'B', + }), + + apm_cgroup_memory_limit: new ApmMetric({ + field: 'beats_stats.metrics.beat.cgroup.memory.mem.limit.bytes', + label: i18n.translate('xpack.monitoring.metrics.apmInstance.memory.memoryLimitLabel', { + defaultMessage: 'Memory Limit', + }), + title: instanceMemoryTitle, + description: i18n.translate( + 'xpack.monitoring.metrics.apmInstance.memory.memoryLimitDescription', + { + defaultMessage: 'Memory limit of the container', + } + ), + format: LARGE_BYTES, + metricAgg: 'max', + units: 'B', + }), }; diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js index 69d6cb418f1f6..d6fc7cbd2c076 100644 --- a/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js +++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js @@ -18,6 +18,10 @@ export const metricSet = [ keys: ['apm_mem_alloc', 'apm_mem_rss', 'apm_mem_gc_next'], name: 'apm_memory', }, + { + keys: ['apm_cgroup_memory_usage', 'apm_cgroup_memory_limit', 'apm_mem_gc_next'], + name: 'apm_memory_cgroup', + }, { keys: ['apm_output_events_total', 'apm_output_events_active', 'apm_output_events_acked'], name: 'apm_output_events_rate_success', diff --git a/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js index bb1543477d7d7..b0dccb8dd34df 100644 --- a/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js +++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js @@ -18,6 +18,10 @@ export const metricSet = [ keys: ['apm_mem_alloc', 'apm_mem_rss', 'apm_mem_gc_next'], name: 'apm_memory', }, + { + keys: ['apm_cgroup_memory_usage', 'apm_cgroup_memory_limit', 'apm_mem_gc_next'], + name: 'apm_memory_cgroup', + }, { keys: ['apm_output_events_total', 'apm_output_events_active', 'apm_output_events_acked'], name: 'apm_output_events_rate_success', diff --git a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx index b81e5b5616d7b..1dbcdeaee800a 100644 --- a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx +++ b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx @@ -46,7 +46,7 @@ export function UptimeSection({ bucketSize }: Props) { const { data, status } = useFetcher( () => { if (bucketSize) { - return getDataHandler('uptime')?.fetchData({ + return getDataHandler('synthetics')?.fetchData({ absoluteTime: { start: absoluteStart, end: absoluteEnd }, relativeTime: { start: relativeStart, end: relativeEnd }, bucketSize, @@ -58,7 +58,7 @@ export function UptimeSection({ bucketSize }: Props) { [bucketSize, relativeStart, relativeEnd, forceUpdate] ); - if (!hasData.uptime?.hasData) { + if (!hasData.synthetics?.hasData) { return null; } diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_latency_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_latency_config.ts index 3959860b9c53c..1c2627dac30e7 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_latency_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_latency_config.ts @@ -19,11 +19,13 @@ export function getServiceLatencyLensConfig({ seriesId, indexPattern }: ConfigPr xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'average', - sourceField: 'transaction.duration.us', - label: 'Latency', - }, + yAxisColumns: [ + { + operationType: 'average', + sourceField: 'transaction.duration.us', + label: 'Latency', + }, + ], hasOperationType: true, defaultFilters: [ 'user_agent.name', diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_throughput_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_throughput_config.ts index d4a44a5c95a0b..2de2cbdfd75a6 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_throughput_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/apm/service_throughput_config.ts @@ -22,11 +22,13 @@ export function getServiceThroughputLensConfig({ xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'average', - sourceField: 'transaction.duration.us', - label: 'Throughput', - }, + yAxisColumns: [ + { + operationType: 'average', + sourceField: 'transaction.duration.us', + label: 'Throughput', + }, + ], hasOperationType: true, defaultFilters: [ 'user_agent.name', diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts index 2c5b4ebea0ab3..f9637dc653d2c 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts @@ -33,7 +33,7 @@ export const getDefaultConfigs = ({ reportType, seriesId, indexPattern }: Props) case 'uptime-duration': return getMonitorDurationConfig({ seriesId }); case 'uptime-pings': - return getMonitorPingsConfig({ seriesId }); + return getMonitorPingsConfig({ seriesId, indexPattern }); case 'service-latency': return getServiceLatencyLensConfig({ seriesId, indexPattern }); case 'service-throughput': diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts index 01d74dc2ac36b..146f488450f3a 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.ts @@ -23,6 +23,7 @@ import { DataType, OperationMetadata, FieldBasedIndexPatternColumn, + SumIndexPatternColumn, } from '../../../../../../lens/public'; import { buildPhraseFilter, @@ -95,8 +96,12 @@ export class LensAttributes { this.filters = filters ?? []; this.reportDefinitions = reportDefinitions ?? {}; - if (typeof reportViewConfig.yAxisColumn.operationType !== undefined && operationType) { - reportViewConfig.yAxisColumn.operationType = operationType as FieldBasedIndexPatternColumn['operationType']; + if (operationType) { + reportViewConfig.yAxisColumns.forEach((yAxisColumn) => { + if (typeof yAxisColumn.operationType !== undefined) { + yAxisColumn.operationType = operationType as FieldBasedIndexPatternColumn['operationType']; + } + }); } this.seriesType = seriesType ?? reportViewConfig.defaultSeriesType; this.reportViewConfig = reportViewConfig; @@ -123,7 +128,12 @@ export class LensAttributes { }, }; - this.layers.layer1.columnOrder = ['x-axis-column', 'break-down-column', 'y-axis-column']; + this.layers.layer1.columnOrder = [ + 'x-axis-column', + 'break-down-column', + 'y-axis-column', + ...Object.keys(this.getChildYAxises()), + ]; this.visualization.layers[0].splitAccessor = 'break-down-column'; } @@ -152,10 +162,15 @@ export class LensAttributes { }; } - getNumberColumn(sourceField: string, columnType?: string, operationType?: string) { + getNumberColumn( + sourceField: string, + columnType?: string, + operationType?: string, + label?: string + ) { if (columnType === 'operation' || operationType) { - if (operationType === 'median' || operationType === 'average') { - return this.getNumberOperationColumn(sourceField, operationType); + if (operationType === 'median' || operationType === 'average' || operationType === 'sum') { + return this.getNumberOperationColumn(sourceField, operationType, label); } if (operationType?.includes('th')) { return this.getPercentileNumberColumn(sourceField, operationType); @@ -166,17 +181,20 @@ export class LensAttributes { getNumberOperationColumn( sourceField: string, - operationType: 'average' | 'median' - ): AvgIndexPatternColumn | MedianIndexPatternColumn { + operationType: 'average' | 'median' | 'sum', + label?: string + ): AvgIndexPatternColumn | MedianIndexPatternColumn | SumIndexPatternColumn { return { ...buildNumberColumn(sourceField), - label: i18n.translate('xpack.observability.expView.columns.operation.label', { - defaultMessage: '{operationType} of {sourceField}', - values: { - sourceField: this.reportViewConfig.labels[sourceField], - operationType: capitalize(operationType), - }, - }), + label: + label || + i18n.translate('xpack.observability.expView.columns.operation.label', { + defaultMessage: '{operationType} of {sourceField}', + values: { + sourceField: this.reportViewConfig.labels[sourceField], + operationType: capitalize(operationType), + }, + }), operationType, }; } @@ -211,10 +229,10 @@ export class LensAttributes { getXAxis() { const { xAxisColumn } = this.reportViewConfig; - return this.getColumnBasedOnType(xAxisColumn.sourceField!); + return this.getColumnBasedOnType(xAxisColumn.sourceField!, undefined, xAxisColumn.label); } - getColumnBasedOnType(sourceField: string, operationType?: OperationType) { + getColumnBasedOnType(sourceField: string, operationType?: OperationType, label?: string) { const { fieldMeta, columnType, fieldName } = this.getFieldMeta(sourceField); const { type: fieldType } = fieldMeta ?? {}; @@ -226,7 +244,7 @@ export class LensAttributes { return this.getDateHistogramColumn(fieldName); } if (fieldType === 'number') { - return this.getNumberColumn(fieldName, columnType, operationType); + return this.getNumberColumn(fieldName, columnType, operationType, label); } // FIXME review my approach again @@ -246,13 +264,32 @@ export class LensAttributes { } getMainYAxis() { - const { sourceField, operationType, label } = this.reportViewConfig.yAxisColumn; + const { sourceField, operationType, label } = this.reportViewConfig.yAxisColumns[0]; if (sourceField === 'Records' || !sourceField) { return this.getRecordsColumn(label); } - return this.getColumnBasedOnType(sourceField!, operationType); + return this.getColumnBasedOnType(sourceField!, operationType, label); + } + + getChildYAxises() { + const lensColumns: Record = {}; + const yAxisColumns = this.reportViewConfig.yAxisColumns; + // 1 means there is only main y axis + if (yAxisColumns.length === 1) { + return lensColumns; + } + for (let i = 1; i < yAxisColumns.length; i++) { + const { sourceField, operationType, label } = yAxisColumns[i]; + + lensColumns[`y-axis-column-${i}`] = this.getColumnBasedOnType( + sourceField!, + operationType, + label + ); + } + return lensColumns; } getRecordsColumn(label?: string): CountIndexPatternColumn { @@ -268,10 +305,11 @@ export class LensAttributes { getLayer() { return { - columnOrder: ['x-axis-column', 'y-axis-column'], + columnOrder: ['x-axis-column', 'y-axis-column', ...Object.keys(this.getChildYAxises())], columns: { 'x-axis-column': this.getXAxis(), 'y-axis-column': this.getMainYAxis(), + ...this.getChildYAxises(), }, incompleteColumns: {}, }; @@ -289,7 +327,7 @@ export class LensAttributes { preferredSeriesType: 'line', layers: [ { - accessors: ['y-axis-column'], + accessors: ['y-axis-column', ...Object.keys(this.getChildYAxises())], layerId: 'layer1', seriesType: this.seriesType ?? 'line', palette: this.reportViewConfig.palette, @@ -297,6 +335,7 @@ export class LensAttributes { xAccessor: 'x-axis-column', }, ], + ...(this.reportViewConfig.yTitle ? { yTitle: this.reportViewConfig.yTitle } : {}), }; } diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/logs/logs_frequency_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/logs/logs_frequency_config.ts index 9f8a336b59d34..97d915ede01a9 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/logs/logs_frequency_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/logs/logs_frequency_config.ts @@ -21,9 +21,11 @@ export function getLogsFrequencyLensConfig({ seriesId }: Props): DataSeries { xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'count', - }, + yAxisColumns: [ + { + operationType: 'count', + }, + ], hasOperationType: false, defaultFilters: [], breakdowns: ['agent.hostname'], diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/cpu_usage_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/cpu_usage_config.ts index d4b807de11f4e..28b381bd12473 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/cpu_usage_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/cpu_usage_config.ts @@ -21,11 +21,13 @@ export function getCPUUsageLensConfig({ seriesId }: Props): DataSeries { xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'average', - sourceField: 'system.cpu.user.pct', - label: 'CPU Usage %', - }, + yAxisColumns: [ + { + operationType: 'average', + sourceField: 'system.cpu.user.pct', + label: 'CPU Usage %', + }, + ], hasOperationType: true, defaultFilters: [], breakdowns: ['host.hostname'], diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/memory_usage_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/memory_usage_config.ts index 38d1c425fc09a..2bd0e4b032778 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/memory_usage_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/memory_usage_config.ts @@ -21,11 +21,13 @@ export function getMemoryUsageLensConfig({ seriesId }: Props): DataSeries { xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'average', - sourceField: 'system.memory.used.pct', - label: 'Memory Usage %', - }, + yAxisColumns: [ + { + operationType: 'average', + sourceField: 'system.memory.used.pct', + label: 'Memory Usage %', + }, + ], hasOperationType: true, defaultFilters: [], breakdowns: ['host.hostname'], diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/network_activity_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/network_activity_config.ts index 07a521225b38d..924701bc13490 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/network_activity_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/metrics/network_activity_config.ts @@ -21,10 +21,12 @@ export function getNetworkActivityLensConfig({ seriesId }: Props): DataSeries { xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'average', - sourceField: 'system.memory.used.pct', - }, + yAxisColumns: [ + { + operationType: 'average', + sourceField: 'system.memory.used.pct', + }, + ], hasOperationType: true, defaultFilters: [], breakdowns: ['host.hostname'], diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts index 6e8413b342ce5..f656bd764e8b0 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts @@ -37,10 +37,12 @@ export function getKPITrendsLensConfig({ seriesId, indexPattern }: ConfigProps): xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - sourceField: 'business.kpi', - operationType: 'median', - }, + yAxisColumns: [ + { + sourceField: 'business.kpi', + operationType: 'median', + }, + ], hasOperationType: false, defaultFilters: [ { diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts index 847e7db18757f..85380241b63b2 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts @@ -37,10 +37,12 @@ export function getPerformanceDistLensConfig({ seriesId, indexPattern }: ConfigP xAxisColumn: { sourceField: 'performance.metric', }, - yAxisColumn: { - sourceField: 'Records', - label: 'Pages loaded', - }, + yAxisColumns: [ + { + sourceField: 'Records', + label: 'Pages loaded', + }, + ], hasOperationType: false, defaultFilters: [ { diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_duration_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_duration_config.ts index 3b55f5b8eabc9..f27fd4476bfe0 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_duration_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_duration_config.ts @@ -21,13 +21,15 @@ export function getMonitorDurationConfig({ seriesId }: Props): DataSeries { xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'average', - sourceField: 'monitor.duration.us', - label: 'Monitor duration (ms)', - }, + yAxisColumns: [ + { + operationType: 'average', + sourceField: 'monitor.duration.us', + label: 'Monitor duration (ms)', + }, + ], hasOperationType: true, - defaultFilters: ['monitor.type', 'observer.geo.name', 'tags'], + defaultFilters: ['monitor.type', 'observer.geo.name', 'tags', 'monitor.name', 'monitor.id'], breakdowns: [ 'observer.geo.name', 'monitor.name', @@ -41,6 +43,12 @@ export function getMonitorDurationConfig({ seriesId }: Props): DataSeries { { field: 'monitor.id', }, + { + field: 'monitor.name', + }, + { + field: 'url.full', + }, ], labels: { ...FieldLabels, 'monitor.duration.us': 'Monitor duration' }, }; diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_pings_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_pings_config.ts index 68a36dcdcaf85..6ffc400394812 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_pings_config.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/monitor_pings_config.ts @@ -5,14 +5,10 @@ * 2.0. */ -import { DataSeries } from '../../types'; +import { ConfigProps, DataSeries } from '../../types'; import { FieldLabels } from '../constants'; -interface Props { - seriesId: string; -} - -export function getMonitorPingsConfig({ seriesId }: Props): DataSeries { +export function getMonitorPingsConfig({ seriesId }: ConfigProps): DataSeries { return { id: seriesId, reportType: 'uptime-pings', @@ -21,16 +17,28 @@ export function getMonitorPingsConfig({ seriesId }: Props): DataSeries { xAxisColumn: { sourceField: '@timestamp', }, - yAxisColumn: { - operationType: 'count', - label: 'Monitor pings', - }, + yAxisColumns: [ + { + operationType: 'sum', + sourceField: 'summary.up', + label: 'Up', + }, + { + operationType: 'sum', + sourceField: 'summary.down', + label: 'Down', + }, + ], + yTitle: 'Pings', hasOperationType: false, - defaultFilters: ['observer.geo.name'], - breakdowns: ['monitor.status', 'observer.geo.name', 'monitor.type'], + defaultFilters: ['observer.geo.name', 'monitor.type', 'monitor.name', 'monitor.id'], + breakdowns: ['observer.geo.name', 'monitor.type'], filters: [], palette: { type: 'palette', name: 'status' }, reportDefinitions: [ + { + field: 'monitor.name', + }, { field: 'monitor.id', }, diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts index c6b7b5d92d5f8..5d5cdb23d3520 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts @@ -55,3 +55,11 @@ export function buildPhraseFilter(field: string, value: any, indexPattern: IInde } return []; } + +export function buildExistsFilter(field: string, indexPattern: IIndexPattern) { + const fieldMeta = indexPattern.fields.find((fieldT) => fieldT.name === field); + if (fieldMeta) { + return [esFilters.buildExistsFilter(fieldMeta, indexPattern)]; + } + return []; +} diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx index 77d0d54ec5a7a..4f13cf6a1f9ca 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_app_index_pattern.tsx @@ -12,7 +12,7 @@ import { useKibana } from '../../../../../../../../src/plugins/kibana_react/publ import { ObservabilityPublicPluginsStart } from '../../../../plugin'; import { ObservabilityIndexPatterns } from '../utils/observability_index_patterns'; import { getDataHandler } from '../../../../data_handler'; -import { UXHasDataResponse } from '../../../../typings/fetch_overview_data'; +import { HasDataResponse } from '../../../../typings/fetch_overview_data'; export interface IIndexPatternContext { loading: boolean; @@ -48,7 +48,7 @@ export function IndexPatternContextProvider({ children }: ProviderProps) { } = useKibana(); const checkIfAppHasData = async (dataType: AppDataType) => { - const handler = getDataHandler(dataType === 'synthetics' ? 'uptime' : dataType); + const handler = getDataHandler(dataType); return handler?.hasData(); }; @@ -59,17 +59,15 @@ export function IndexPatternContextProvider({ children }: ProviderProps) { if (hasAppData[dataType] === null) { setLoading(true); try { - let hasDataT = await checkIfAppHasData(dataType); + const hasDataResponse = (await checkIfAppHasData(dataType)) as HasDataResponse; - if (dataType === 'ux') { - hasDataT = (hasDataT as UXHasDataResponse).hasData as boolean; - } + const hasDataT = hasDataResponse.hasData; setHasAppData((prevState) => ({ ...prevState, [dataType]: hasDataT })); if (hasDataT || hasAppData?.[dataType]) { const obsvIndexP = new ObservabilityIndexPatterns(data); - const indPattern = await obsvIndexP.getIndexPattern(dataType); + const indPattern = await obsvIndexP.getIndexPattern(dataType, hasDataResponse.indices); setIndexPatterns((prevState) => ({ ...prevState, [dataType]: indPattern })); } diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx index 0c4aef46406fd..0351508ebb59e 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx @@ -44,7 +44,7 @@ export function ReportDefinitionCol({ dataViewSeries }: { dataViewSeries: DataSe filters, defaultSeriesType, hasOperationType, - yAxisColumn, + yAxisColumns, } = dataViewSeries; const onChange = (field: string, value?: string) => { @@ -125,7 +125,7 @@ export function ReportDefinitionCol({ dataViewSeries }: { dataViewSeries: DataSe )} diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts index bd908661365c0..3878c1cde7aa5 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts @@ -53,7 +53,7 @@ export interface DataSeries { reportType: ReportViewType; id: string; xAxisColumn: Partial | Partial; - yAxisColumn: Partial; + yAxisColumns: Array>; breakdowns: string[]; defaultSeriesType: SeriesType; @@ -64,6 +64,7 @@ export interface DataSeries { labels: Record; hasOperationType: boolean; palette?: PaletteOutput; + yTitle?: string; } export interface SeriesUrl { diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.test.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.test.ts index f1347e1d21cc3..ade74e7c6744e 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.test.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.test.ts @@ -46,11 +46,13 @@ describe('ObservabilityIndexPatterns', function () { it('should return index pattern for app', async function () { const obsv = new ObservabilityIndexPatterns(data!); - const indexP = await obsv.getIndexPattern('ux'); + const indexP = await obsv.getIndexPattern('ux', 'heartbeat-8*,synthetics-*'); - expect(indexP).toEqual({ title: 'index-*' }); + expect(indexP).toEqual({ id: 'rum_static_index_pattern_id' }); - expect(data?.indexPatterns.get).toHaveBeenCalledWith(indexPatternList.ux); + expect(data?.indexPatterns.get).toHaveBeenCalledWith( + 'rum_static_index_pattern_id_heartbeat_8_synthetics_' + ); expect(data?.indexPatterns.get).toHaveBeenCalledTimes(1); }); @@ -59,18 +61,21 @@ describe('ObservabilityIndexPatterns', function () { throw new SavedObjectNotFound('index_pattern'); }); + data!.indexPatterns.createAndSave = jest.fn().mockReturnValue({ id: indexPatternList.ux }); + const obsv = new ObservabilityIndexPatterns(data!); - const indexP = await obsv.getIndexPattern('ux'); + const indexP = await obsv.getIndexPattern('ux', 'trace-*,apm-*'); expect(indexP).toEqual({ id: indexPatternList.ux }); expect(data?.indexPatterns.createAndSave).toHaveBeenCalledWith({ fieldFormats, - id: 'rum_static_index_pattern_id', + id: 'rum_static_index_pattern_id_trace_apm_', timeFieldName: '@timestamp', - title: '(rum-data-view)*,apm-*', + title: '(rum-data-view)*,trace-*,apm-*', }); + expect(data?.indexPatterns.createAndSave).toHaveBeenCalledTimes(1); }); diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts index b890df69d9936..c265bad56e864 100644 --- a/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts +++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/utils/observability_index_patterns.ts @@ -38,11 +38,22 @@ export const indexPatternList: Record = { }; const appToPatternMap: Record = { - synthetics: '(synthetics-data-view)*,heartbeat-*,synthetics-*', + synthetics: '(synthetics-data-view)*', apm: 'apm-*', - ux: '(rum-data-view)*,apm-*', - infra_logs: 'logs-*,filebeat-*', - infra_metrics: 'metrics-*,metricbeat-*', + ux: '(rum-data-view)*', + infra_logs: '', + infra_metrics: '', +}; + +const getAppIndicesWithPattern = (app: AppDataType, indices: string) => { + return `${appToPatternMap[app]},${indices}`; +}; + +const getAppIndexPatternId = (app: AppDataType, indices: string) => { + // Replace characters / ? , " < > | * with _ + const postfix = indices.replace(/[^A-Z0-9]+/gi, '_').toLowerCase(); + + return `${indexPatternList[app]}_${postfix}`; }; export function isParamsSame(param1: IFieldFormat['_params'], param2: FieldFormatParams) { @@ -65,16 +76,16 @@ export class ObservabilityIndexPatterns { this.data = data; } - async createIndexPattern(app: AppDataType) { + async createIndexPattern(app: AppDataType, indices: string) { if (!this.data) { throw new Error('data is not defined'); } - const pattern = appToPatternMap[app]; + const appIndicesPattern = getAppIndicesWithPattern(app, indices); return await this.data.indexPatterns.createAndSave({ - title: pattern, - id: indexPatternList[app], + title: appIndicesPattern, + id: getAppIndexPatternId(app, indices), timeFieldName: '@timestamp', fieldFormats: this.getFieldFormats(app), }); @@ -108,19 +119,27 @@ export class ObservabilityIndexPatterns { return fieldFormatMap; } - async getIndexPattern(app: AppDataType): Promise { + async getIndexPattern(app: AppDataType, indices: string): Promise { if (!this.data) { throw new Error('data is not defined'); } try { - const indexPattern = await this.data?.indexPatterns.get(indexPatternList[app]); + const indexPatternId = getAppIndexPatternId(app, indices); + const indexPatternTitle = getAppIndicesWithPattern(app, indices); + // we will get index pattern by id + const indexPattern = await this.data?.indexPatterns.get(indexPatternId); + + // and make sure title matches, otherwise, we will need to create it + if (indexPattern.title !== indexPatternTitle) { + return await this.createIndexPattern(app, indices); + } // this is intentional a non blocking call, so no await clause this.validateFieldFormats(app, indexPattern); return indexPattern; } catch (e: unknown) { if (e instanceof SavedObjectNotFound) { - return await this.createIndexPattern(app || 'apm'); + return await this.createIndexPattern(app, indices); } } } diff --git a/x-pack/plugins/observability/public/context/has_data_context.test.tsx b/x-pack/plugins/observability/public/context/has_data_context.test.tsx index 01655c0d7b2d7..b5a0806306461 100644 --- a/x-pack/plugins/observability/public/context/has_data_context.test.tsx +++ b/x-pack/plugins/observability/public/context/has_data_context.test.tsx @@ -36,7 +36,7 @@ function unregisterAll() { unregisterDataHandler({ appName: 'apm' }); unregisterDataHandler({ appName: 'infra_logs' }); unregisterDataHandler({ appName: 'infra_metrics' }); - unregisterDataHandler({ appName: 'uptime' }); + unregisterDataHandler({ appName: 'synthetics' }); unregisterDataHandler({ appName: 'ux' }); } @@ -88,7 +88,7 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: undefined, status: 'success' }, - uptime: { hasData: undefined, status: 'success' }, + synthetics: { hasData: undefined, status: 'success' }, infra_logs: { hasData: undefined, status: 'success' }, infra_metrics: { hasData: undefined, status: 'success' }, ux: { hasData: undefined, status: 'success' }, @@ -108,8 +108,14 @@ describe('HasDataContextProvider', () => { { appName: 'apm', hasData: async () => false }, { appName: 'infra_logs', hasData: async () => false }, { appName: 'infra_metrics', hasData: async () => false }, - { appName: 'uptime', hasData: async () => false }, - { appName: 'ux', hasData: async () => ({ hasData: false, serviceName: undefined }) }, + { + appName: 'synthetics', + hasData: async () => ({ hasData: false, indices: 'heartbeat-*, synthetics-*' }), + }, + { + appName: 'ux', + hasData: async () => ({ hasData: false, serviceName: undefined, indices: 'apm-*' }), + }, ]); }); @@ -130,10 +136,19 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: false, status: 'success' }, - uptime: { hasData: false, status: 'success' }, + synthetics: { + hasData: { + hasData: false, + indices: 'heartbeat-*, synthetics-*', + }, + status: 'success', + }, infra_logs: { hasData: false, status: 'success' }, infra_metrics: { hasData: false, status: 'success' }, - ux: { hasData: { hasData: false, serviceName: undefined }, status: 'success' }, + ux: { + hasData: { hasData: false, serviceName: undefined, indices: 'apm-*' }, + status: 'success', + }, alert: { hasData: [], status: 'success' }, }, hasAnyData: false, @@ -150,8 +165,14 @@ describe('HasDataContextProvider', () => { { appName: 'apm', hasData: async () => true }, { appName: 'infra_logs', hasData: async () => false }, { appName: 'infra_metrics', hasData: async () => false }, - { appName: 'uptime', hasData: async () => false }, - { appName: 'ux', hasData: async () => ({ hasData: false, serviceName: undefined }) }, + { + appName: 'synthetics', + hasData: async () => ({ hasData: false, indices: 'heartbeat-*, synthetics-*' }), + }, + { + appName: 'ux', + hasData: async () => ({ hasData: false, serviceName: undefined, indices: 'apm-*' }), + }, ]); }); @@ -172,10 +193,19 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: true, status: 'success' }, - uptime: { hasData: false, status: 'success' }, + synthetics: { + hasData: { + hasData: false, + indices: 'heartbeat-*, synthetics-*', + }, + status: 'success', + }, infra_logs: { hasData: false, status: 'success' }, infra_metrics: { hasData: false, status: 'success' }, - ux: { hasData: { hasData: false, serviceName: undefined }, status: 'success' }, + ux: { + hasData: { hasData: false, serviceName: undefined, indices: 'apm-*' }, + status: 'success', + }, alert: { hasData: [], status: 'success' }, }, hasAnyData: true, @@ -192,8 +222,14 @@ describe('HasDataContextProvider', () => { { appName: 'apm', hasData: async () => true }, { appName: 'infra_logs', hasData: async () => true }, { appName: 'infra_metrics', hasData: async () => true }, - { appName: 'uptime', hasData: async () => true }, - { appName: 'ux', hasData: async () => ({ hasData: true, serviceName: 'ux' }) }, + { + appName: 'synthetics', + hasData: async () => ({ hasData: true, indices: 'heartbeat-*, synthetics-*' }), + }, + { + appName: 'ux', + hasData: async () => ({ hasData: true, serviceName: 'ux', indices: 'apm-*' }), + }, ]); }); @@ -213,11 +249,23 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { - apm: { hasData: true, status: 'success' }, - uptime: { hasData: true, status: 'success' }, + apm: { + hasData: true, + status: 'success', + }, + synthetics: { + hasData: { + hasData: true, + indices: 'heartbeat-*, synthetics-*', + }, + status: 'success', + }, infra_logs: { hasData: true, status: 'success' }, infra_metrics: { hasData: true, status: 'success' }, - ux: { hasData: { hasData: true, serviceName: 'ux' }, status: 'success' }, + ux: { + hasData: { hasData: true, serviceName: 'ux', indices: 'apm-*' }, + status: 'success', + }, alert: { hasData: [], status: 'success' }, }, hasAnyData: true, @@ -253,7 +301,7 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: true, status: 'success' }, - uptime: { hasData: undefined, status: 'success' }, + synthetics: { hasData: undefined, status: 'success' }, infra_logs: { hasData: undefined, status: 'success' }, infra_metrics: { hasData: undefined, status: 'success' }, ux: { hasData: undefined, status: 'success' }, @@ -291,7 +339,7 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: false, status: 'success' }, - uptime: { hasData: undefined, status: 'success' }, + synthetics: { hasData: undefined, status: 'success' }, infra_logs: { hasData: undefined, status: 'success' }, infra_metrics: { hasData: undefined, status: 'success' }, ux: { hasData: undefined, status: 'success' }, @@ -317,8 +365,14 @@ describe('HasDataContextProvider', () => { }, { appName: 'infra_logs', hasData: async () => true }, { appName: 'infra_metrics', hasData: async () => true }, - { appName: 'uptime', hasData: async () => true }, - { appName: 'ux', hasData: async () => ({ hasData: true, serviceName: 'ux' }) }, + { + appName: 'synthetics', + hasData: async () => ({ hasData: true, indices: 'heartbeat-*, synthetics-*' }), + }, + { + appName: 'ux', + hasData: async () => ({ hasData: true, serviceName: 'ux', indices: 'apm-*' }), + }, ]); }); @@ -339,10 +393,19 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: undefined, status: 'failure' }, - uptime: { hasData: true, status: 'success' }, + synthetics: { + hasData: { + hasData: true, + indices: 'heartbeat-*, synthetics-*', + }, + status: 'success', + }, infra_logs: { hasData: true, status: 'success' }, infra_metrics: { hasData: true, status: 'success' }, - ux: { hasData: { hasData: true, serviceName: 'ux' }, status: 'success' }, + ux: { + hasData: { hasData: true, serviceName: 'ux', indices: 'apm-*' }, + status: 'success', + }, alert: { hasData: [], status: 'success' }, }, hasAnyData: true, @@ -375,7 +438,7 @@ describe('HasDataContextProvider', () => { }, }, { - appName: 'uptime', + appName: 'synthetics', hasData: async () => { throw new Error('BOOMMMMM'); }, @@ -406,7 +469,7 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: undefined, status: 'failure' }, - uptime: { hasData: undefined, status: 'failure' }, + synthetics: { hasData: undefined, status: 'failure' }, infra_logs: { hasData: undefined, status: 'failure' }, infra_metrics: { hasData: undefined, status: 'failure' }, ux: { hasData: undefined, status: 'failure' }, @@ -454,7 +517,7 @@ describe('HasDataContextProvider', () => { expect(result.current).toEqual({ hasData: { apm: { hasData: undefined, status: 'success' }, - uptime: { hasData: undefined, status: 'success' }, + synthetics: { hasData: undefined, status: 'success' }, infra_logs: { hasData: undefined, status: 'success' }, infra_metrics: { hasData: undefined, status: 'success' }, ux: { hasData: undefined, status: 'success' }, diff --git a/x-pack/plugins/observability/public/context/has_data_context.tsx b/x-pack/plugins/observability/public/context/has_data_context.tsx index a2628d37828a4..0b8b2b5d80a17 100644 --- a/x-pack/plugins/observability/public/context/has_data_context.tsx +++ b/x-pack/plugins/observability/public/context/has_data_context.tsx @@ -33,7 +33,7 @@ export interface HasDataContextValue { export const HasDataContext = createContext({} as HasDataContextValue); -const apps: DataContextApps[] = ['apm', 'uptime', 'infra_logs', 'infra_metrics', 'ux', 'alert']; +const apps: DataContextApps[] = ['apm', 'synthetics', 'infra_logs', 'infra_metrics', 'ux', 'alert']; export function HasDataContextProvider({ children }: { children: React.ReactNode }) { const { core } = usePluginContext(); diff --git a/x-pack/plugins/observability/public/data_handler.test.ts b/x-pack/plugins/observability/public/data_handler.test.ts index bba2083aceb80..385a0c7d40c20 100644 --- a/x-pack/plugins/observability/public/data_handler.test.ts +++ b/x-pack/plugins/observability/public/data_handler.test.ts @@ -179,7 +179,7 @@ describe('registerDataHandler', () => { }); describe('Uptime', () => { registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: async () => { return { title: 'uptime', @@ -213,17 +213,17 @@ describe('registerDataHandler', () => { }, }; }, - hasData: async () => true, + hasData: async () => ({ hasData: true, indices: 'heartbeat-*,synthetics-*' }), }); it('registered data handler', () => { - const dataHandler = getDataHandler('uptime'); + const dataHandler = getDataHandler('synthetics'); expect(dataHandler?.fetchData).toBeDefined(); expect(dataHandler?.hasData).toBeDefined(); }); it('returns data when fetchData is called', async () => { - const dataHandler = getDataHandler('uptime'); + const dataHandler = getDataHandler('synthetics'); const response = await dataHandler?.fetchData(params); expect(response).toEqual({ title: 'uptime', @@ -284,7 +284,11 @@ describe('registerDataHandler', () => { }, }; }, - hasData: async () => ({ hasData: true, serviceName: 'elastic-co-frontend' }), + hasData: async () => ({ + hasData: true, + serviceName: 'elastic-co-frontend', + indices: 'apm-*', + }), }); it('registered data handler', () => { diff --git a/x-pack/plugins/observability/public/pages/home/section.ts b/x-pack/plugins/observability/public/pages/home/section.ts index e374f1d3cc2a9..31c70823127e0 100644 --- a/x-pack/plugins/observability/public/pages/home/section.ts +++ b/x-pack/plugins/observability/public/pages/home/section.ts @@ -46,7 +46,7 @@ export const appsSection: ISection[] = [ href: 'https://www.elastic.co', }, { - id: 'uptime', + id: 'synthetics', title: i18n.translate('xpack.observability.section.apps.uptime.title', { defaultMessage: 'Uptime', }), diff --git a/x-pack/plugins/observability/public/pages/overview/empty_section.ts b/x-pack/plugins/observability/public/pages/overview/empty_section.ts index 077978b7ad0e7..40b1157b29e35 100644 --- a/x-pack/plugins/observability/public/pages/overview/empty_section.ts +++ b/x-pack/plugins/observability/public/pages/overview/empty_section.ts @@ -57,7 +57,7 @@ export const getEmptySections = ({ core }: { core: CoreStart }): ISection[] => { href: core.http.basePath.prepend('/app/home#/tutorial_directory/metrics'), }, { - id: 'uptime', + id: 'synthetics', title: i18n.translate('xpack.observability.emptySection.apps.uptime.title', { defaultMessage: 'Uptime', }), diff --git a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx index 68c39a888692b..559aa8d5884a9 100644 --- a/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx +++ b/x-pack/plugins/observability/public/pages/overview/overview.stories.tsx @@ -29,7 +29,7 @@ function unregisterAll() { unregisterDataHandler({ appName: 'apm' }); unregisterDataHandler({ appName: 'infra_logs' }); unregisterDataHandler({ appName: 'infra_metrics' }); - unregisterDataHandler({ appName: 'uptime' }); + unregisterDataHandler({ appName: 'synthetics' }); } const withCore = makeDecorator({ @@ -188,9 +188,9 @@ storiesOf('app/Overview', module) hasData: async () => false, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: fetchUptimeData, - hasData: async () => false, + hasData: async () => ({ hasData: false, indices: 'heartbeat-*,synthetics-*' }), }); return ; @@ -300,9 +300,9 @@ storiesOf('app/Overview', module) hasData: async () => true, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: fetchUptimeData, - hasData: async () => true, + hasData: async () => ({ hasData: true, indices: 'heartbeat-*,synthetics-*' }), }); return ( @@ -332,9 +332,9 @@ storiesOf('app/Overview', module) hasData: async () => true, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: fetchUptimeData, - hasData: async () => true, + hasData: async () => ({ hasData: true, indices: 'heartbeat-*,synthetics-*' }), }); return ( @@ -366,9 +366,9 @@ storiesOf('app/Overview', module) hasData: async () => true, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: fetchUptimeData, - hasData: async () => true, + hasData: async () => ({ hasData: true, indices: 'heartbeat-*,synthetics-*' }), }); return ( true, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: async () => emptyUptimeResponse, - hasData: async () => true, + hasData: async () => ({ hasData: true, indices: 'heartbeat-*,synthetics-*' }), }); return ( @@ -435,11 +435,11 @@ storiesOf('app/Overview', module) hasData: async () => true, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: async () => { throw new Error('Error fetching Uptime data'); }, - hasData: async () => true, + hasData: async () => ({ hasData: true, indices: 'heartbeat-*,synthetics-*' }), }); return ( { throw new Error('Error has data'); }, @@ -465,7 +465,7 @@ storiesOf('app/Overview', module) registerDataHandler({ appName: 'infra_logs', fetchData: fetchLogsData, - // @ts-ignore thows an error instead + // @ts-ignore throws an error instead hasData: async () => { throw new Error('Error has data'); }, @@ -473,15 +473,15 @@ storiesOf('app/Overview', module) registerDataHandler({ appName: 'infra_metrics', fetchData: fetchMetricsData, - // @ts-ignore thows an error instead + // @ts-ignore throws an error instead hasData: async () => { throw new Error('Error has data'); }, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: fetchUptimeData, - // @ts-ignore thows an error instead + // @ts-ignore throws an error instead hasData: async () => { throw new Error('Error has data'); }, @@ -500,7 +500,7 @@ storiesOf('app/Overview', module) registerDataHandler({ appName: 'apm', fetchData: fetchApmData, - // @ts-ignore thows an error instead + // @ts-ignore throws an error instead hasData: async () => { throw new Error('Error has data'); }, @@ -508,7 +508,7 @@ storiesOf('app/Overview', module) registerDataHandler({ appName: 'infra_logs', fetchData: fetchLogsData, - // @ts-ignore thows an error instead + // @ts-ignore throws an error instead hasData: async () => { throw new Error('Error has data'); }, @@ -516,15 +516,15 @@ storiesOf('app/Overview', module) registerDataHandler({ appName: 'infra_metrics', fetchData: fetchMetricsData, - // @ts-ignore thows an error instead + // @ts-ignore throws an error instead hasData: async () => { throw new Error('Error has data'); }, }); registerDataHandler({ - appName: 'uptime', + appName: 'synthetics', fetchData: fetchUptimeData, - // @ts-ignore thows an error instead + // @ts-ignore throws an error instead hasData: async () => { throw new Error('Error has data'); }, diff --git a/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts b/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts index 528db7f4dec53..6b69aa9888cf6 100644 --- a/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts +++ b/x-pack/plugins/observability/public/typings/fetch_overview_data/index.ts @@ -32,8 +32,12 @@ export interface HasDataParams { absoluteTime: { start: number; end: number }; } -export interface UXHasDataResponse { +export interface HasDataResponse { hasData: boolean; + indices: string; +} + +export interface UXHasDataResponse extends HasDataResponse { serviceName: string | number | undefined; } @@ -47,7 +51,7 @@ export type HasData = ( export type ObservabilityFetchDataPlugins = Exclude< ObservabilityApp, - 'observability-overview' | 'stack_monitoring' | 'fleet' + 'observability-overview' | 'stack_monitoring' | 'uptime' | 'fleet' >; export interface DataHandler< @@ -126,7 +130,6 @@ export interface ObservabilityFetchDataResponse { infra_metrics: MetricsFetchDataResponse; infra_logs: LogsFetchDataResponse; synthetics: UptimeFetchDataResponse; - uptime: UptimeFetchDataResponse; ux: UxFetchDataResponse; } @@ -134,7 +137,6 @@ export interface ObservabilityHasDataResponse { apm: boolean; infra_metrics: boolean; infra_logs: boolean; - uptime: boolean; - synthetics: boolean; + synthetics: HasDataResponse; ux: UXHasDataResponse; } diff --git a/x-pack/plugins/observability/public/utils/observability_index_patterns.ts b/x-pack/plugins/observability/public/utils/observability_index_patterns.ts deleted file mode 100644 index b23a246105544..0000000000000 --- a/x-pack/plugins/observability/public/utils/observability_index_patterns.ts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0; you may not use this file except in compliance with the Elastic License - * 2.0. - */ - -import { DataPublicPluginStart, IndexPattern } from '../../../../../src/plugins/data/public'; - -export type DataType = 'synthetics' | 'apm' | 'logs' | 'metrics' | 'rum'; - -const indexPatternList: Record = { - synthetics: 'synthetics_static_index_pattern_id', - apm: 'apm_static_index_pattern_id', - rum: 'apm_static_index_pattern_id', - logs: 'logs_static_index_pattern_id', - metrics: 'metrics_static_index_pattern_id', -}; - -const appToPatternMap: Record = { - synthetics: 'heartbeat-*', - apm: 'apm-*', - rum: 'apm-*', - logs: 'logs-*,filebeat-*', - metrics: 'metrics-*,metricbeat-*', -}; - -export class ObservabilityIndexPatterns { - data?: DataPublicPluginStart; - - constructor(data: DataPublicPluginStart) { - this.data = data; - } - - async createIndexPattern(app: DataType) { - if (!this.data) { - throw new Error('data is not defined'); - } - - const pattern = appToPatternMap[app]; - - const fields = await this.data.indexPatterns.getFieldsForWildcard({ - pattern, - }); - - return await this.data.indexPatterns.createAndSave({ - fields, - title: pattern, - id: indexPatternList[app], - timeFieldName: '@timestamp', - }); - } - - async getIndexPattern(app: DataType): Promise { - if (!this.data) { - throw new Error('data is not defined'); - } - try { - return await this.data?.indexPatterns.get(indexPatternList[app]); - } catch (e) { - return await this.createIndexPattern(app || 'apm'); - } - } -} diff --git a/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts b/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts new file mode 100644 index 0000000000000..13c073c3bf8be --- /dev/null +++ b/x-pack/plugins/osquery/public/agents/agent_grouper.test.ts @@ -0,0 +1,140 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { AgentGrouper } from './agent_grouper'; +import { AGENT_GROUP_KEY, Group, GroupedAgent, GroupOptionValue } from './types'; +import uuid from 'uuid'; +import { ALL_AGENTS_LABEL } from './translations'; + +type GroupData = { + [key in Exclude]: Group[]; +}; +export function genGroup(name: string) { + return { + name, + id: uuid.v4(), + size: 5, + }; +} + +export function genAgent(policyId: string, hostname: string, id: string): GroupedAgent { + return { + status: 'online', + policy_id: policyId, + local_metadata: { + elastic: { + agent: { + id, + }, + }, + os: { + platform: 'test platform', + }, + host: { + hostname, + }, + }, + }; +} +export const groupData: GroupData = { + [AGENT_GROUP_KEY.Platform]: new Array(3).fill('test platform ').map((el, i) => genGroup(el + i)), + [AGENT_GROUP_KEY.Policy]: new Array(3).fill('test policy ').map((el, i) => genGroup(el + i)), +}; + +describe('AgentGrouper', () => { + describe('All agents', () => { + it('should handle empty groups properly', () => { + const agentGrouper = new AgentGrouper(); + expect(agentGrouper.generateOptions()).toEqual([]); + }); + + it('should ignore calls to add things to the "all" group', () => { + const agentGrouper = new AgentGrouper(); + agentGrouper.updateGroup(AGENT_GROUP_KEY.All, [{}]); + expect(agentGrouper.generateOptions()).toEqual([]); + }); + + it('should omit the "all agents" option when total is set to <= 0', () => { + const agentGrouper = new AgentGrouper(); + agentGrouper.setTotalAgents(0); + expect(agentGrouper.generateOptions()).toEqual([]); + agentGrouper.setTotalAgents(-1); + expect(agentGrouper.generateOptions()).toEqual([]); + }); + + it('should add the "all agents" option when the total is set to > 0', () => { + const agentGrouper = new AgentGrouper(); + agentGrouper.setTotalAgents(100); + const groups = agentGrouper.generateOptions(); + + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const allGroup = groups[AGENT_GROUP_KEY.All].options![0]; + expect(allGroup.label).toEqual(ALL_AGENTS_LABEL); + const size: number = (allGroup.value as GroupOptionValue).size; + + expect(size).toEqual(100); + agentGrouper.setTotalAgents(0); + expect(agentGrouper.generateOptions()).toEqual([]); + }); + }); + + describe('Policies and platforms', () => { + function genGroupTest( + key: AGENT_GROUP_KEY.Platform | AGENT_GROUP_KEY.Policy, + dataName: string + ) { + return () => { + const agentGrouper = new AgentGrouper(); + const data = groupData[key]; + agentGrouper.updateGroup(key, data); + + const groups = agentGrouper.generateOptions(); + const options = groups[0].options; + expect(options).toBeTruthy(); + + data.forEach((datum, i) => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const opt = options![i]; + expect(opt.label).toEqual(`test ${dataName} ${i} (${datum.id})`); + expect(opt.key).toEqual(datum.id); + expect(opt.value).toEqual({ + groupType: key, + id: datum.id, + size: 5, + }); + }); + }; + } + it('should generate policy options', genGroupTest(AGENT_GROUP_KEY.Policy, 'policy')); + it('should generate platform options', genGroupTest(AGENT_GROUP_KEY.Platform, 'platform')); + }); + + describe('agents', () => { + it('should generate agent options', () => { + const agentGrouper = new AgentGrouper(); + const policyId = uuid.v4(); + const agentData: GroupedAgent[] = [ + genAgent(policyId, `agent host 1`, uuid.v4()), + genAgent(policyId, `agent host 2`, uuid.v4()), + ]; + agentGrouper.updateGroup(AGENT_GROUP_KEY.Agent, agentData); + + const groups = agentGrouper.generateOptions(); + const options = groups[0].options; + expect(options).toBeTruthy(); + agentData.forEach((ag, i) => { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const opt = options![i]; + expect(opt.label).toEqual( + `${ag.local_metadata.host.hostname} (${ag.local_metadata.elastic.agent.id})` + ); + expect(opt.key).toEqual(ag.local_metadata.elastic.agent.id); + expect(opt.value?.id).toEqual(ag.local_metadata.elastic.agent.id); + }); + }); + }); +}); diff --git a/x-pack/plugins/osquery/public/agents/agent_grouper.ts b/x-pack/plugins/osquery/public/agents/agent_grouper.ts index 419a3b9e733a4..bc4b4129d3b2b 100644 --- a/x-pack/plugins/osquery/public/agents/agent_grouper.ts +++ b/x-pack/plugins/osquery/public/agents/agent_grouper.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { Agent } from '../../common/shared_imports'; import { generateColorPicker } from './helpers'; import { ALL_AGENTS_LABEL, @@ -13,7 +12,7 @@ import { AGENT_POLICY_LABEL, AGENT_SELECTION_LABEL, } from './translations'; -import { AGENT_GROUP_KEY, Group, GroupOption } from './types'; +import { AGENT_GROUP_KEY, Group, GroupOption, GroupedAgent } from './types'; const getColor = generateColorPicker(); @@ -27,6 +26,38 @@ const generateGroup = (label: string, groupType: AGENT_GROUP_KEY) => }; }; +export const generateAgentOption = ( + label: string, + groupType: AGENT_GROUP_KEY, + data: GroupedAgent[] +) => ({ + label, + options: data.map((agent) => ({ + label: `${agent.local_metadata.host.hostname} (${agent.local_metadata.elastic.agent.id})`, + key: agent.local_metadata.elastic.agent.id, + color: getColor(groupType), + value: { + groupType, + groups: { + policy: agent.policy_id ?? '', + platform: agent.local_metadata.os.platform, + }, + id: agent.local_metadata.elastic.agent.id, + status: agent.status ?? 'unknown', + }, + })), +}); + +export const generateGroupOption = (label: string, groupType: AGENT_GROUP_KEY, data: Group[]) => ({ + label, + options: (data as Group[]).map(({ name, id, size }) => ({ + label: name !== id ? `${name} (${id})` : name, + key: id, + color: getColor(groupType), + value: { groupType, id, size }, + })), +}); + export class AgentGrouper { groupOrder = [ AGENT_GROUP_KEY.All, @@ -38,12 +69,15 @@ export class AgentGrouper { [AGENT_GROUP_KEY.All]: generateGroup(ALL_AGENTS_LABEL, AGENT_GROUP_KEY.All), [AGENT_GROUP_KEY.Platform]: generateGroup(AGENT_PLATFORMS_LABEL, AGENT_GROUP_KEY.Platform), [AGENT_GROUP_KEY.Policy]: generateGroup(AGENT_POLICY_LABEL, AGENT_GROUP_KEY.Policy), - [AGENT_GROUP_KEY.Agent]: generateGroup(AGENT_SELECTION_LABEL, AGENT_GROUP_KEY.Agent), + [AGENT_GROUP_KEY.Agent]: generateGroup( + AGENT_SELECTION_LABEL, + AGENT_GROUP_KEY.Agent + ), }; // eslint-disable-next-line @typescript-eslint/no-explicit-any updateGroup(key: AGENT_GROUP_KEY, data: any[], append = false) { - if (!data?.length) { + if (!data?.length || key === AGENT_GROUP_KEY.All) { return; } const group = this.groups[key]; @@ -56,6 +90,9 @@ export class AgentGrouper { } setTotalAgents(total: number): void { + if (total < 0) { + return; + } this.groups[AGENT_GROUP_KEY.All].size = total; } @@ -82,34 +119,10 @@ export class AgentGrouper { break; case AGENT_GROUP_KEY.Platform: case AGENT_GROUP_KEY.Policy: - opts.push({ - label, - options: (data as Group[]).map(({ name, id, size: groupSize }) => ({ - label: name !== id ? `${name} (${id})` : name, - key: id, - color: getColor(groupType), - value: { groupType, id, size: groupSize }, - })), - }); + opts.push(generateGroupOption(label, key, data as Group[])); break; case AGENT_GROUP_KEY.Agent: - opts.push({ - label, - options: (data as Agent[]).map((agent: Agent) => ({ - label: `${agent.local_metadata.host.hostname} (${agent.local_metadata.elastic.agent.id})`, - key: agent.local_metadata.elastic.agent.id, - color, - value: { - groupType, - groups: { - policy: agent.policy_id ?? '', - platform: agent.local_metadata.os.platform, - }, - id: agent.local_metadata.elastic.agent.id, - online: agent.active, - }, - })), - }); + opts.push(generateAgentOption(label, key, data as GroupedAgent[])); break; } } diff --git a/x-pack/plugins/osquery/public/agents/agents_table.tsx b/x-pack/plugins/osquery/public/agents/agents_table.tsx index 88e3bda7bac4b..7f57f70e459da 100644 --- a/x-pack/plugins/osquery/public/agents/agents_table.tsx +++ b/x-pack/plugins/osquery/public/agents/agents_table.tsx @@ -134,7 +134,7 @@ const AgentsTableComponent: React.FC = ({ agentSelection, onCh const renderOption = useCallback((option, searchVal, contentClassName) => { const { label, value } = option; return value?.groupType === AGENT_GROUP_KEY.Agent ? ( - + {label} diff --git a/x-pack/plugins/osquery/public/agents/helpers.test.ts b/x-pack/plugins/osquery/public/agents/helpers.test.ts index f7ed4570b1a27..3ec75f2b5bba7 100644 --- a/x-pack/plugins/osquery/public/agents/helpers.test.ts +++ b/x-pack/plugins/osquery/public/agents/helpers.test.ts @@ -5,8 +5,59 @@ * 2.0. */ -import { getNumOverlapped, getNumAgentsInGrouping, processAggregations } from './helpers'; -import { Overlap, SelectedGroups } from './types'; +import uuid from 'uuid'; +import { generateGroupOption } from './agent_grouper'; +import { + getNumOverlapped, + getNumAgentsInGrouping, + processAggregations, + generateAgentSelection, +} from './helpers'; +import { AGENT_GROUP_KEY, GroupOption, Overlap, SelectedGroups } from './types'; + +describe('generateAgentSelection', () => { + it('should handle empty input', () => { + const options: GroupOption[] = []; + const { newAgentSelection, selectedGroups, selectedAgents } = generateAgentSelection(options); + expect(newAgentSelection).toEqual({ + agents: [], + allAgentsSelected: false, + platformsSelected: [], + policiesSelected: [], + }); + expect(selectedAgents).toEqual([]); + expect(selectedGroups).toEqual({ + policy: {}, + platform: {}, + }); + }); + + it('should properly pull out group ids', () => { + const options: GroupOption[] = []; + const policyOptions = generateGroupOption('policy', AGENT_GROUP_KEY.Policy, [ + { name: 'policy 1', id: 'policy 1', size: 5 }, + { name: 'policy 2', id: uuid.v4(), size: 5 }, + ]).options; + options.push(...policyOptions); + + const platformOptions = generateGroupOption('platform', AGENT_GROUP_KEY.Platform, [ + { name: 'platform 1', id: 'platform 1', size: 5 }, + { name: 'platform 2', id: uuid.v4(), size: 5 }, + ]).options; + options.push(...platformOptions); + + const { newAgentSelection, selectedGroups, selectedAgents } = generateAgentSelection(options); + expect(newAgentSelection).toEqual({ + agents: [], + allAgentsSelected: false, + platformsSelected: platformOptions.map(({ value: { id } }) => id), + policiesSelected: policyOptions.map(({ value: { id } }) => id), + }); + expect(selectedAgents).toEqual([]); + expect(Object.keys(selectedGroups.platform).length).toEqual(2); + expect(Object.keys(selectedGroups.policy).length).toEqual(2); + }); +}); describe('processAggregations', () => { it('should handle empty inputs properly', () => { diff --git a/x-pack/plugins/osquery/public/agents/helpers.ts b/x-pack/plugins/osquery/public/agents/helpers.ts index 948e2a0ea50b0..a79933db0ceb0 100644 --- a/x-pack/plugins/osquery/public/agents/helpers.ts +++ b/x-pack/plugins/osquery/public/agents/helpers.ts @@ -114,9 +114,10 @@ export const generateAgentSelection = (selection: GroupOption[]) => { platform: {}, }; - // TODO: clean this up, make it less awkward for (const opt of selection) { const groupType = opt.value?.groupType; + // best effort to get the proper identity + const key = opt.key ?? opt.value?.id ?? opt.label; let value; switch (groupType) { case AGENT_GROUP_KEY.All: @@ -126,17 +127,17 @@ export const generateAgentSelection = (selection: GroupOption[]) => { value = opt.value as GroupOptionValue; if (!newAgentSelection.allAgentsSelected) { // we don't need to calculate diffs when all agents are selected - selectedGroups.platform[opt.value?.id ?? opt.label] = value.size; + selectedGroups.platform[key] = value.size; } - newAgentSelection.platformsSelected.push(opt.label); + newAgentSelection.platformsSelected.push(key); break; case AGENT_GROUP_KEY.Policy: value = opt.value as GroupOptionValue; if (!newAgentSelection.allAgentsSelected) { // we don't need to calculate diffs when all agents are selected - selectedGroups.policy[opt.value?.id ?? opt.label] = value.size; + selectedGroups.policy[key] = value.size; } - newAgentSelection.policiesSelected.push(opt.label); + newAgentSelection.policiesSelected.push(key); break; case AGENT_GROUP_KEY.Agent: value = opt.value as AgentOptionValue; @@ -144,9 +145,7 @@ export const generateAgentSelection = (selection: GroupOption[]) => { // we don't need to count how many agents are selected if they are all selected selectedAgents.push(value); } - if (value?.id) { - newAgentSelection.agents.push(value.id); - } + newAgentSelection.agents.push(key); break; default: // this should never happen! diff --git a/x-pack/plugins/osquery/public/agents/types.ts b/x-pack/plugins/osquery/public/agents/types.ts index b26404f9c5e70..302b2686d511e 100644 --- a/x-pack/plugins/osquery/public/agents/types.ts +++ b/x-pack/plugins/osquery/public/agents/types.ts @@ -7,6 +7,7 @@ import { TermsAggregate } from '@elastic/elasticsearch/api/types'; import { EuiComboBoxOptionOption } from '@elastic/eui'; +import { Agent } from '../../common/shared_imports'; interface BaseDataPoint { key: string; @@ -30,6 +31,8 @@ export interface SelectedGroups { [groupType: string]: { [groupName: string]: number }; } +export type GroupedAgent = Pick; + export type GroupOption = EuiComboBoxOptionOption; export interface AgentSelection { @@ -46,7 +49,7 @@ interface BaseGroupOption { export type AgentOptionValue = BaseGroupOption & { groups: { [groupType: string]: string }; - online: boolean; + status: string; }; export type GroupOptionValue = BaseGroupOption & { @@ -57,5 +60,6 @@ export enum AGENT_GROUP_KEY { All, Platform, Policy, + // eslint-disable-next-line @typescript-eslint/no-shadow Agent, } diff --git a/x-pack/plugins/osquery/public/agents/use_all_agents.ts b/x-pack/plugins/osquery/public/agents/use_all_agents.ts index 4086175046c1c..e10bc2a0d9bf6 100644 --- a/x-pack/plugins/osquery/public/agents/use_all_agents.ts +++ b/x-pack/plugins/osquery/public/agents/use_all_agents.ts @@ -31,14 +31,22 @@ export const useAllAgents = ( const { isLoading: agentsLoading, data: agentData } = useQuery( ['agents', osqueryPolicies, searchValue, perPage], () => { - let kuery = `(${osqueryPolicies.map((p) => `policy_id:${p}`).join(' or ')})`; + const kueryFragments: string[] = []; + if (osqueryPolicies.length) { + kueryFragments.push(`${osqueryPolicies.map((p) => `policy_id:${p}`).join(' or ')}`); + } + if (searchValue) { - kuery += ` and (local_metadata.host.hostname:/${searchValue}/ or local_metadata.elastic.agent.id:/${searchValue}/)`; + kueryFragments.push( + `local_metadata.host.hostname:*${searchValue}* or local_metadata.elastic.agent.id:*${searchValue}*` + ); } + return http.get(agentRouteService.getListPath(), { query: { - kuery, + kuery: kueryFragments.map((frag) => `(${frag})`).join(' and '), perPage, + showInactive: true, }, }); }, diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts index eec4de6400145..cd43d72dea8e2 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts @@ -98,6 +98,15 @@ const detailsPolicyAppliedResponse = (state: Immutable) => export const policyResponseTimestamp = (state: Immutable) => state.policyResponse && state.policyResponse['@timestamp']; +/** + * Returns the Endpoint Package Policy Revision number, which correlates to the `applied_policy_version` + * property on the endpoint policy response message. + * @param state + */ +export const policyResponseAppliedRevision = (state: Immutable): string => { + return String(state.policyResponse?.Endpoint.policy.applied.endpoint_policy_version || ''); +}; + /** * Returns the response configurations from the endpoint after a user modifies a policy. */ diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx index ed68cd17fa446..e136b63579359 100644 --- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx +++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx @@ -38,6 +38,7 @@ import { policyResponseTimestamp, policyVersionInfo, hostStatusInfo, + policyResponseAppliedRevision, } from '../../store/selectors'; import { EndpointDetails } from './endpoint_details'; import { PolicyResponse } from './policy_response'; @@ -149,6 +150,7 @@ const PolicyResponseFlyoutPanel = memo<{ const error = useEndpointSelector(policyResponseError); const { formatUrl } = useFormatUrl(SecurityPageName.administration); const responseTimestamp = useEndpointSelector(policyResponseTimestamp); + const responsePolicyRevisionNumber = useEndpointSelector(policyResponseAppliedRevision); const [detailsUri, detailsRoutePath] = useMemo( () => [ formatUrl( @@ -197,7 +199,14 @@ const PolicyResponseFlyoutPanel = memo<{ - + , + }} + /> {error && ( diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts index d1911a39166dc..ba490bf362cc7 100644 --- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts +++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts @@ -87,6 +87,7 @@ export const createMockEndpointAppContextServiceStartContract = (): jest.Mocked< Parameters >(), exceptionListsClient: listMock.getExceptionListClient(), + packagePolicyService: createPackagePolicyServiceMock(), }; }; diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts index e6a676454a279..0d59ff2f4ed7b 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts @@ -82,6 +82,7 @@ export const getMetadataListRequestHandler = function ( const unenrolledAgentIds = await findAllUnenrolledAgentIds( agentService, + endpointAppContext.service.getPackagePolicyService()!, context.core.savedObjects.client, context.core.elasticsearch.client.asCurrentUser ); diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts index e052a653242b7..f4698cbed6203 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts @@ -34,7 +34,10 @@ import { createMockPackageService, createRouteHandlerContext, } from '../../mocks'; -import { EndpointAppContextService } from '../../endpoint_app_context_services'; +import { + EndpointAppContextService, + EndpointAppContextServiceStartContract, +} from '../../endpoint_app_context_services'; import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__'; import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data'; import { @@ -46,6 +49,7 @@ import { createV1SearchResponse, createV2SearchResponse } from './support/test_s import { PackageService } from '../../../../../fleet/server/services'; import { metadataTransformPrefix } from '../../../../common/endpoint/constants'; import type { SecuritySolutionPluginRouter } from '../../../types'; +import { PackagePolicyServiceInterface } from '../../../../../fleet/server'; describe('test endpoint route', () => { let routerMock: jest.Mocked; @@ -63,6 +67,7 @@ describe('test endpoint route', () => { ReturnType >['agentService']; let endpointAppContextService: EndpointAppContextService; + let startContract: EndpointAppContextServiceStartContract; const noUnenrolledAgent = { agents: [], total: 0, @@ -77,12 +82,23 @@ describe('test endpoint route', () => { mockClusterClient.asScoped.mockReturnValue(mockScopedClient); routerMock = httpServiceMock.createRouter(); mockResponse = httpServerMock.createResponseFactory(); + startContract = createMockEndpointAppContextServiceStartContract(); + + (startContract.packagePolicyService as jest.Mocked).list.mockImplementation( + () => { + return Promise.resolve({ + items: [], + total: 0, + page: 1, + perPage: 1000, + }); + } + ); }); describe('with no transform package', () => { beforeEach(() => { endpointAppContextService = new EndpointAppContextService(); - const startContract = createMockEndpointAppContextServiceStartContract(); mockPackageService = createMockPackageService(); mockPackageService.getInstalledEsAssetReferences.mockReturnValue( Promise.resolve(([] as unknown) as EsAssetReference[]) @@ -169,7 +185,6 @@ describe('test endpoint route', () => { describe('with new transform package', () => { beforeEach(() => { endpointAppContextService = new EndpointAppContextService(); - const startContract = createMockEndpointAppContextServiceStartContract(); mockPackageService = createMockPackageService(); mockPackageService.getInstalledEsAssetReferences.mockReturnValue( Promise.resolve([ diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata_v1.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata_v1.test.ts index 97b0dd7f1509e..e3f859c26601e 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata_v1.test.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata_v1.test.ts @@ -33,7 +33,10 @@ import { createMockPackageService, createRouteHandlerContext, } from '../../mocks'; -import { EndpointAppContextService } from '../../endpoint_app_context_services'; +import { + EndpointAppContextService, + EndpointAppContextServiceStartContract, +} from '../../endpoint_app_context_services'; import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__'; import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data'; import { parseExperimentalConfigValue } from '../../../../common/experimental_features'; @@ -41,6 +44,7 @@ import { Agent, EsAssetReference } from '../../../../../fleet/common/types/model import { createV1SearchResponse } from './support/test_support'; import { PackageService } from '../../../../../fleet/server/services'; import type { SecuritySolutionPluginRouter } from '../../../types'; +import { PackagePolicyServiceInterface } from '../../../../../fleet/server'; describe('test endpoint route v1', () => { let routerMock: jest.Mocked; @@ -58,6 +62,7 @@ describe('test endpoint route v1', () => { ReturnType >['agentService']; let endpointAppContextService: EndpointAppContextService; + let startContract: EndpointAppContextServiceStartContract; const noUnenrolledAgent = { agents: [], total: 0, @@ -77,10 +82,21 @@ describe('test endpoint route v1', () => { mockPackageService.getInstalledEsAssetReferences.mockReturnValue( Promise.resolve(([] as unknown) as EsAssetReference[]) ); - const startContract = createMockEndpointAppContextServiceStartContract(); + startContract = createMockEndpointAppContextServiceStartContract(); endpointAppContextService.start({ ...startContract, packageService: mockPackageService }); mockAgentService = startContract.agentService!; + (startContract.packagePolicyService as jest.Mocked).list.mockImplementation( + () => { + return Promise.resolve({ + items: [], + total: 0, + page: 1, + perPage: 1000, + }); + } + ); + registerEndpointRoutes(routerMock, { logFactory: loggingSystemMock.create(), service: endpointAppContextService, diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts index 0d6d8550cb933..8efbc1940ea7d 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.test.ts @@ -12,20 +12,45 @@ import { savedObjectsClientMock, } from '../../../../../../../../src/core/server/mocks'; import { AgentService } from '../../../../../../fleet/server/services'; -import { createMockAgentService } from '../../../../../../fleet/server/mocks'; -import { Agent } from '../../../../../../fleet/common/types/models'; +import { + createMockAgentService, + createPackagePolicyServiceMock, +} from '../../../../../../fleet/server/mocks'; +import { Agent, PackagePolicy } from '../../../../../../fleet/common/types/models'; +import { PackagePolicyServiceInterface } from '../../../../../../fleet/server'; describe('test find all unenrolled Agent id', () => { let mockSavedObjectClient: jest.Mocked; let mockElasticsearchClient: jest.Mocked; let mockAgentService: jest.Mocked; + let mockPackagePolicyService: jest.Mocked; + beforeEach(() => { mockSavedObjectClient = savedObjectsClientMock.create(); mockElasticsearchClient = elasticsearchServiceMock.createClusterClient().asInternalUser; mockAgentService = createMockAgentService(); + mockPackagePolicyService = createPackagePolicyServiceMock(); }); it('can find all unerolled endpoint agent ids', async () => { + mockPackagePolicyService.list + .mockResolvedValueOnce({ + items: [ + ({ + id: '1', + policy_id: 'abc123', + } as unknown) as PackagePolicy, + ], + total: 1, + perPage: 10, + page: 1, + }) + .mockResolvedValueOnce({ + items: [], + total: 1, + perPage: 10, + page: 1, + }); mockAgentService.listAgents .mockImplementationOnce(() => Promise.resolve({ @@ -61,10 +86,24 @@ describe('test find all unenrolled Agent id', () => { ); const agentIds = await findAllUnenrolledAgentIds( mockAgentService, + mockPackagePolicyService, mockSavedObjectClient, mockElasticsearchClient ); + expect(agentIds).toBeTruthy(); expect(agentIds).toEqual(['id1', 'id2']); + + expect(mockPackagePolicyService.list).toHaveBeenNthCalledWith(1, mockSavedObjectClient, { + kuery: 'ingest-package-policies.package.name:endpoint', + page: 1, + perPage: 1000, + }); + expect(mockAgentService.listAgents).toHaveBeenNthCalledWith(1, mockElasticsearchClient, { + page: 1, + perPage: 1000, + showInactive: true, + kuery: '(active : false) OR (active: true AND NOT policy_id:("abc123"))', + }); }); }); diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts index 929f2598c0a34..9b61d52c268a6 100644 --- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts +++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts @@ -6,24 +6,65 @@ */ import { ElasticsearchClient, SavedObjectsClientContract } from 'kibana/server'; -import { AgentService } from '../../../../../../fleet/server'; +import { AgentService, PackagePolicyServiceInterface } from '../../../../../../fleet/server'; import { Agent } from '../../../../../../fleet/common/types/models'; +const getAllAgentPolicyIdsWithEndpoint = async ( + packagePolicyService: PackagePolicyServiceInterface, + soClient: SavedObjectsClientContract +): Promise => { + const result: string[] = []; + const perPage = 1000; + let page = 1; + let hasMore = true; + + while (hasMore) { + const endpointPoliciesResponse = await packagePolicyService.list(soClient, { + perPage, + page: page++, + kuery: 'ingest-package-policies.package.name:endpoint', + }); + if (endpointPoliciesResponse.items.length > 0) { + result.push( + ...endpointPoliciesResponse.items.map((endpointPolicy) => endpointPolicy.policy_id) + ); + } else { + hasMore = false; + } + } + + return result; +}; + export async function findAllUnenrolledAgentIds( agentService: AgentService, + packagePolicyService: PackagePolicyServiceInterface, soClient: SavedObjectsClientContract, esClient: ElasticsearchClient, pageSize: number = 1000 ): Promise { + const agentPoliciesWithEndpoint = await getAllAgentPolicyIdsWithEndpoint( + packagePolicyService, + soClient + ); + + // We want: + // 1. if no endpoint policies exist, then get all Agents + // 2. if we have a list of agent policies, then Agents that are Active and that are + // NOT enrolled with an Agent Policy that has endpoint + const kuery = + agentPoliciesWithEndpoint.length > 0 + ? `(active : false) OR (active: true AND NOT policy_id:("${agentPoliciesWithEndpoint.join( + '" OR "' + )}"))` + : undefined; + const searchOptions = (pageNum: number) => { return { page: pageNum, perPage: pageSize, showInactive: true, - // FIXME: remove temporary work-around after https://github.com/elastic/beats/pull/25070 is implemented - // makes it into a snapshot build. - // kuery: '(active : false) OR (NOT packages : "endpoint" AND active : true)', - kuery: '(active : false)', + kuery, }; }; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts index 2ef72c22bbecf..1590a4f0fbb04 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/__mocks__/es_results.ts @@ -115,6 +115,7 @@ export const sampleDocNoSortIdNoVersion = (someUuid: string = sampleIdGuid): Sig export const sampleDocWithSortId = ( someUuid: string = sampleIdGuid, + sortIds: string[] = ['1234567891111', '2233447556677'], ip?: string | string[], destIp?: string | string[] ): SignalSourceHit => ({ @@ -139,7 +140,7 @@ export const sampleDocWithSortId = ( 'source.ip': ip ? (Array.isArray(ip) ? ip : [ip]) : ['127.0.0.1'], 'destination.ip': destIp ? (Array.isArray(destIp) ? destIp : [destIp]) : ['127.0.0.1'], }, - sort: ['1234567891111'], + sort: sortIds, }); export const sampleDocNoSortId = ( @@ -630,7 +631,8 @@ export const repeatedSearchResultsWithSortId = ( pageSize: number, guids: string[], ips?: Array, - destIps?: Array + destIps?: Array, + sortIds?: string[] ): SignalSearchResponse => ({ took: 10, timed_out: false, @@ -646,6 +648,7 @@ export const repeatedSearchResultsWithSortId = ( hits: Array.from({ length: pageSize }).map((x, index) => ({ ...sampleDocWithSortId( guids[index], + sortIds, ips ? ips[index] : '127.0.0.1', destIps ? destIps[index] : '127.0.0.1' ), diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts index 4b74f865c6a53..3f4a17dc091ab 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.test.ts @@ -15,9 +15,8 @@ describe('create_signals', () => { to: 'today', filter: {}, size: 100, - searchAfterSortId: undefined, + searchAfterSortIds: undefined, timestampOverride: undefined, - excludeDocsWithTimestampOverride: false, }); expect(query).toEqual({ allow_no_indices: true, @@ -39,12 +38,19 @@ describe('create_signals', () => { bool: { filter: [ { - range: { - '@timestamp': { - gte: 'now-5m', - lte: 'today', - format: 'strict_date_optional_time', - }, + bool: { + minimum_should_match: 1, + should: [ + { + range: { + '@timestamp': { + gte: 'now-5m', + lte: 'today', + format: 'strict_date_optional_time', + }, + }, + }, + ], }, }, ], @@ -73,16 +79,16 @@ describe('create_signals', () => { }, }); }); - test('if searchAfterSortId is an empty string it should not be included', () => { + + test('it builds a now-5m up to today filter with timestampOverride', () => { const query = buildEventsSearchQuery({ index: ['auditbeat-*'], from: 'now-5m', to: 'today', filter: {}, size: 100, - searchAfterSortId: '', - timestampOverride: undefined, - excludeDocsWithTimestampOverride: false, + searchAfterSortIds: undefined, + timestampOverride: 'event.ingested', }); expect(query).toEqual({ allow_no_indices: true, @@ -91,6 +97,10 @@ describe('create_signals', () => { ignore_unavailable: true, body: { docvalue_fields: [ + { + field: 'event.ingested', + format: 'strict_date_optional_time', + }, { field: '@timestamp', format: 'strict_date_optional_time', @@ -104,12 +114,43 @@ describe('create_signals', () => { bool: { filter: [ { - range: { - '@timestamp': { - gte: 'now-5m', - lte: 'today', - format: 'strict_date_optional_time', - }, + bool: { + should: [ + { + range: { + 'event.ingested': { + gte: 'now-5m', + lte: 'today', + format: 'strict_date_optional_time', + }, + }, + }, + { + bool: { + filter: [ + { + range: { + '@timestamp': { + gte: 'now-5m', + lte: 'today', + format: 'strict_date_optional_time', + }, + }, + }, + { + bool: { + must_not: { + exists: { + field: 'event.ingested', + }, + }, + }, + }, + ], + }, + }, + ], + minimum_should_match: 1, }, }, ], @@ -128,6 +169,12 @@ describe('create_signals', () => { }, ], sort: [ + { + 'event.ingested': { + order: 'asc', + unmapped_type: 'date', + }, + }, { '@timestamp': { order: 'asc', @@ -138,7 +185,8 @@ describe('create_signals', () => { }, }); }); - test('if searchAfterSortId is a valid sortId string', () => { + + test('if searchAfterSortIds is a valid sortId string', () => { const fakeSortId = '123456789012'; const query = buildEventsSearchQuery({ index: ['auditbeat-*'], @@ -146,9 +194,8 @@ describe('create_signals', () => { to: 'today', filter: {}, size: 100, - searchAfterSortId: fakeSortId, + searchAfterSortIds: [fakeSortId], timestampOverride: undefined, - excludeDocsWithTimestampOverride: false, }); expect(query).toEqual({ allow_no_indices: true, @@ -170,12 +217,19 @@ describe('create_signals', () => { bool: { filter: [ { - range: { - '@timestamp': { - gte: 'now-5m', - lte: 'today', - format: 'strict_date_optional_time', - }, + bool: { + minimum_should_match: 1, + should: [ + { + range: { + '@timestamp': { + gte: 'now-5m', + lte: 'today', + format: 'strict_date_optional_time', + }, + }, + }, + ], }, }, ], @@ -205,7 +259,7 @@ describe('create_signals', () => { }, }); }); - test('if searchAfterSortId is a valid sortId number', () => { + test('if searchAfterSortIds is a valid sortId number', () => { const fakeSortIdNumber = 123456789012; const query = buildEventsSearchQuery({ index: ['auditbeat-*'], @@ -213,9 +267,8 @@ describe('create_signals', () => { to: 'today', filter: {}, size: 100, - searchAfterSortId: fakeSortIdNumber, + searchAfterSortIds: [fakeSortIdNumber], timestampOverride: undefined, - excludeDocsWithTimestampOverride: false, }); expect(query).toEqual({ allow_no_indices: true, @@ -237,12 +290,19 @@ describe('create_signals', () => { bool: { filter: [ { - range: { - '@timestamp': { - gte: 'now-5m', - lte: 'today', - format: 'strict_date_optional_time', - }, + bool: { + minimum_should_match: 1, + should: [ + { + range: { + '@timestamp': { + gte: 'now-5m', + lte: 'today', + format: 'strict_date_optional_time', + }, + }, + }, + ], }, }, ], @@ -279,9 +339,8 @@ describe('create_signals', () => { to: 'today', filter: {}, size: 100, - searchAfterSortId: undefined, + searchAfterSortIds: undefined, timestampOverride: undefined, - excludeDocsWithTimestampOverride: false, }); expect(query).toEqual({ allow_no_indices: true, @@ -303,12 +362,19 @@ describe('create_signals', () => { bool: { filter: [ { - range: { - '@timestamp': { - gte: 'now-5m', - lte: 'today', - format: 'strict_date_optional_time', - }, + bool: { + minimum_should_match: 1, + should: [ + { + range: { + '@timestamp': { + gte: 'now-5m', + lte: 'today', + format: 'strict_date_optional_time', + }, + }, + }, + ], }, }, ], @@ -352,9 +418,8 @@ describe('create_signals', () => { to: 'today', filter: {}, size: 100, - searchAfterSortId: undefined, + searchAfterSortIds: undefined, timestampOverride: undefined, - excludeDocsWithTimestampOverride: false, }); expect(query).toEqual({ allow_no_indices: true, @@ -371,12 +436,19 @@ describe('create_signals', () => { bool: { filter: [ { - range: { - '@timestamp': { - gte: 'now-5m', - lte: 'today', - format: 'strict_date_optional_time', - }, + bool: { + minimum_should_match: 1, + should: [ + { + range: { + '@timestamp': { + gte: 'now-5m', + lte: 'today', + format: 'strict_date_optional_time', + }, + }, + }, + ], }, }, ], diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts index e086c862262c1..86fb51e4785ad 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts @@ -5,6 +5,8 @@ * 2.0. */ import type { estypes } from '@elastic/elasticsearch'; +import { SortResults } from '@elastic/elasticsearch/api/types'; +import { isEmpty } from 'lodash'; import { SortOrderOrUndefined, TimestampOverrideOrUndefined, @@ -18,9 +20,8 @@ interface BuildEventsSearchQuery { filter?: estypes.QueryContainer; size: number; sortOrder?: SortOrderOrUndefined; - searchAfterSortId: string | number | undefined; + searchAfterSortIds: SortResults | undefined; timestampOverride: TimestampOverrideOrUndefined; - excludeDocsWithTimestampOverride: boolean; } export const buildEventsSearchQuery = ({ @@ -30,10 +31,9 @@ export const buildEventsSearchQuery = ({ to, filter, size, - searchAfterSortId, + searchAfterSortIds, sortOrder, timestampOverride, - excludeDocsWithTimestampOverride, }: BuildEventsSearchQuery) => { const defaultTimeFields = ['@timestamp']; const timestamps = @@ -43,36 +43,62 @@ export const buildEventsSearchQuery = ({ format: 'strict_date_optional_time', })); - const sortField = - timestampOverride != null && !excludeDocsWithTimestampOverride - ? timestampOverride - : '@timestamp'; + const rangeFilter: estypes.QueryContainer[] = + timestampOverride != null + ? [ + { + range: { + [timestampOverride]: { + lte: to, + gte: from, + format: 'strict_date_optional_time', + }, + }, + }, + { + bool: { + filter: [ + { + range: { + '@timestamp': { + lte: to, + gte: from, + // @ts-expect-error + format: 'strict_date_optional_time', + }, + }, + }, + { + bool: { + must_not: { + exists: { + field: timestampOverride, + }, + }, + }, + }, + ], + }, + }, + ] + : [ + { + range: { + '@timestamp': { + lte: to, + gte: from, + format: 'strict_date_optional_time', + }, + }, + }, + ]; - const rangeFilter: estypes.QueryContainer[] = [ - { - range: { - [sortField]: { - lte: to, - gte: from, - format: 'strict_date_optional_time', - }, - }, - }, + const filterWithTime: estypes.QueryContainer[] = [ + // but tests contain undefined, so I suppose it's desired behaviour + // @ts-expect-error undefined in not assignable to QueryContainer + filter, + { bool: { filter: [{ bool: { should: [...rangeFilter], minimum_should_match: 1 } }] } }, ]; - if (excludeDocsWithTimestampOverride) { - rangeFilter.push({ - bool: { - must_not: { - exists: { - field: timestampOverride, - }, - }, - }, - }); - } - // @ts-expect-error undefined in not assignable to QueryContainer - // but tests contain undefined, so I suppose it's desired behaviour - const filterWithTime: estypes.QueryContainer[] = [filter, { bool: { filter: rangeFilter } }]; const searchQuery = { allow_no_indices: true, @@ -99,22 +125,39 @@ export const buildEventsSearchQuery = ({ ], ...(aggregations ? { aggregations } : {}), sort: [ - { - [sortField]: { - order: sortOrder ?? 'asc', - unmapped_type: 'date', - }, - }, + ...(timestampOverride != null + ? [ + { + [timestampOverride]: { + order: sortOrder ?? 'asc', + unmapped_type: 'date', + }, + }, + { + '@timestamp': { + order: sortOrder ?? 'asc', + unmapped_type: 'date', + }, + }, + ] + : [ + { + '@timestamp': { + order: sortOrder ?? 'asc', + unmapped_type: 'date', + }, + }, + ]), ], }, }; - if (searchAfterSortId) { + if (searchAfterSortIds != null && !isEmpty(searchAfterSortIds)) { return { ...searchQuery, body: { ...searchQuery.body, - search_after: [searchAfterSortId], + search_after: searchAfterSortIds, }, }; } diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts index aac0f47c28295..3fa5d1178b3ec 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_field_and_set_tuples.test.ts @@ -17,7 +17,7 @@ import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock' describe('filterEventsAgainstList', () => { let listClient = listMock.getListClient(); let exceptionItem = getExceptionListItemSchemaMock(); - let events = [sampleDocWithSortId('123', '1.1.1.1')]; + let events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; beforeEach(() => { jest.clearAllMocks(); @@ -44,7 +44,7 @@ describe('filterEventsAgainstList', () => { }, ], }; - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; }); afterEach(() => { @@ -111,7 +111,7 @@ describe('filterEventsAgainstList', () => { }); test('it returns a single matched set as a JSON.stringify() set from the "events"', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; (exceptionItem.entries[0] as EntryList).field = 'source.ip'; const [{ matchedSet }] = await createFieldAndSetTuples({ listClient, @@ -124,7 +124,10 @@ describe('filterEventsAgainstList', () => { }); test('it returns two matched sets as a JSON.stringify() set from the "events"', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1'), sampleDocWithSortId('456', '2.2.2.2')]; + events = [ + sampleDocWithSortId('123', undefined, '1.1.1.1'), + sampleDocWithSortId('456', undefined, '2.2.2.2'), + ]; (exceptionItem.entries[0] as EntryList).field = 'source.ip'; const [{ matchedSet }] = await createFieldAndSetTuples({ listClient, @@ -137,7 +140,7 @@ describe('filterEventsAgainstList', () => { }); test('it returns an array as a set as a JSON.stringify() array from the "events"', async () => { - events = [sampleDocWithSortId('123', ['1.1.1.1', '2.2.2.2'])]; + events = [sampleDocWithSortId('123', undefined, ['1.1.1.1', '2.2.2.2'])]; (exceptionItem.entries[0] as EntryList).field = 'source.ip'; const [{ matchedSet }] = await createFieldAndSetTuples({ listClient, @@ -150,7 +153,10 @@ describe('filterEventsAgainstList', () => { }); test('it returns 2 fields when given two exception list items', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1'), sampleDocWithSortId('456', '2.2.2.2')]; + events = [ + sampleDocWithSortId('123', undefined, '1.1.1.1'), + sampleDocWithSortId('456', undefined, '2.2.2.2'), + ]; exceptionItem.entries = [ { field: 'source.ip', @@ -182,7 +188,10 @@ describe('filterEventsAgainstList', () => { }); test('it returns two matched sets from two different events, one excluded, and one included', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1'), sampleDocWithSortId('456', '2.2.2.2')]; + events = [ + sampleDocWithSortId('123', undefined, '1.1.1.1'), + sampleDocWithSortId('456', undefined, '2.2.2.2'), + ]; exceptionItem.entries = [ { field: 'source.ip', @@ -215,7 +224,10 @@ describe('filterEventsAgainstList', () => { }); test('it returns two fields from two different events', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1'), sampleDocWithSortId('456', '2.2.2.2')]; + events = [ + sampleDocWithSortId('123', undefined, '1.1.1.1'), + sampleDocWithSortId('456', undefined, '2.2.2.2'), + ]; exceptionItem.entries = [ { field: 'source.ip', @@ -249,8 +261,8 @@ describe('filterEventsAgainstList', () => { test('it returns two matches from two different events', async () => { events = [ - sampleDocWithSortId('123', '1.1.1.1', '3.3.3.3'), - sampleDocWithSortId('456', '2.2.2.2', '5.5.5.5'), + sampleDocWithSortId('123', undefined, '1.1.1.1', '3.3.3.3'), + sampleDocWithSortId('456', undefined, '2.2.2.2', '5.5.5.5'), ]; exceptionItem.entries = [ { diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts index aae4a7aae2b9e..743218f9ed940 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/create_set_to_filter_against.test.ts @@ -14,7 +14,7 @@ import { buildRuleMessageMock as buildRuleMessage } from '../rule_messages.mock' describe('createSetToFilterAgainst', () => { let listClient = listMock.getListClient(); - let events = [sampleDocWithSortId('123', '1.1.1.1')]; + let events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; beforeEach(() => { jest.clearAllMocks(); @@ -27,7 +27,7 @@ describe('createSetToFilterAgainst', () => { })) ) ); - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; }); afterEach(() => { @@ -49,7 +49,7 @@ describe('createSetToFilterAgainst', () => { }); test('it returns 1 field if the list returns a single item', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; const field = await createSetToFilterAgainst({ events, field: 'source.ip', @@ -68,7 +68,10 @@ describe('createSetToFilterAgainst', () => { }); test('it returns 2 fields if the list returns 2 items', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1'), sampleDocWithSortId('123', '2.2.2.2')]; + events = [ + sampleDocWithSortId('123', undefined, '1.1.1.1'), + sampleDocWithSortId('123', undefined, '2.2.2.2'), + ]; const field = await createSetToFilterAgainst({ events, field: 'source.ip', @@ -87,7 +90,10 @@ describe('createSetToFilterAgainst', () => { }); test('it returns 0 fields if the field does not match up to a valid field within the event', async () => { - events = [sampleDocWithSortId('123', '1.1.1.1'), sampleDocWithSortId('123', '2.2.2.2')]; + events = [ + sampleDocWithSortId('123', undefined, '1.1.1.1'), + sampleDocWithSortId('123', undefined, '2.2.2.2'), + ]; const field = await createSetToFilterAgainst({ events, field: 'nonexistent.field', // field does not exist diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts index eb5c69e8abfe8..45a058b55d84b 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.test.ts @@ -14,7 +14,7 @@ import { FieldSet } from './types'; describe('filterEvents', () => { let listClient = listMock.getListClient(); - let events = [sampleDocWithSortId('123', '1.1.1.1')]; + let events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; beforeEach(() => { jest.clearAllMocks(); @@ -27,7 +27,7 @@ describe('filterEvents', () => { })) ) ); - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; }); afterEach(() => { @@ -35,7 +35,7 @@ describe('filterEvents', () => { }); test('it filters out the event if it is "included"', () => { - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; const fieldAndSetTuples: FieldSet[] = [ { field: 'source.ip', @@ -51,7 +51,7 @@ describe('filterEvents', () => { }); test('it does not filter out the event if it is "excluded"', () => { - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; const fieldAndSetTuples: FieldSet[] = [ { field: 'source.ip', @@ -67,7 +67,7 @@ describe('filterEvents', () => { }); test('it does NOT filter out the event if the field is not found', () => { - events = [sampleDocWithSortId('123', '1.1.1.1')]; + events = [sampleDocWithSortId('123', undefined, '1.1.1.1')]; const fieldAndSetTuples: FieldSet[] = [ { field: 'madeup.nonexistent', // field does not exist @@ -83,7 +83,10 @@ describe('filterEvents', () => { }); test('it does NOT filter out the event if it is in both an inclusion and exclusion list', () => { - events = [sampleDocWithSortId('123', '1.1.1.1'), sampleDocWithSortId('123', '2.2.2.2')]; + events = [ + sampleDocWithSortId('123', undefined, '1.1.1.1'), + sampleDocWithSortId('123', undefined, '2.2.2.2'), + ]; const fieldAndSetTuples: FieldSet[] = [ { field: 'source.ip', diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts index 9d9eefe844532..0c7723b6f4cc2 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.test.ts @@ -426,6 +426,84 @@ describe('searchAfterAndBulkCreate', () => { expect(lastLookBackDate).toEqual(new Date('2020-04-20T21:27:45+0000')); }); + test('should return success when empty string sortId present', async () => { + mockService.scopedClusterClient.asCurrentUser.bulk.mockResolvedValueOnce( + elasticsearchClientMock.createSuccessTransportRequestPromise({ + took: 100, + errors: false, + items: [ + { + create: { + _id: someGuids[0], + _index: 'myfakeindex', + status: 201, + }, + }, + { + create: { + _id: someGuids[1], + _index: 'myfakeindex', + status: 201, + }, + }, + { + create: { + _id: someGuids[2], + _index: 'myfakeindex', + status: 201, + }, + }, + { + create: { + _id: someGuids[3], + _index: 'myfakeindex', + status: 201, + }, + }, + ], + }) + ); + mockService.scopedClusterClient.asCurrentUser.search + .mockResolvedValueOnce( + elasticsearchClientMock.createSuccessTransportRequestPromise( + repeatedSearchResultsWithSortId( + 4, + 4, + someGuids.slice(0, 3), + ['1.1.1.1', '2.2.2.2', '2.2.2.2', '2.2.2.2'], + // this is the case we are testing, if we receive an empty string for one of the sort ids. + ['', '2222222222222'] + ) + ) + ) + .mockResolvedValueOnce( + elasticsearchClientMock.createSuccessTransportRequestPromise( + sampleDocSearchResultsNoSortIdNoHits() + ) + ); + + const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({ + ruleSO, + tuples, + listClient, + exceptionsList: [], + services: mockService, + logger: mockLogger, + eventsTelemetry: undefined, + id: sampleRuleGuid, + inputIndexPattern, + signalsIndex: DEFAULT_SIGNALS_INDEX, + pageSize: 1, + filter: undefined, + refresh: false, + buildRuleMessage, + }); + expect(success).toEqual(true); + expect(mockService.scopedClusterClient.asCurrentUser.search).toHaveBeenCalledTimes(2); + expect(createdSignalsCount).toEqual(4); + expect(lastLookBackDate).toEqual(new Date('2020-04-20T21:27:45+0000')); + }); + test('should return success when all search results are in the allowlist and no sortId present', async () => { const searchListItems: SearchListItemArraySchema = [ { ...getSearchListItemResponseMock(), value: ['1.1.1.1'] }, diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts index 0bc0039b54dba..08f8abe384d0f 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts @@ -5,9 +5,8 @@ * 2.0. */ -/* eslint-disable complexity */ - import { identity } from 'lodash'; +import { SortResults } from '@elastic/elasticsearch/api/types'; import { singleSearchAfter } from './single_search_after'; import { singleBulkCreate } from './single_bulk_create'; import { filterEventsAgainstList } from './filters/filter_events_against_list'; @@ -19,6 +18,7 @@ import { createTotalHitsFromSearchResult, mergeReturns, mergeSearchResults, + getSafeSortIds, } from './utils'; import { SearchAfterAndBulkCreateParams, SearchAfterAndBulkCreateReturnType } from './types'; @@ -44,10 +44,8 @@ export const searchAfterAndBulkCreate = async ({ let toReturn = createSearchAfterReturnType(); // sortId tells us where to start our next consecutive search_after query - let sortId: string | undefined; + let sortIds: SortResults | undefined; let hasSortId = true; // default to true so we execute the search on initial run - let backupSortId: string | undefined; - let hasBackupSortId = ruleParams.timestampOverride ? true : false; // signalsCreatedCount keeps track of how many signals we have created, // to ensure we don't exceed maxSignals @@ -69,60 +67,12 @@ export const searchAfterAndBulkCreate = async ({ while (signalsCreatedCount < tuple.maxSignals) { try { let mergedSearchResults = createSearchResultReturnType(); - logger.debug(buildRuleMessage(`sortIds: ${sortId}`)); - - // if there is a timestampOverride param we always want to do a secondary search against @timestamp - if (ruleParams.timestampOverride != null && hasBackupSortId) { - // only execute search if we have something to sort on or if it is the first search - const { - searchResult: searchResultB, - searchDuration: searchDurationB, - searchErrors: searchErrorsB, - } = await singleSearchAfter({ - buildRuleMessage, - searchAfterSortId: backupSortId, - index: inputIndexPattern, - from: tuple.from.toISOString(), - to: tuple.to.toISOString(), - services, - logger, - // @ts-expect-error please, declare a type explicitly instead of unknown - filter, - pageSize: Math.ceil(Math.min(tuple.maxSignals, pageSize)), - timestampOverride: ruleParams.timestampOverride, - excludeDocsWithTimestampOverride: true, - }); - - // call this function setSortIdOrExit() - const lastSortId = searchResultB?.hits?.hits[searchResultB.hits.hits.length - 1]?.sort; - if (lastSortId != null && lastSortId.length !== 0) { - // @ts-expect-error @elastic/elasticsearch SortResults contains null not assignable to backupSortId - backupSortId = lastSortId[0]; - hasBackupSortId = true; - } else { - logger.debug(buildRuleMessage('backupSortIds was empty on searchResultB')); - hasBackupSortId = false; - } - - mergedSearchResults = mergeSearchResults([mergedSearchResults, searchResultB]); - - toReturn = mergeReturns([ - toReturn, - createSearchAfterReturnTypeFromResponse({ - searchResult: mergedSearchResults, - timestampOverride: undefined, - }), - createSearchAfterReturnType({ - searchAfterTimes: [searchDurationB], - errors: searchErrorsB, - }), - ]); - } + logger.debug(buildRuleMessage(`sortIds: ${sortIds}`)); if (hasSortId) { const { searchResult, searchDuration, searchErrors } = await singleSearchAfter({ buildRuleMessage, - searchAfterSortId: sortId, + searchAfterSortIds: sortIds, index: inputIndexPattern, from: tuple.from.toISOString(), to: tuple.to.toISOString(), @@ -132,7 +82,6 @@ export const searchAfterAndBulkCreate = async ({ filter, pageSize: Math.ceil(Math.min(tuple.maxSignals, pageSize)), timestampOverride: ruleParams.timestampOverride, - excludeDocsWithTimestampOverride: false, }); mergedSearchResults = mergeSearchResults([mergedSearchResults, searchResult]); toReturn = mergeReturns([ @@ -147,10 +96,11 @@ export const searchAfterAndBulkCreate = async ({ }), ]); - const lastSortId = searchResult.hits.hits[searchResult.hits.hits.length - 1]?.sort; - if (lastSortId != null && lastSortId.length !== 0) { - // @ts-expect-error @elastic/elasticsearch SortResults contains null not assignable to sortId - sortId = lastSortId[0]; + const lastSortIds = getSafeSortIds( + searchResult.hits.hits[searchResult.hits.hits.length - 1]?.sort + ); + if (lastSortIds != null && lastSortIds.length !== 0) { + sortIds = lastSortIds; hasSortId = true; } else { hasSortId = false; @@ -236,7 +186,7 @@ export const searchAfterAndBulkCreate = async ({ sendAlertTelemetryEvents(logger, eventsTelemetry, filteredEvents, buildRuleMessage); } - if (!hasSortId && !hasBackupSortId) { + if (!hasSortId) { logger.debug(buildRuleMessage('ran out of sort ids to sort on')); break; } diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts index cbffac6e7b455..a40459d312b9f 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts @@ -34,7 +34,7 @@ describe('singleSearchAfter', () => { elasticsearchClientMock.createSuccessTransportRequestPromise(sampleDocSearchResultsNoSortId()) ); const { searchResult } = await singleSearchAfter({ - searchAfterSortId: undefined, + searchAfterSortIds: undefined, index: [], from: 'now-360s', to: 'now', @@ -44,7 +44,6 @@ describe('singleSearchAfter', () => { filter: undefined, timestampOverride: undefined, buildRuleMessage, - excludeDocsWithTimestampOverride: false, }); expect(searchResult).toEqual(sampleDocSearchResultsNoSortId()); }); @@ -53,7 +52,7 @@ describe('singleSearchAfter', () => { elasticsearchClientMock.createSuccessTransportRequestPromise(sampleDocSearchResultsNoSortId()) ); const { searchErrors } = await singleSearchAfter({ - searchAfterSortId: undefined, + searchAfterSortIds: undefined, index: [], from: 'now-360s', to: 'now', @@ -63,7 +62,6 @@ describe('singleSearchAfter', () => { filter: undefined, timestampOverride: undefined, buildRuleMessage, - excludeDocsWithTimestampOverride: false, }); expect(searchErrors).toEqual([]); }); @@ -104,7 +102,7 @@ describe('singleSearchAfter', () => { }) ); const { searchErrors } = await singleSearchAfter({ - searchAfterSortId: undefined, + searchAfterSortIds: undefined, index: [], from: 'now-360s', to: 'now', @@ -114,21 +112,20 @@ describe('singleSearchAfter', () => { filter: undefined, timestampOverride: undefined, buildRuleMessage, - excludeDocsWithTimestampOverride: false, }); expect(searchErrors).toEqual([ 'index: "index-123" reason: "some reason" type: "some type" caused by reason: "some reason" caused by type: "some type"', ]); }); test('if singleSearchAfter works with a given sort id', async () => { - const searchAfterSortId = '1234567891111'; + const searchAfterSortIds = ['1234567891111']; mockService.scopedClusterClient.asCurrentUser.search.mockResolvedValueOnce( elasticsearchClientMock.createSuccessTransportRequestPromise( sampleDocSearchResultsWithSortId() ) ); const { searchResult } = await singleSearchAfter({ - searchAfterSortId, + searchAfterSortIds, index: [], from: 'now-360s', to: 'now', @@ -138,18 +135,17 @@ describe('singleSearchAfter', () => { filter: undefined, timestampOverride: undefined, buildRuleMessage, - excludeDocsWithTimestampOverride: false, }); expect(searchResult).toEqual(sampleDocSearchResultsWithSortId()); }); test('if singleSearchAfter throws error', async () => { - const searchAfterSortId = '1234567891111'; + const searchAfterSortIds = ['1234567891111']; mockService.scopedClusterClient.asCurrentUser.search.mockResolvedValueOnce( elasticsearchClientMock.createErrorTransportRequestPromise(new Error('Fake Error')) ); await expect( singleSearchAfter({ - searchAfterSortId, + searchAfterSortIds, index: [], from: 'now-360s', to: 'now', @@ -159,7 +155,6 @@ describe('singleSearchAfter', () => { filter: undefined, timestampOverride: undefined, buildRuleMessage, - excludeDocsWithTimestampOverride: false, }) ).rejects.toThrow('Fake Error'); }); diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts index 9dcec1861f15d..57ed05bcb27cf 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts @@ -6,6 +6,7 @@ */ import type { estypes } from '@elastic/elasticsearch'; import { performance } from 'perf_hooks'; +import { SearchRequest, SortResults } from '@elastic/elasticsearch/api/types'; import { AlertInstanceContext, AlertInstanceState, @@ -23,7 +24,7 @@ import { interface SingleSearchAfterParams { aggregations?: Record; - searchAfterSortId: string | undefined; + searchAfterSortIds: SortResults | undefined; index: string[]; from: string; to: string; @@ -34,13 +35,12 @@ interface SingleSearchAfterParams { filter?: estypes.QueryContainer; timestampOverride: TimestampOverrideOrUndefined; buildRuleMessage: BuildRuleMessage; - excludeDocsWithTimestampOverride: boolean; } // utilize search_after for paging results into bulk. export const singleSearchAfter = async ({ aggregations, - searchAfterSortId, + searchAfterSortIds, index, from, to, @@ -51,7 +51,6 @@ export const singleSearchAfter = async ({ sortOrder, timestampOverride, buildRuleMessage, - excludeDocsWithTimestampOverride, }: SingleSearchAfterParams): Promise<{ searchResult: SignalSearchResponse; searchDuration: string; @@ -66,15 +65,16 @@ export const singleSearchAfter = async ({ filter, size: pageSize, sortOrder, - searchAfterSortId, + searchAfterSortIds, timestampOverride, - excludeDocsWithTimestampOverride, }); const start = performance.now(); const { body: nextSearchAfterResult, - } = await services.scopedClusterClient.asCurrentUser.search(searchAfterQuery); + } = await services.scopedClusterClient.asCurrentUser.search( + searchAfterQuery as SearchRequest + ); const end = performance.now(); const searchErrors = createErrorsFromShard({ errors: nextSearchAfterResult._shards.failures ?? [], diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_previous_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_previous_threshold_signals.ts index 06e718b646ffa..1a2bfbf3a962d 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_previous_threshold_signals.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_previous_threshold_signals.ts @@ -71,7 +71,7 @@ export const findPreviousThresholdSignals = async ({ }; return singleSearchAfter({ - searchAfterSortId: undefined, + searchAfterSortIds: undefined, timestampOverride, index: indexPattern, from, @@ -81,6 +81,5 @@ export const findPreviousThresholdSignals = async ({ filter, pageSize: 10000, // TODO: multiple pages? buildRuleMessage, - excludeDocsWithTimestampOverride: false, }); }; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts index 33ffa5b71a65c..986393d6d3454 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threshold/find_threshold_signals.ts @@ -141,6 +141,5 @@ export const findThresholdSignals = async ({ pageSize: 1, sortOrder: 'desc', buildRuleMessage, - excludeDocsWithTimestampOverride: false, }); }; diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts index 54ed44956c8b3..bd37cf62c74b0 100644 --- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts +++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts @@ -13,6 +13,7 @@ import type { estypes } from '@elastic/elasticsearch'; import { isEmpty, partition } from 'lodash'; import { ApiResponse, Context } from '@elastic/elasticsearch/lib/Transport'; +import { SortResults } from '@elastic/elasticsearch/api/types'; import { TimestampOverrideOrUndefined, Privilege, @@ -846,3 +847,25 @@ export const isThreatParams = (params: RuleParams): params is ThreatRuleParams = params.type === 'threat_match'; export const isMachineLearningParams = (params: RuleParams): params is MachineLearningRuleParams => params.type === 'machine_learning'; + +/** + * Prevent javascript from returning Number.MAX_SAFE_INTEGER when Elasticsearch expects + * Java's Long.MAX_VALUE. This happens when sorting fields by date which are + * unmapped in the provided index + * + * Ref: https://github.com/elastic/elasticsearch/issues/28806#issuecomment-369303620 + * + * return stringified Long.MAX_VALUE if we receive Number.MAX_SAFE_INTEGER + * @param sortIds SortResults | undefined + * @returns SortResults + */ +export const getSafeSortIds = (sortIds: SortResults | undefined) => { + return sortIds?.map((sortId) => { + // haven't determined when we would receive a null value for a sort id + // but in case we do, default to sending the stringified Java max_int + if (sortId == null || sortId === '' || sortId >= Number.MAX_SAFE_INTEGER) { + return '9223372036854775807'; + } + return sortId; + }); +}; diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts index b32d2a6542f4a..f620027409d26 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.test.ts @@ -38,6 +38,7 @@ describe('TelemetryEventsSender', () => { id: 'X', name: 'Y', ruleset: 'Z', + version: '100', }, file: { size: 3, @@ -97,6 +98,7 @@ describe('TelemetryEventsSender', () => { id: 'X', name: 'Y', ruleset: 'Z', + version: '100', }, file: { size: 3, @@ -253,6 +255,57 @@ describe('allowlistEventFields', () => { }); }); + it('filters arrays of objects', () => { + const event = { + a: [ + { + a1: 'a1', + }, + ], + b: { + b1: 'b1', + }, + c: [ + { + d: 'd1', + e: 'e1', + f: 'f1', + }, + { + d: 'd2', + e: 'e2', + f: 'f2', + }, + { + d: 'd3', + e: 'e3', + f: 'f3', + }, + ], + }; + expect(copyAllowlistedFields(allowlist, event)).toStrictEqual({ + a: [ + { + a1: 'a1', + }, + ], + b: { + b1: 'b1', + }, + c: [ + { + d: 'd1', + }, + { + d: 'd2', + }, + { + d: 'd3', + }, + ], + }); + }); + it("doesn't create empty objects", () => { const event = { a: 'a', diff --git a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts index 7d723c578e3d0..b47edbb21d178 100644 --- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts +++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts @@ -21,16 +21,8 @@ import { } from '../../../../task_manager/server'; import { TelemetryDiagTask } from './task'; -export type SearchTypes = - | string - | string[] - | number - | number[] - | boolean - | boolean[] - | object - | object[] - | undefined; +type BaseSearchTypes = string | number | boolean | object; +export type SearchTypes = BaseSearchTypes | BaseSearchTypes[] | undefined; export interface TelemetryEvent { [key: string]: SearchTypes; @@ -294,8 +286,8 @@ interface AllowlistFields { } // Allow list process fields within events. This includes "process" and "Target.process".' -/* eslint-disable @typescript-eslint/naming-convention */ const allowlistProcessFields: AllowlistFields = { + args: true, name: true, executable: true, command_line: true, @@ -306,28 +298,59 @@ const allowlistProcessFields: AllowlistFields = { architecture: true, code_signature: true, dll: true, + malware_signature: true, token: { integrity_level_name: true, }, }, - parent: { + thread: true, +}; + +// Allow list for event-related fields, which can also be nested under events[] +const allowlistBaseEventFields: AllowlistFields = { + dll: { name: true, - executable: true, - command_line: true, + path: true, + code_signature: true, + malware_signature: true, + }, + event: true, + file: { + name: true, + path: true, + size: true, + created: true, + accessed: true, + mtime: true, + directory: true, hash: true, Ext: { - architecture: true, code_signature: true, - dll: true, - token: { - integrity_level_name: true, - }, + malware_classification: true, + malware_signature: true, + quarantine_result: true, + quarantine_message: true, + }, + }, + process: { + parent: allowlistProcessFields, + ...allowlistProcessFields, + }, + network: { + direction: true, + }, + registry: { + hive: true, + key: true, + path: true, + value: true, + }, + Target: { + process: { + parent: allowlistProcessFields, + ...allowlistProcessFields, }, - uptime: true, - pid: true, - ppid: true, }, - thread: true, }; // Allow list for the data we include in the events. True means that it is deep-cloned @@ -337,41 +360,24 @@ const allowlistEventFields: AllowlistFields = { '@timestamp': true, agent: true, Endpoint: true, + /* eslint-disable @typescript-eslint/naming-convention */ Memory_protection: true, Ransomware: true, data_stream: true, ecs: true, elastic: true, - event: true, + // behavioral protection re-nests some field sets under events.* + events: allowlistBaseEventFields, rule: { id: true, name: true, ruleset: true, - }, - file: { - name: true, - path: true, - size: true, - created: true, - accessed: true, - mtime: true, - directory: true, - hash: true, - Ext: { - code_signature: true, - malware_classification: true, - malware_signature: true, - quarantine_result: true, - quarantine_message: true, - }, + version: true, }, host: { os: true, }, - process: allowlistProcessFields, - Target: { - process: allowlistProcessFields, - }, + ...allowlistBaseEventFields, }; export function copyAllowlistedFields( @@ -383,6 +389,12 @@ export function copyAllowlistedFields( if (eventValue !== null && eventValue !== undefined) { if (allowValue === true) { return { ...newEvent, [allowKey]: eventValue }; + } else if (typeof allowValue === 'object' && Array.isArray(eventValue)) { + const subValues = eventValue.filter((v) => typeof v === 'object'); + return { + ...newEvent, + [allowKey]: subValues.map((v) => copyAllowlistedFields(allowValue, v as TelemetryEvent)), + }; } else if (typeof allowValue === 'object' && typeof eventValue === 'object') { const values = copyAllowlistedFields(allowValue, eventValue as TelemetryEvent); return { diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts index d0b7e6500c42b..2b5a25ec1b316 100644 --- a/x-pack/plugins/security_solution/server/plugin.ts +++ b/x-pack/plugins/security_solution/server/plugin.ts @@ -174,6 +174,7 @@ export class Plugin implements IPlugin { @@ -65,6 +66,163 @@ export const registerCollector: RegisterCollector = ({ }, }, detectionMetrics: { + detection_rules: { + detection_rule_usage: { + query: { + enabled: { type: 'long', _meta: { description: 'Number of query rules enabled' } }, + disabled: { type: 'long', _meta: { description: 'Number of query rules disabled' } }, + alerts: { + type: 'long', + _meta: { description: 'Number of alerts generated by query rules' }, + }, + cases: { + type: 'long', + _meta: { description: 'Number of cases attached to query detection rule alerts' }, + }, + }, + threshold: { + enabled: { + type: 'long', + _meta: { description: 'Number of threshold rules enabled' }, + }, + disabled: { + type: 'long', + _meta: { description: 'Number of threshold rules disabled' }, + }, + alerts: { + type: 'long', + _meta: { description: 'Number of alerts generated by threshold rules' }, + }, + cases: { + type: 'long', + _meta: { + description: 'Number of cases attached to threshold detection rule alerts', + }, + }, + }, + eql: { + enabled: { type: 'long', _meta: { description: 'Number of eql rules enabled' } }, + disabled: { type: 'long', _meta: { description: 'Number of eql rules disabled' } }, + alerts: { + type: 'long', + _meta: { description: 'Number of alerts generated by eql rules' }, + }, + cases: { + type: 'long', + _meta: { description: 'Number of cases attached to eql detection rule alerts' }, + }, + }, + machine_learning: { + enabled: { + type: 'long', + _meta: { description: 'Number of machine_learning rules enabled' }, + }, + disabled: { + type: 'long', + _meta: { description: 'Number of machine_learning rules disabled' }, + }, + alerts: { + type: 'long', + _meta: { description: 'Number of alerts generated by machine_learning rules' }, + }, + cases: { + type: 'long', + _meta: { + description: 'Number of cases attached to machine_learning detection rule alerts', + }, + }, + }, + threat_match: { + enabled: { + type: 'long', + _meta: { description: 'Number of threat_match rules enabled' }, + }, + disabled: { + type: 'long', + _meta: { description: 'Number of threat_match rules disabled' }, + }, + alerts: { + type: 'long', + _meta: { description: 'Number of alerts generated by threat_match rules' }, + }, + cases: { + type: 'long', + _meta: { + description: 'Number of cases attached to threat_match detection rule alerts', + }, + }, + }, + elastic_total: { + enabled: { type: 'long', _meta: { description: 'Number of elastic rules enabled' } }, + disabled: { + type: 'long', + _meta: { description: 'Number of elastic rules disabled' }, + }, + alerts: { + type: 'long', + _meta: { description: 'Number of alerts generated by elastic rules' }, + }, + cases: { + type: 'long', + _meta: { description: 'Number of cases attached to elastic detection rule alerts' }, + }, + }, + custom_total: { + enabled: { type: 'long', _meta: { description: 'Number of custom rules enabled' } }, + disabled: { type: 'long', _meta: { description: 'Number of custom rules disabled' } }, + alerts: { + type: 'long', + _meta: { description: 'Number of alerts generated by custom rules' }, + }, + cases: { + type: 'long', + _meta: { description: 'Number of cases attached to custom detection rule alerts' }, + }, + }, + }, + detection_rule_detail: { + type: 'array', + items: { + rule_name: { + type: 'keyword', + _meta: { description: 'The name of the detection rule' }, + }, + rule_id: { + type: 'keyword', + _meta: { description: 'The UUID id of the detection rule' }, + }, + rule_type: { + type: 'keyword', + _meta: { description: 'The type of detection rule. ie eql, query...' }, + }, + rule_version: { type: 'long', _meta: { description: 'The version of the rule' } }, + enabled: { + type: 'boolean', + _meta: { description: 'If the detection rule has been enabled by the user' }, + }, + elastic_rule: { + type: 'boolean', + _meta: { description: 'If the detection rule has been authored by Elastic' }, + }, + created_on: { + type: 'keyword', + _meta: { description: 'When the detection rule was created on the cluster' }, + }, + updated_on: { + type: 'keyword', + _meta: { description: 'When the detection rule was updated on the cluster' }, + }, + alert_count_daily: { + type: 'long', + _meta: { description: 'The number of daily alerts generated by a rule' }, + }, + cases_count_daily: { + type: 'long', + _meta: { description: 'The number of daily cases generated by a rule' }, + }, + }, + }, + }, ml_jobs: { type: 'array', items: { @@ -132,13 +290,13 @@ export const registerCollector: RegisterCollector = ({ }, }, }, - isReady: () => kibanaIndex.length > 0, + isReady: () => true, fetch: async ({ esClient }: CollectorFetchContext): Promise => { const internalSavedObjectsClient = await getInternalSavedObjectsClient(core); const savedObjectsClient = (internalSavedObjectsClient as unknown) as SavedObjectsClientContract; const [detections, detectionMetrics, endpoints] = await Promise.allSettled([ fetchDetectionsUsage(kibanaIndex, esClient, ml, savedObjectsClient), - fetchDetectionsMetrics(ml, savedObjectsClient), + fetchDetectionsMetrics(kibanaIndex, signalsIndex, esClient, ml, savedObjectsClient), getEndpointTelemetryFromFleet(savedObjectsClient, endpointAppContext, esClient), ]); diff --git a/x-pack/plugins/security_solution/server/usage/detections/dectections_metrics_helpers.test.ts b/x-pack/plugins/security_solution/server/usage/detections/dectections_metrics_helpers.test.ts new file mode 100644 index 0000000000000..bd470ccabbfed --- /dev/null +++ b/x-pack/plugins/security_solution/server/usage/detections/dectections_metrics_helpers.test.ts @@ -0,0 +1,147 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { initialDetectionRulesUsage, updateDetectionRuleUsage } from './detections_metrics_helpers'; +import { DetectionRuleMetric, DetectionRulesTypeUsage } from './index'; +import { v4 as uuid } from 'uuid'; + +const createStubRule = ( + ruleType: string, + enabled: boolean, + elasticRule: boolean, + alertCount: number, + caseCount: number +): DetectionRuleMetric => ({ + rule_name: uuid(), + rule_id: uuid(), + rule_type: ruleType, + enabled, + elastic_rule: elasticRule, + created_on: uuid(), + updated_on: uuid(), + alert_count_daily: alertCount, + cases_count_daily: caseCount, +}); + +describe('Detections Usage and Metrics', () => { + describe('Update metrics with rule information', () => { + it('Should update elastic and eql rule metric total', async () => { + const initialUsage: DetectionRulesTypeUsage = initialDetectionRulesUsage; + const stubRule = createStubRule('eql', true, true, 1, 1); + const usage = updateDetectionRuleUsage(stubRule, initialUsage); + + expect(usage).toEqual( + expect.objectContaining({ + custom_total: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + elastic_total: { + alerts: 1, + cases: 1, + disabled: 0, + enabled: 1, + }, + eql: { + alerts: 1, + cases: 1, + disabled: 0, + enabled: 1, + }, + machine_learning: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + query: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + threat_match: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + threshold: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + }) + ); + }); + + it('Should update based on multiple metrics', async () => { + const initialUsage: DetectionRulesTypeUsage = initialDetectionRulesUsage; + const stubEqlRule = createStubRule('eql', true, true, 1, 1); + const stubQueryRuleOne = createStubRule('query', true, true, 5, 2); + const stubQueryRuleTwo = createStubRule('query', true, false, 5, 2); + const stubMachineLearningOne = createStubRule('machine_learning', false, false, 0, 10); + const stubMachineLearningTwo = createStubRule('machine_learning', true, true, 22, 44); + + let usage = updateDetectionRuleUsage(stubEqlRule, initialUsage); + usage = updateDetectionRuleUsage(stubQueryRuleOne, usage); + usage = updateDetectionRuleUsage(stubQueryRuleTwo, usage); + usage = updateDetectionRuleUsage(stubMachineLearningOne, usage); + usage = updateDetectionRuleUsage(stubMachineLearningTwo, usage); + + expect(usage).toEqual( + expect.objectContaining({ + custom_total: { + alerts: 5, + cases: 12, + disabled: 1, + enabled: 1, + }, + elastic_total: { + alerts: 28, + cases: 47, + disabled: 0, + enabled: 3, + }, + eql: { + alerts: 1, + cases: 1, + disabled: 0, + enabled: 1, + }, + machine_learning: { + alerts: 22, + cases: 54, + disabled: 1, + enabled: 1, + }, + query: { + alerts: 10, + cases: 4, + disabled: 0, + enabled: 2, + }, + threat_match: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + threshold: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + }) + ); + }); + }); +}); diff --git a/x-pack/plugins/security_solution/server/usage/detections/detection_telemetry_helpers.ts b/x-pack/plugins/security_solution/server/usage/detections/detection_telemetry_helpers.ts new file mode 100644 index 0000000000000..bc1e734e4cc3a --- /dev/null +++ b/x-pack/plugins/security_solution/server/usage/detections/detection_telemetry_helpers.ts @@ -0,0 +1,46 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { INTERNAL_IMMUTABLE_KEY } from '../../../common/constants'; + +export const isElasticRule = (tags: string[] = []) => + tags.includes(`${INTERNAL_IMMUTABLE_KEY}:true`); + +interface RuleSearchBody { + query: { + bool: { + filter: { + term: { [key: string]: string }; + }; + }; + }; +} + +export interface RuleSearchParams { + body: RuleSearchBody; + filterPath: string[]; + ignoreUnavailable: boolean; + index: string; + size: number; +} + +export interface RuleSearchResult { + alert: { + name: string; + enabled: boolean; + tags: string[]; + createdAt: string; + updatedAt: string; + params: DetectionRuleParms; + }; +} + +interface DetectionRuleParms { + ruleId: string; + version: string; + type: string; +} diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts b/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts index f7fa59958abae..f90841ff4e596 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections.mocks.ts @@ -302,3 +302,179 @@ export const getMockMlDatafeedStatsResponse = () => ({ }, ], }); + +export const getMockRuleSearchResponse = (immutableTag: string = '__internal_immutable:true') => ({ + took: 2, + timed_out: false, + _shards: { + total: 1, + successful: 1, + skipped: 0, + failed: 0, + }, + hits: { + total: { + value: 1093, + relation: 'eq', + }, + max_score: 0, + hits: [ + { + _index: '.kibanaindex', + _id: 'alert:6eecd8c2-8bfb-11eb-afbe-1b7a66309c6d', + _score: 0, + _source: { + alert: { + name: 'Azure Diagnostic Settings Deletion', + tags: [ + 'Elastic', + 'Cloud', + 'Azure', + 'Continuous Monitoring', + 'SecOps', + 'Monitoring', + '__internal_rule_id:5370d4cd-2bb3-4d71-abf5-1e1d0ff5a2de', + `${immutableTag}`, + ], + alertTypeId: 'siem.signals', + consumer: 'siem', + params: { + author: ['Elastic'], + description: + 'Identifies the deletion of diagnostic settings in Azure, which send platform logs and metrics to different destinations. An adversary may delete diagnostic settings in an attempt to evade defenses.', + ruleId: '5370d4cd-2bb3-4d71-abf5-1e1d0ff5a2de', + index: ['filebeat-*', 'logs-azure*'], + falsePositives: [ + 'Deletion of diagnostic settings may be done by a system or network administrator. Verify whether the username, hostname, and/or resource name should be making changes in your environment. Diagnostic settings deletion from unfamiliar users or hosts should be investigated. If known behavior is causing false positives, it can be exempted from the rule.', + ], + from: 'now-25m', + immutable: true, + query: + 'event.dataset:azure.activitylogs and azure.activitylogs.operation_name:"MICROSOFT.INSIGHTS/DIAGNOSTICSETTINGS/DELETE" and event.outcome:(Success or success)', + language: 'kuery', + license: 'Elastic License v2', + outputIndex: '.siem-signals', + maxSignals: 100, + riskScore: 47, + timestampOverride: 'event.ingested', + to: 'now', + type: 'query', + references: [ + 'https://docs.microsoft.com/en-us/azure/azure-monitor/platform/diagnostic-settings', + ], + note: 'The Azure Filebeat module must be enabled to use this rule.', + version: 4, + exceptionsList: [], + }, + schedule: { + interval: '5m', + }, + enabled: false, + actions: [], + throttle: null, + notifyWhen: 'onActiveAlert', + apiKeyOwner: null, + apiKey: null, + createdBy: 'user', + updatedBy: 'user', + createdAt: '2021-03-23T17:15:59.634Z', + updatedAt: '2021-03-23T17:15:59.634Z', + muteAll: false, + mutedInstanceIds: [], + executionStatus: { + status: 'pending', + lastExecutionDate: '2021-03-23T17:15:59.634Z', + error: null, + }, + meta: { + versionApiKeyLastmodified: '8.0.0', + }, + }, + type: 'alert', + references: [], + migrationVersion: { + alert: '7.13.0', + }, + coreMigrationVersion: '8.0.0', + updated_at: '2021-03-23T17:15:59.634Z', + }, + }, + ], + }, +}); + +export const getMockRuleAlertsResponse = (docCount: number) => ({ + took: 7, + timed_out: false, + _shards: { + total: 1, + successful: 1, + skipped: 0, + failed: 0, + }, + hits: { + total: { + value: 7322, + relation: 'eq', + }, + max_score: null, + hits: [], + }, + aggregations: { + detectionAlerts: { + doc_count_error_upper_bound: 0, + sum_other_doc_count: 0, + buckets: [ + { + key: '6eecd8c2-8bfb-11eb-afbe-1b7a66309c6d', + doc_count: docCount, + }, + ], + }, + }, +}); + +export const getMockAlertCasesResponse = () => ({ + page: 1, + per_page: 10000, + total: 4, + saved_objects: [ + { + type: 'cases-comments', + id: '3bb5cc10-9249-11eb-85b7-254c8af1a983', + attributes: { + associationType: 'case', + type: 'alert', + alertId: '54802763917f521249c9f68d0d4be0c26cc538404c26dfed1ae7dcfa94ea2226', + index: '.siem-signals-default-000001', + rule: { + id: '6eecd8c2-8bfb-11eb-afbe-1b7a66309c6d', + name: 'Azure Diagnostic Settings Deletion', + }, + created_at: '2021-03-31T17:47:59.449Z', + created_by: { + email: '', + full_name: '', + username: '', + }, + pushed_at: null, + pushed_by: null, + updated_at: null, + updated_by: null, + }, + references: [ + { + type: 'cases', + name: 'associated-cases', + id: '3a3a4fa0-9249-11eb-85b7-254c8af1a983', + }, + ], + migrationVersion: {}, + coreMigrationVersion: '8.0.0', + updated_at: '2021-03-31T17:47:59.818Z', + version: 'WzI3MDIyODMsNF0=', + namespaces: ['default'], + score: 0, + }, + ], +}); diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts b/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts index 64a33068ad686..f2a96393aa897 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections.test.ts @@ -5,8 +5,11 @@ * 2.0. */ -import { ElasticsearchClient, SavedObjectsClientContract } from '../../../../../../src/core/server'; -import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks'; +import { ElasticsearchClient } from '../../../../../../src/core/server'; +import { + elasticsearchServiceMock, + savedObjectsClientMock, +} from '../../../../../../src/core/server/mocks'; import { mlServicesMock } from '../../lib/machine_learning/mocks'; import { getMockJobSummaryResponse, @@ -15,12 +18,16 @@ import { getMockMlJobDetailsResponse, getMockMlJobStatsResponse, getMockMlDatafeedStatsResponse, + getMockRuleSearchResponse, + getMockRuleAlertsResponse, + getMockAlertCasesResponse, } from './detections.mocks'; import { fetchDetectionsUsage, fetchDetectionsMetrics } from './index'; +const savedObjectsClient = savedObjectsClientMock.create(); + describe('Detections Usage and Metrics', () => { let esClientMock: jest.Mocked; - let savedObjectsClientMock: jest.Mocked; let mlMock: ReturnType; describe('fetchDetectionsUsage()', () => { @@ -30,7 +37,7 @@ describe('Detections Usage and Metrics', () => { }); it('returns zeroed counts if both calls are empty', async () => { - const result = await fetchDetectionsUsage('', esClientMock, mlMock, savedObjectsClientMock); + const result = await fetchDetectionsUsage('', esClientMock, mlMock, savedObjectsClient); expect(result).toEqual({ detection_rules: { @@ -59,7 +66,7 @@ describe('Detections Usage and Metrics', () => { it('tallies rules data given rules results', async () => { (esClientMock.search as jest.Mock).mockResolvedValue({ body: getMockRulesResponse() }); - const result = await fetchDetectionsUsage('', esClientMock, mlMock, savedObjectsClientMock); + const result = await fetchDetectionsUsage('', esClientMock, mlMock, savedObjectsClient); expect(result).toEqual( expect.objectContaining({ @@ -87,7 +94,7 @@ describe('Detections Usage and Metrics', () => { jobsSummary: mockJobSummary, }); - const result = await fetchDetectionsUsage('', esClientMock, mlMock, savedObjectsClientMock); + const result = await fetchDetectionsUsage('', esClientMock, mlMock, savedObjectsClient); expect(result).toEqual( expect.objectContaining({ @@ -106,8 +113,285 @@ describe('Detections Usage and Metrics', () => { }); }); + describe('getDetectionRuleMetrics()', () => { + beforeEach(() => { + esClientMock = elasticsearchServiceMock.createClusterClient().asInternalUser; + mlMock = mlServicesMock.createSetupContract(); + }); + + it('returns zeroed counts if calls are empty', async () => { + const result = await fetchDetectionsMetrics('', '', esClientMock, mlMock, savedObjectsClient); + + expect(result).toEqual( + expect.objectContaining({ + detection_rules: { + detection_rule_detail: [], + detection_rule_usage: { + query: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + threshold: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + eql: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + machine_learning: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + threat_match: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + elastic_total: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + custom_total: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + }, + }, + ml_jobs: [], + }) + ); + }); + + it('returns information with rule, alerts and cases', async () => { + (esClientMock.search as jest.Mock) + .mockReturnValueOnce({ body: getMockRuleSearchResponse() }) + .mockReturnValue({ body: getMockRuleAlertsResponse(3400) }); + (savedObjectsClient.find as jest.Mock).mockReturnValue(getMockAlertCasesResponse()); + + const result = await fetchDetectionsMetrics('', '', esClientMock, mlMock, savedObjectsClient); + + expect(result).toEqual( + expect.objectContaining({ + detection_rules: { + detection_rule_detail: [ + { + alert_count_daily: 3400, + cases_count_daily: 1, + created_on: '2021-03-23T17:15:59.634Z', + elastic_rule: true, + enabled: false, + rule_id: '6eecd8c2-8bfb-11eb-afbe-1b7a66309c6d', + rule_name: 'Azure Diagnostic Settings Deletion', + rule_type: 'query', + rule_version: 4, + updated_on: '2021-03-23T17:15:59.634Z', + }, + ], + detection_rule_usage: { + custom_total: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + elastic_total: { + alerts: 3400, + cases: 1, + disabled: 1, + enabled: 0, + }, + eql: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + machine_learning: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + query: { + alerts: 3400, + cases: 1, + disabled: 1, + enabled: 0, + }, + threat_match: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + threshold: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + }, + }, + ml_jobs: [], + }) + ); + }); + + it('returns information with on non elastic prebuilt rule', async () => { + (esClientMock.search as jest.Mock) + .mockReturnValueOnce({ body: getMockRuleSearchResponse('not_immutable') }) + .mockReturnValue({ body: getMockRuleAlertsResponse(800) }); + (savedObjectsClient.find as jest.Mock).mockReturnValue(getMockAlertCasesResponse()); + + const result = await fetchDetectionsMetrics('', '', esClientMock, mlMock, savedObjectsClient); + + expect(result).toEqual( + expect.objectContaining({ + detection_rules: { + detection_rule_detail: [], // *should not* contain custom detection rule details + detection_rule_usage: { + custom_total: { + alerts: 800, + cases: 1, + disabled: 1, + enabled: 0, + }, + elastic_total: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + eql: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + machine_learning: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + query: { + alerts: 800, + cases: 1, + disabled: 1, + enabled: 0, + }, + threat_match: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + threshold: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + }, + }, + ml_jobs: [], + }) + ); + }); + + it('returns information with rule, no alerts and no cases', async () => { + (esClientMock.search as jest.Mock) + .mockReturnValueOnce({ body: getMockRuleSearchResponse() }) + .mockReturnValue({ body: getMockRuleAlertsResponse(0) }); + (savedObjectsClient.find as jest.Mock).mockReturnValue(getMockAlertCasesResponse()); + + const result = await fetchDetectionsMetrics('', '', esClientMock, mlMock, savedObjectsClient); + + expect(result).toEqual( + expect.objectContaining({ + detection_rules: { + detection_rule_detail: [ + { + alert_count_daily: 0, + cases_count_daily: 1, + created_on: '2021-03-23T17:15:59.634Z', + elastic_rule: true, + enabled: false, + rule_id: '6eecd8c2-8bfb-11eb-afbe-1b7a66309c6d', + rule_name: 'Azure Diagnostic Settings Deletion', + rule_type: 'query', + rule_version: 4, + updated_on: '2021-03-23T17:15:59.634Z', + }, + ], + detection_rule_usage: { + custom_total: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + elastic_total: { + alerts: 0, + cases: 1, + disabled: 1, + enabled: 0, + }, + eql: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + machine_learning: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + query: { + alerts: 0, + cases: 1, + disabled: 1, + enabled: 0, + }, + threat_match: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + threshold: { + alerts: 0, + cases: 0, + disabled: 0, + enabled: 0, + }, + }, + }, + ml_jobs: [], + }) + ); + }); + }); + describe('fetchDetectionsMetrics()', () => { beforeEach(() => { + esClientMock = elasticsearchServiceMock.createClusterClient().asInternalUser; mlMock = mlServicesMock.createSetupContract(); }); @@ -116,7 +400,7 @@ describe('Detections Usage and Metrics', () => { jobs: null, jobStats: null, } as unknown) as ReturnType); - const result = await fetchDetectionsMetrics(mlMock, savedObjectsClientMock); + const result = await fetchDetectionsMetrics('', '', esClientMock, mlMock, savedObjectsClient); expect(result).toEqual( expect.objectContaining({ @@ -138,7 +422,7 @@ describe('Detections Usage and Metrics', () => { datafeedStats: mockDatafeedStatsResponse, } as unknown) as ReturnType); - const result = await fetchDetectionsMetrics(mlMock, savedObjectsClientMock); + const result = await fetchDetectionsMetrics('', '', esClientMock, mlMock, savedObjectsClient); expect(result).toEqual( expect.objectContaining({ diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections_metrics_helpers.ts b/x-pack/plugins/security_solution/server/usage/detections/detections_metrics_helpers.ts new file mode 100644 index 0000000000000..66b52ac5f96a4 --- /dev/null +++ b/x-pack/plugins/security_solution/server/usage/detections/detections_metrics_helpers.ts @@ -0,0 +1,380 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import { + ElasticsearchClient, + KibanaRequest, + SavedObjectsClientContract, +} from '../../../../../../src/core/server'; +import { + AlertsAggregationResponse, + CasesSavedObject, + DetectionRulesTypeUsage, + DetectionRuleMetric, + DetectionRuleAdoption, + MlJobMetric, +} from './index'; +import { SIGNALS_ID } from '../../../common/constants'; +import { DatafeedStats, Job, MlPluginSetup } from '../../../../ml/server'; +import { isElasticRule, RuleSearchParams, RuleSearchResult } from './detection_telemetry_helpers'; + +/** + * Default detection rule usage count, split by type + elastic/custom + */ +export const initialDetectionRulesUsage: DetectionRulesTypeUsage = { + query: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + threshold: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + eql: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + machine_learning: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + threat_match: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + elastic_total: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, + custom_total: { + enabled: 0, + disabled: 0, + alerts: 0, + cases: 0, + }, +}; + +/* eslint-disable complexity */ +export const updateDetectionRuleUsage = ( + detectionRuleMetric: DetectionRuleMetric, + usage: DetectionRulesTypeUsage +): DetectionRulesTypeUsage => { + let updatedUsage = usage; + + if (detectionRuleMetric.rule_type === 'query') { + updatedUsage = { + ...usage, + query: { + ...usage.query, + enabled: detectionRuleMetric.enabled ? usage.query.enabled + 1 : usage.query.enabled, + disabled: !detectionRuleMetric.enabled ? usage.query.disabled + 1 : usage.query.disabled, + alerts: usage.query.alerts + detectionRuleMetric.alert_count_daily, + cases: usage.query.cases + detectionRuleMetric.cases_count_daily, + }, + }; + } else if (detectionRuleMetric.rule_type === 'threshold') { + updatedUsage = { + ...usage, + threshold: { + ...usage.threshold, + enabled: detectionRuleMetric.enabled + ? usage.threshold.enabled + 1 + : usage.threshold.enabled, + disabled: !detectionRuleMetric.enabled + ? usage.threshold.disabled + 1 + : usage.threshold.disabled, + alerts: usage.threshold.alerts + detectionRuleMetric.alert_count_daily, + cases: usage.threshold.cases + detectionRuleMetric.cases_count_daily, + }, + }; + } else if (detectionRuleMetric.rule_type === 'eql') { + updatedUsage = { + ...usage, + eql: { + ...usage.eql, + enabled: detectionRuleMetric.enabled ? usage.eql.enabled + 1 : usage.eql.enabled, + disabled: !detectionRuleMetric.enabled ? usage.eql.disabled + 1 : usage.eql.disabled, + alerts: usage.eql.alerts + detectionRuleMetric.alert_count_daily, + cases: usage.eql.cases + detectionRuleMetric.cases_count_daily, + }, + }; + } else if (detectionRuleMetric.rule_type === 'machine_learning') { + updatedUsage = { + ...usage, + machine_learning: { + ...usage.machine_learning, + enabled: detectionRuleMetric.enabled + ? usage.machine_learning.enabled + 1 + : usage.machine_learning.enabled, + disabled: !detectionRuleMetric.enabled + ? usage.machine_learning.disabled + 1 + : usage.machine_learning.disabled, + alerts: usage.machine_learning.alerts + detectionRuleMetric.alert_count_daily, + cases: usage.machine_learning.cases + detectionRuleMetric.cases_count_daily, + }, + }; + } else if (detectionRuleMetric.rule_type === 'threat_match') { + updatedUsage = { + ...usage, + threat_match: { + ...usage.threat_match, + enabled: detectionRuleMetric.enabled + ? usage.threat_match.enabled + 1 + : usage.threat_match.enabled, + disabled: !detectionRuleMetric.enabled + ? usage.threat_match.disabled + 1 + : usage.threat_match.disabled, + alerts: usage.threat_match.alerts + detectionRuleMetric.alert_count_daily, + cases: usage.threat_match.cases + detectionRuleMetric.cases_count_daily, + }, + }; + } + + if (detectionRuleMetric.elastic_rule) { + updatedUsage = { + ...updatedUsage, + elastic_total: { + ...updatedUsage.elastic_total, + enabled: detectionRuleMetric.enabled + ? updatedUsage.elastic_total.enabled + 1 + : updatedUsage.elastic_total.enabled, + disabled: !detectionRuleMetric.enabled + ? updatedUsage.elastic_total.disabled + 1 + : updatedUsage.elastic_total.disabled, + alerts: updatedUsage.elastic_total.alerts + detectionRuleMetric.alert_count_daily, + cases: updatedUsage.elastic_total.cases + detectionRuleMetric.cases_count_daily, + }, + }; + } else { + updatedUsage = { + ...updatedUsage, + custom_total: { + ...updatedUsage.custom_total, + enabled: detectionRuleMetric.enabled + ? updatedUsage.custom_total.enabled + 1 + : updatedUsage.custom_total.enabled, + disabled: !detectionRuleMetric.enabled + ? updatedUsage.custom_total.disabled + 1 + : updatedUsage.custom_total.disabled, + alerts: updatedUsage.custom_total.alerts + detectionRuleMetric.alert_count_daily, + cases: updatedUsage.custom_total.cases + detectionRuleMetric.cases_count_daily, + }, + }; + } + + return updatedUsage; +}; + +export const getDetectionRuleMetrics = async ( + kibanaIndex: string, + signalsIndex: string, + esClient: ElasticsearchClient, + savedObjectClient: SavedObjectsClientContract +): Promise => { + let rulesUsage: DetectionRulesTypeUsage = initialDetectionRulesUsage; + const ruleSearchOptions: RuleSearchParams = { + body: { query: { bool: { filter: { term: { 'alert.alertTypeId': SIGNALS_ID } } } } }, + filterPath: [], + ignoreUnavailable: true, + index: kibanaIndex, + size: 1, + }; + + try { + const { body: ruleResults } = await esClient.search(ruleSearchOptions); + const { body: detectionAlertsResp } = (await esClient.search({ + index: `${signalsIndex}*`, + size: 0, + body: { + aggs: { + detectionAlerts: { + terms: { field: 'signal.rule.id.keyword' }, + }, + }, + query: { + bool: { + filter: [ + { + range: { + '@timestamp': { + gte: 'now-24h', + lte: 'now', + }, + }, + }, + ], + }, + }, + }, + })) as { body: AlertsAggregationResponse }; + + const cases = await savedObjectClient.find({ + type: 'cases-comments', + fields: [], + page: 1, + perPage: 10_000, + filter: 'cases-comments.attributes.type: alert', + }); + + const casesCache = cases.saved_objects.reduce((cache, { attributes: casesObject }) => { + const ruleId = casesObject.rule.id; + + const cacheCount = cache.get(ruleId); + if (cacheCount === undefined) { + cache.set(ruleId, 1); + } else { + cache.set(ruleId, cacheCount + 1); + } + return cache; + }, new Map()); + + const alertBuckets = detectionAlertsResp.aggregations?.detectionAlerts?.buckets ?? []; + + const alertsCache = new Map(); + alertBuckets.map((bucket) => alertsCache.set(bucket.key, bucket.doc_count)); + + if (ruleResults.hits?.hits?.length > 0) { + const ruleObjects = ruleResults.hits.hits.map((hit) => { + const ruleId = hit._id.split(':')[1]; + const isElastic = isElasticRule(hit._source?.alert.tags); + return { + rule_name: hit._source?.alert.name, + rule_id: ruleId, + rule_type: hit._source?.alert.params.type, + rule_version: hit._source?.alert.params.version, + enabled: hit._source?.alert.enabled, + elastic_rule: isElastic, + created_on: hit._source?.alert.createdAt, + updated_on: hit._source?.alert.updatedAt, + alert_count_daily: alertsCache.get(ruleId) || 0, + cases_count_daily: casesCache.get(ruleId) || 0, + } as DetectionRuleMetric; + }); + + // Only bring back rule detail on elastic prepackaged detection rules + const elasticRuleObjects = ruleObjects.filter((hit) => hit.elastic_rule === true); + + rulesUsage = ruleObjects.reduce((usage, rule) => { + return updateDetectionRuleUsage(rule, usage); + }, rulesUsage); + + return { + detection_rule_detail: elasticRuleObjects, + detection_rule_usage: rulesUsage, + }; + } + } catch (e) { + // ignore failure, usage will be zeroed + } + + return { + detection_rule_detail: [], + detection_rule_usage: rulesUsage, + }; +}; + +export const getMlJobMetrics = async ( + ml: MlPluginSetup | undefined, + savedObjectClient: SavedObjectsClientContract +): Promise => { + if (ml) { + try { + const fakeRequest = { headers: {} } as KibanaRequest; + const jobsType = 'security'; + const securityJobStats = await ml + .anomalyDetectorsProvider(fakeRequest, savedObjectClient) + .jobStats(jobsType); + + const jobDetails = await ml + .anomalyDetectorsProvider(fakeRequest, savedObjectClient) + .jobs(jobsType); + + const jobDetailsCache = new Map(); + jobDetails.jobs.forEach((detail) => jobDetailsCache.set(detail.job_id, detail)); + + const datafeedStats = await ml + .anomalyDetectorsProvider(fakeRequest, savedObjectClient) + .datafeedStats(); + + const datafeedStatsCache = new Map(); + datafeedStats.datafeeds.forEach((datafeedStat) => + datafeedStatsCache.set(`${datafeedStat.datafeed_id}`, datafeedStat) + ); + + return securityJobStats.jobs.map((stat) => { + const jobId = stat.job_id; + const jobDetail = jobDetailsCache.get(stat.job_id); + const datafeed = datafeedStatsCache.get(`datafeed-${jobId}`); + + return { + job_id: jobId, + open_time: stat.open_time, + create_time: jobDetail?.create_time, + finished_time: jobDetail?.finished_time, + state: stat.state, + data_counts: { + bucket_count: stat.data_counts.bucket_count, + empty_bucket_count: stat.data_counts.empty_bucket_count, + input_bytes: stat.data_counts.input_bytes, + input_record_count: stat.data_counts.input_record_count, + last_data_time: stat.data_counts.last_data_time, + processed_record_count: stat.data_counts.processed_record_count, + }, + model_size_stats: { + bucket_allocation_failures_count: + stat.model_size_stats.bucket_allocation_failures_count, + memory_status: stat.model_size_stats.memory_status, + model_bytes: stat.model_size_stats.model_bytes, + model_bytes_exceeded: stat.model_size_stats.model_bytes_exceeded, + model_bytes_memory_limit: stat.model_size_stats.model_bytes_memory_limit, + peak_model_bytes: stat.model_size_stats.peak_model_bytes, + }, + timing_stats: { + average_bucket_processing_time_ms: stat.timing_stats.average_bucket_processing_time_ms, + bucket_count: stat.timing_stats.bucket_count, + exponential_average_bucket_processing_time_ms: + stat.timing_stats.exponential_average_bucket_processing_time_ms, + exponential_average_bucket_processing_time_per_hour_ms: + stat.timing_stats.exponential_average_bucket_processing_time_per_hour_ms, + maximum_bucket_processing_time_ms: stat.timing_stats.maximum_bucket_processing_time_ms, + minimum_bucket_processing_time_ms: stat.timing_stats.minimum_bucket_processing_time_ms, + total_bucket_processing_time_ms: stat.timing_stats.total_bucket_processing_time_ms, + }, + datafeed: { + datafeed_id: datafeed?.datafeed_id, + state: datafeed?.state, + timing_stats: { + average_search_time_per_bucket_ms: + datafeed?.timing_stats.average_search_time_per_bucket_ms, + bucket_count: datafeed?.timing_stats.bucket_count, + exponential_average_search_time_per_hour_ms: + datafeed?.timing_stats.exponential_average_search_time_per_hour_ms, + search_count: datafeed?.timing_stats.search_count, + total_search_time_ms: datafeed?.timing_stats.total_search_time_ms, + }, + }, + } as MlJobMetric; + }); + } catch (e) { + // ignore failure, usage will be zeroed + } + } + + return []; +}; diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts b/x-pack/plugins/security_solution/server/usage/detections/detections_usage_helpers.ts similarity index 51% rename from x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts rename to x-pack/plugins/security_solution/server/usage/detections/detections_usage_helpers.ts index 211c477027eec..3c666d4d21780 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/detections_usage_helpers.ts @@ -7,42 +7,21 @@ import { ElasticsearchClient, - SavedObjectsClientContract, KibanaRequest, + SavedObjectsClientContract, } from '../../../../../../src/core/server'; -import { MlPluginSetup } from '../../../../ml/server'; -import { SIGNALS_ID, INTERNAL_IMMUTABLE_KEY } from '../../../common/constants'; -import { DetectionRulesUsage, MlJobsUsage, MlJobMetric } from './index'; +import { SIGNALS_ID } from '../../../common/constants'; import { isJobStarted } from '../../../common/machine_learning/helpers'; import { isSecurityJob } from '../../../common/machine_learning/is_security_job'; +import { MlPluginSetup } from '../../../../ml/server'; +import { DetectionRulesUsage, MlJobsUsage } from './index'; +import { isElasticRule, RuleSearchParams, RuleSearchResult } from './detection_telemetry_helpers'; interface DetectionsMetric { isElastic: boolean; isEnabled: boolean; } -interface RuleSearchBody { - query: { - bool: { - filter: { - term: { [key: string]: string }; - }; - }; - }; -} -interface RuleSearchParams { - body: RuleSearchBody; - filterPath: string[]; - ignoreUnavailable: boolean; - index: string; - size: number; -} -interface RuleSearchResult { - alert: { enabled: boolean; tags: string[] }; -} - -const isElasticRule = (tags: string[]) => tags.includes(`${INTERNAL_IMMUTABLE_KEY}:true`); - /** * Default detection rule usage count */ @@ -170,7 +149,6 @@ export const getRulesUsage = async ( if (ruleResults.hits?.hits?.length > 0) { rulesUsage = ruleResults.hits.hits.reduce((usage, hit) => { - // @ts-expect-error _source is optional const isElastic = isElasticRule(hit._source?.alert.tags); const isEnabled = Boolean(hit._source?.alert.enabled); @@ -211,93 +189,3 @@ export const getMlJobsUsage = async ( return jobsUsage; }; - -export const getMlJobMetrics = async ( - ml: MlPluginSetup | undefined, - savedObjectClient: SavedObjectsClientContract -): Promise => { - if (ml) { - try { - const fakeRequest = { headers: {} } as KibanaRequest; - const jobsType = 'security'; - const securityJobStats = await ml - .anomalyDetectorsProvider(fakeRequest, savedObjectClient) - .jobStats(jobsType); - - const jobDetails = await ml - .anomalyDetectorsProvider(fakeRequest, savedObjectClient) - .jobs(jobsType); - - const jobDetailsCache = new Map(); - jobDetails.jobs.forEach((detail) => jobDetailsCache.set(detail.job_id, detail)); - - const datafeedStats = await ml - .anomalyDetectorsProvider(fakeRequest, savedObjectClient) - .datafeedStats(); - - const datafeedStatsCache = new Map(); - datafeedStats.datafeeds.forEach((datafeedStat) => - datafeedStatsCache.set(`${datafeedStat.datafeed_id}`, datafeedStat) - ); - - return securityJobStats.jobs.map((stat) => { - const jobId = stat.job_id; - const jobDetail = jobDetailsCache.get(stat.job_id); - const datafeed = datafeedStatsCache.get(`datafeed-${jobId}`); - - return { - job_id: jobId, - open_time: stat.open_time, - create_time: jobDetail?.create_time, - finished_time: jobDetail?.finished_time, - state: stat.state, - data_counts: { - bucket_count: stat.data_counts.bucket_count, - empty_bucket_count: stat.data_counts.empty_bucket_count, - input_bytes: stat.data_counts.input_bytes, - input_record_count: stat.data_counts.input_record_count, - last_data_time: stat.data_counts.last_data_time, - processed_record_count: stat.data_counts.processed_record_count, - }, - model_size_stats: { - bucket_allocation_failures_count: - stat.model_size_stats.bucket_allocation_failures_count, - memory_status: stat.model_size_stats.memory_status, - model_bytes: stat.model_size_stats.model_bytes, - model_bytes_exceeded: stat.model_size_stats.model_bytes_exceeded, - model_bytes_memory_limit: stat.model_size_stats.model_bytes_memory_limit, - peak_model_bytes: stat.model_size_stats.peak_model_bytes, - }, - timing_stats: { - average_bucket_processing_time_ms: stat.timing_stats.average_bucket_processing_time_ms, - bucket_count: stat.timing_stats.bucket_count, - exponential_average_bucket_processing_time_ms: - stat.timing_stats.exponential_average_bucket_processing_time_ms, - exponential_average_bucket_processing_time_per_hour_ms: - stat.timing_stats.exponential_average_bucket_processing_time_per_hour_ms, - maximum_bucket_processing_time_ms: stat.timing_stats.maximum_bucket_processing_time_ms, - minimum_bucket_processing_time_ms: stat.timing_stats.minimum_bucket_processing_time_ms, - total_bucket_processing_time_ms: stat.timing_stats.total_bucket_processing_time_ms, - }, - datafeed: { - datafeed_id: datafeed?.datafeed_id, - state: datafeed?.state, - timing_stats: { - average_search_time_per_bucket_ms: - datafeed?.timing_stats.average_search_time_per_bucket_ms, - bucket_count: datafeed?.timing_stats.bucket_count, - exponential_average_search_time_per_hour_ms: - datafeed?.timing_stats.exponential_average_search_time_per_hour_ms, - search_count: datafeed?.timing_stats.search_count, - total_search_time_ms: datafeed?.timing_stats.total_search_time_ms, - }, - }, - } as MlJobMetric; - }); - } catch (e) { - // ignore failure, usage will be zeroed - } - } - - return []; -}; diff --git a/x-pack/plugins/security_solution/server/usage/detections/index.ts b/x-pack/plugins/security_solution/server/usage/detections/index.ts index 39c8f3159fe03..dd1cffd06a60a 100644 --- a/x-pack/plugins/security_solution/server/usage/detections/index.ts +++ b/x-pack/plugins/security_solution/server/usage/detections/index.ts @@ -8,11 +8,15 @@ import { ElasticsearchClient, SavedObjectsClientContract } from '../../../../../../src/core/server'; import { getMlJobsUsage, - getMlJobMetrics, getRulesUsage, initialRulesUsage, initialMlJobsUsage, -} from './detections_helpers'; +} from './detections_usage_helpers'; +import { + getMlJobMetrics, + getDetectionRuleMetrics, + initialDetectionRulesUsage, +} from './detections_metrics_helpers'; import { MlPluginSetup } from '../../../../ml/server'; interface FeatureUsage { @@ -20,6 +24,23 @@ interface FeatureUsage { disabled: number; } +interface FeatureTypeUsage { + enabled: number; + disabled: number; + alerts: number; + cases: number; +} + +export interface DetectionRulesTypeUsage { + query: FeatureTypeUsage; + threshold: FeatureTypeUsage; + eql: FeatureTypeUsage; + machine_learning: FeatureTypeUsage; + threat_match: FeatureTypeUsage; + elastic_total: FeatureTypeUsage; + custom_total: FeatureTypeUsage; +} + export interface DetectionRulesUsage { custom: FeatureUsage; elastic: FeatureUsage; @@ -37,6 +58,7 @@ export interface DetectionsUsage { export interface DetectionMetrics { ml_jobs: MlJobMetric[]; + detection_rules: DetectionRuleAdoption; } export interface MlJobDataCount { @@ -76,6 +98,45 @@ export interface MlJobMetric { timing_stats: MlTimingStats; } +export interface DetectionRuleMetric { + rule_name: string; + rule_id: string; + rule_type: string; + enabled: boolean; + elastic_rule: boolean; + created_on: string; + updated_on: string; + alert_count_daily: number; + cases_count_daily: number; +} + +export interface DetectionRuleAdoption { + detection_rule_detail: DetectionRuleMetric[]; + detection_rule_usage: DetectionRulesTypeUsage; +} + +export interface AlertsAggregationResponse { + hits: { + total: { value: number }; + }; + aggregations: { + [aggName: string]: { + buckets: Array<{ key: string; doc_count: number }>; + }; + }; +} + +export interface CasesSavedObject { + associationType: string; + type: string; + alertId: string; + index: string; + rule: { + id: string; + name: string; + }; +} + export const defaultDetectionsUsage = { detection_rules: initialRulesUsage, ml_jobs: initialMlJobsUsage, @@ -99,12 +160,22 @@ export const fetchDetectionsUsage = async ( }; export const fetchDetectionsMetrics = async ( + kibanaIndex: string, + signalsIndex: string, + esClient: ElasticsearchClient, ml: MlPluginSetup | undefined, savedObjectClient: SavedObjectsClientContract ): Promise => { - const [mlJobMetrics] = await Promise.allSettled([getMlJobMetrics(ml, savedObjectClient)]); + const [mlJobMetrics, detectionRuleMetrics] = await Promise.allSettled([ + getMlJobMetrics(ml, savedObjectClient), + getDetectionRuleMetrics(kibanaIndex, signalsIndex, esClient, savedObjectClient), + ]); return { ml_jobs: mlJobMetrics.status === 'fulfilled' ? mlJobMetrics.value : [], + detection_rules: + detectionRuleMetrics.status === 'fulfilled' + ? detectionRuleMetrics.value + : { detection_rule_detail: [], detection_rule_usage: initialDetectionRulesUsage }, }; }; diff --git a/x-pack/plugins/security_solution/server/usage/types.ts b/x-pack/plugins/security_solution/server/usage/types.ts index c06c8a4722cd7..4e1e647952a72 100644 --- a/x-pack/plugins/security_solution/server/usage/types.ts +++ b/x-pack/plugins/security_solution/server/usage/types.ts @@ -11,6 +11,7 @@ import { SetupPlugins } from '../plugin'; export type CollectorDependencies = { kibanaIndex: string; + signalsIndex: string; core: CoreSetup; endpointAppContext: EndpointAppContext; } & Pick; diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json index 1d1cd8c0c7667..29b32cf87aa64 100644 --- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json +++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @@ -325,6 +325,9 @@ "nodejs": { "type": "long" }, + "php": { + "type": "long" + }, "python": { "type": "long" }, @@ -791,6 +794,90 @@ } } }, + "php": { + "properties": { + "agent": { + "properties": { + "version": { + "type": "array", + "items": { + "type": "keyword" + } + } + } + }, + "service": { + "properties": { + "framework": { + "properties": { + "name": { + "type": "array", + "items": { + "type": "keyword" + } + }, + "version": { + "type": "array", + "items": { + "type": "keyword" + } + }, + "composite": { + "type": "array", + "items": { + "type": "keyword" + } + } + } + }, + "language": { + "properties": { + "name": { + "type": "array", + "items": { + "type": "keyword" + } + }, + "version": { + "type": "array", + "items": { + "type": "keyword" + } + }, + "composite": { + "type": "array", + "items": { + "type": "keyword" + } + } + } + }, + "runtime": { + "properties": { + "name": { + "type": "array", + "items": { + "type": "keyword" + } + }, + "version": { + "type": "array", + "items": { + "type": "keyword" + } + }, + "composite": { + "type": "array", + "items": { + "type": "keyword" + } + } + } + } + } + } + } + }, "python": { "properties": { "agent": { @@ -1578,25 +1665,40 @@ "workpads": { "properties": { "total": { - "type": "long" + "type": "long", + "_meta": { + "description": "The total number of Canvas Workpads in the cluster" + } } } }, "pages": { "properties": { "total": { - "type": "long" + "type": "long", + "_meta": { + "description": "The total number of pages across all Canvas Workpads" + } }, "per_workpad": { "properties": { "avg": { - "type": "float" + "type": "float", + "_meta": { + "description": "The average number of pages across all Canvas Workpads" + } }, "min": { - "type": "long" + "type": "long", + "_meta": { + "description": "The minimum number of pages found in a Canvas Workpad" + } }, "max": { - "type": "long" + "type": "long", + "_meta": { + "description": "The maximum number of pages found in a Canvas Workpad" + } } } } @@ -1605,18 +1707,30 @@ "elements": { "properties": { "total": { - "type": "long" + "type": "long", + "_meta": { + "description": "The total number of elements across all Canvas Workpads" + } }, "per_page": { "properties": { "avg": { - "type": "float" + "type": "float", + "_meta": { + "description": "The average number of elements per page across all Canvas Workpads" + } }, "min": { - "type": "long" + "type": "long", + "_meta": { + "description": "The minimum number of elements on a page across all Canvas Workpads" + } }, "max": { - "type": "long" + "type": "long", + "_meta": { + "description": "The maximum number of elements on a page across all Canvas Workpads" + } } } } @@ -1625,24 +1739,57 @@ "functions": { "properties": { "total": { - "type": "long" + "type": "long", + "_meta": { + "description": "The total number of functions in use across all Canvas Workpads" + } }, "in_use": { "type": "array", "items": { - "type": "keyword" + "type": "keyword", + "_meta": { + "description": "A function in use in any Canvas Workpad" + } + } + }, + "in_use_30d": { + "type": "array", + "items": { + "type": "keyword", + "_meta": { + "description": "A function in use in a Canvas Workpad that has been modified in the last 30 days" + } + } + }, + "in_use_90d": { + "type": "array", + "items": { + "type": "keyword", + "_meta": { + "description": "A function in use in a Canvas Workpad that has been modified in the last 90 days" + } } }, "per_element": { "properties": { "avg": { - "type": "float" + "type": "float", + "_meta": { + "description": "Average number of functions used per element across all Canvas Workpads" + } }, "min": { - "type": "long" + "type": "long", + "_meta": { + "description": "The minimum number of functions used in an element across all Canvas Workpads" + } }, "max": { - "type": "long" + "type": "long", + "_meta": { + "description": "The maximum number of functions used in an element across all Canvas Workpads" + } } } } @@ -1651,18 +1798,30 @@ "variables": { "properties": { "total": { - "type": "long" + "type": "long", + "_meta": { + "description": "The total number of variables defined across all Canvas Workpads" + } }, "per_workpad": { "properties": { "avg": { - "type": "float" + "type": "float", + "_meta": { + "description": "The average number of variables set per Canvas Workpad" + } }, "min": { - "type": "long" + "type": "long", + "_meta": { + "description": "The minimum number variables set across all Canvas Workpads" + } }, "max": { - "type": "long" + "type": "long", + "_meta": { + "description": "The maximum number of variables set across all Canvas Workpads" + } } } } @@ -1671,25 +1830,40 @@ "custom_elements": { "properties": { "count": { - "type": "long" + "type": "long", + "_meta": { + "description": "The total number of custom Canvas elements" + } }, "elements": { "properties": { "min": { - "type": "long" + "type": "long", + "_meta": { + "description": "The minimum number of elements used across all Canvas Custom Elements" + } }, "max": { - "type": "long" + "type": "long", + "_meta": { + "description": "The maximum number of elements used across all Canvas Custom Elements" + } }, "avg": { - "type": "float" + "type": "float", + "_meta": { + "description": "The average number of elements used in Canvas Custom Element" + } } } }, "functions_in_use": { "type": "array", "items": { - "type": "keyword" + "type": "keyword", + "_meta": { + "description": "The functions in use by Canvas Custom Elements" + } } } } @@ -2558,105 +2732,737 @@ "timeCaptured": { "type": "date" }, - "attributesPerMap": { + "layerTypes": { "properties": { - "dataSourcesCount": { + "ems_basemap": { "properties": { "min": { - "type": "long" + "type": "long", + "_meta": { + "description": "min number of ems basemap layers per map" + } }, "max": { - "type": "long" + "type": "long", + "_meta": { + "description": "max number of ems basemap layers per map" + } }, "avg": { - "type": "float" + "type": "float", + "_meta": { + "description": "avg number of ems basemap layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ems basemap layers in cluster" + } } } }, - "layersCount": { + "ems_region": { "properties": { "min": { - "type": "long" + "type": "long", + "_meta": { + "description": "min number of ems file layers per map" + } }, "max": { - "type": "long" + "type": "long", + "_meta": { + "description": "max number of ems file layers per map" + } }, "avg": { - "type": "float" + "type": "float", + "_meta": { + "description": "avg number of ems file layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of file layers in cluster" + } } } }, - "layerTypesCount": { + "es_agg_clusters": { "properties": { - "DYNAMIC_KEY": { - "properties": { - "min": { - "type": "long" - }, - "max": { - "type": "long" - }, - "avg": { - "type": "float" - } + "min": { + "type": "long", + "_meta": { + "description": "min number of es cluster layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es cluster layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es cluster layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es cluster layers in cluster" } } } }, - "emsVectorLayersCount": { + "es_agg_grids": { "properties": { - "DYNAMIC_KEY": { - "properties": { - "min": { - "type": "long" - }, - "max": { - "type": "long" - }, - "avg": { - "type": "float" - } + "min": { + "type": "long", + "_meta": { + "description": "min number of es grid layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es grid layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es grid layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es grid layers in cluster" } } } - } - } - } - } - }, - "kibana_settings": { - "properties": { - "xpack": { - "properties": { - "default_admin_email": { - "type": "text" - } - } - } - } - }, - "monitoring": { - "properties": { - "hasMonitoringData": { - "type": "boolean" - }, - "clusters": { - "type": "array", - "items": { - "properties": { - "license": { - "type": "keyword" - }, - "clusterUuid": { - "type": "keyword" - }, - "metricbeatUsed": { - "type": "boolean" - }, - "elasticsearch": { - "properties": { - "enabled": { - "type": "boolean" + }, + "es_agg_heatmap": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es heatmap layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es heatmap layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es heatmap layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es heatmap layers in cluster" + } + } + } + }, + "es_top_hits": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es top hits layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es top hits layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es top hits layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es top hits layers in cluster" + } + } + } + }, + "es_docs": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es document layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es document layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es document layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es document layers in cluster" + } + } + } + }, + "es_point_to_point": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es point-to-point layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es point-to-point layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es point-to-point layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es point-to-point layers in cluster" + } + } + } + }, + "es_tracks": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es track layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es track layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es track layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es track layers in cluster" + } + } + } + }, + "kbn_region": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of kbn region layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of kbn region layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of kbn region layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of kbn region layers in cluster" + } + } + } + }, + "kbn_tms_raster": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of kbn tms layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of kbn tms layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of kbn tms layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of kbn tms layers in cluster" + } + } + } + }, + "ux_tms_mvt": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of ux tms-mvt layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of ux tms-mvt layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of ux tms-mvt layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ux tms-mvt layers in cluster" + } + } + } + }, + "ux_tms_raster": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of ux tms-raster layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of ux tms-raster layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of ux tms-raster layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ux-tms raster layers in cluster" + } + } + } + }, + "ux_wms": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of ux wms layers per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of ux wms layers per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of ux wms layers per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ux wms layers in cluster" + } + } + } + } + } + }, + "scalingOptions": { + "properties": { + "limit": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es doc layers with limit scaling option per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es doc layers with limit scaling option per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es doc layers with limit scaling option per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es doc layers with limit scaling option in cluster" + } + } + } + }, + "clusters": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es doc layers with blended scaling option per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es doc layers with blended scaling option per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es doc layers with blended scaling option per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es doc layers with blended scaling option in cluster" + } + } + } + }, + "mvt": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of es doc layers with mvt scaling option per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of es doc layers with mvt scaling option per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of es doc layers with mvt scaling option per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of es doc layers with mvt scaling option in cluster" + } + } + } + } + } + }, + "joins": { + "properties": { + "term": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of layers with term joins per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of layers with term joins per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of layers with term joins per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of layers with term joins in cluster" + } + } + } + } + } + }, + "basemaps": { + "properties": { + "auto": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of ems basemap layers with auto-style per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of ems basemap layers with auto-style per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of ems basemap layers with auto-style per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ems basemap layers with auto-style in cluster" + } + } + } + }, + "dark": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of ems basemap layers with dark-style per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of ems basemap layers with dark-style per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of ems basemap layers with dark-style per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ems basemap layers with dark-style in cluster" + } + } + } + }, + "roadmap": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of ems basemap layers with roadmap-style per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of ems basemap layers with roadmap-style per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of ems basemap layers with roadmap-style per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ems basemap layers with roadmap-style in cluster" + } + } + } + }, + "roadmap_desaturated": { + "properties": { + "min": { + "type": "long", + "_meta": { + "description": "min number of ems basemap layers with desaturated-style per map" + } + }, + "max": { + "type": "long", + "_meta": { + "description": "max number of ems basemap layers with desaturated-style per map" + } + }, + "avg": { + "type": "float", + "_meta": { + "description": "avg number of ems basemap layers with desaturated-style per map" + } + }, + "total": { + "type": "long", + "_meta": { + "description": "total number of ems basemap layers with desaturated-style in cluster" + } + } + } + } + } + }, + "attributesPerMap": { + "properties": { + "dataSourcesCount": { + "properties": { + "min": { + "type": "long" + }, + "max": { + "type": "long" + }, + "avg": { + "type": "float" + } + } + }, + "layersCount": { + "properties": { + "min": { + "type": "long" + }, + "max": { + "type": "long" + }, + "avg": { + "type": "float" + } + } + }, + "layerTypesCount": { + "properties": { + "DYNAMIC_KEY": { + "properties": { + "min": { + "type": "long" + }, + "max": { + "type": "long" + }, + "avg": { + "type": "float" + } + } + } + } + }, + "emsVectorLayersCount": { + "properties": { + "DYNAMIC_KEY": { + "properties": { + "min": { + "type": "long" + }, + "max": { + "type": "long" + }, + "avg": { + "type": "float" + } + } + } + } + } + } + } + } + }, + "kibana_settings": { + "properties": { + "xpack": { + "properties": { + "default_admin_email": { + "type": "text" + } + } + } + } + }, + "monitoring": { + "properties": { + "hasMonitoringData": { + "type": "boolean" + }, + "clusters": { + "type": "array", + "items": { + "properties": { + "license": { + "type": "keyword" + }, + "clusterUuid": { + "type": "keyword" + }, + "metricbeatUsed": { + "type": "boolean" + }, + "elasticsearch": { + "properties": { + "enabled": { + "type": "boolean" }, "count": { "type": "long" @@ -3738,6 +4544,277 @@ }, "detectionMetrics": { "properties": { + "detection_rules": { + "properties": { + "detection_rule_usage": { + "properties": { + "query": { + "properties": { + "enabled": { + "type": "long", + "_meta": { + "description": "Number of query rules enabled" + } + }, + "disabled": { + "type": "long", + "_meta": { + "description": "Number of query rules disabled" + } + }, + "alerts": { + "type": "long", + "_meta": { + "description": "Number of alerts generated by query rules" + } + }, + "cases": { + "type": "long", + "_meta": { + "description": "Number of cases attached to query detection rule alerts" + } + } + } + }, + "threshold": { + "properties": { + "enabled": { + "type": "long", + "_meta": { + "description": "Number of threshold rules enabled" + } + }, + "disabled": { + "type": "long", + "_meta": { + "description": "Number of threshold rules disabled" + } + }, + "alerts": { + "type": "long", + "_meta": { + "description": "Number of alerts generated by threshold rules" + } + }, + "cases": { + "type": "long", + "_meta": { + "description": "Number of cases attached to threshold detection rule alerts" + } + } + } + }, + "eql": { + "properties": { + "enabled": { + "type": "long", + "_meta": { + "description": "Number of eql rules enabled" + } + }, + "disabled": { + "type": "long", + "_meta": { + "description": "Number of eql rules disabled" + } + }, + "alerts": { + "type": "long", + "_meta": { + "description": "Number of alerts generated by eql rules" + } + }, + "cases": { + "type": "long", + "_meta": { + "description": "Number of cases attached to eql detection rule alerts" + } + } + } + }, + "machine_learning": { + "properties": { + "enabled": { + "type": "long", + "_meta": { + "description": "Number of machine_learning rules enabled" + } + }, + "disabled": { + "type": "long", + "_meta": { + "description": "Number of machine_learning rules disabled" + } + }, + "alerts": { + "type": "long", + "_meta": { + "description": "Number of alerts generated by machine_learning rules" + } + }, + "cases": { + "type": "long", + "_meta": { + "description": "Number of cases attached to machine_learning detection rule alerts" + } + } + } + }, + "threat_match": { + "properties": { + "enabled": { + "type": "long", + "_meta": { + "description": "Number of threat_match rules enabled" + } + }, + "disabled": { + "type": "long", + "_meta": { + "description": "Number of threat_match rules disabled" + } + }, + "alerts": { + "type": "long", + "_meta": { + "description": "Number of alerts generated by threat_match rules" + } + }, + "cases": { + "type": "long", + "_meta": { + "description": "Number of cases attached to threat_match detection rule alerts" + } + } + } + }, + "elastic_total": { + "properties": { + "enabled": { + "type": "long", + "_meta": { + "description": "Number of elastic rules enabled" + } + }, + "disabled": { + "type": "long", + "_meta": { + "description": "Number of elastic rules disabled" + } + }, + "alerts": { + "type": "long", + "_meta": { + "description": "Number of alerts generated by elastic rules" + } + }, + "cases": { + "type": "long", + "_meta": { + "description": "Number of cases attached to elastic detection rule alerts" + } + } + } + }, + "custom_total": { + "properties": { + "enabled": { + "type": "long", + "_meta": { + "description": "Number of custom rules enabled" + } + }, + "disabled": { + "type": "long", + "_meta": { + "description": "Number of custom rules disabled" + } + }, + "alerts": { + "type": "long", + "_meta": { + "description": "Number of alerts generated by custom rules" + } + }, + "cases": { + "type": "long", + "_meta": { + "description": "Number of cases attached to custom detection rule alerts" + } + } + } + } + } + }, + "detection_rule_detail": { + "type": "array", + "items": { + "properties": { + "rule_name": { + "type": "keyword", + "_meta": { + "description": "The name of the detection rule" + } + }, + "rule_id": { + "type": "keyword", + "_meta": { + "description": "The UUID id of the detection rule" + } + }, + "rule_type": { + "type": "keyword", + "_meta": { + "description": "The type of detection rule. ie eql, query..." + } + }, + "rule_version": { + "type": "long", + "_meta": { + "description": "The version of the rule" + } + }, + "enabled": { + "type": "boolean", + "_meta": { + "description": "If the detection rule has been enabled by the user" + } + }, + "elastic_rule": { + "type": "boolean", + "_meta": { + "description": "If the detection rule has been authored by Elastic" + } + }, + "created_on": { + "type": "keyword", + "_meta": { + "description": "When the detection rule was created on the cluster" + } + }, + "updated_on": { + "type": "keyword", + "_meta": { + "description": "When the detection rule was updated on the cluster" + } + }, + "alert_count_daily": { + "type": "long", + "_meta": { + "description": "The number of daily alerts generated by a rule" + } + }, + "cases_count_daily": { + "type": "long", + "_meta": { + "description": "The number of daily cases generated by a rule" + } + } + } + } + } + } + }, "ml_jobs": { "type": "array", "items": { diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 079490034ad85..f0caa03442c09 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -368,7 +368,6 @@ "core.chrome.legacyBrowserWarning": "ご使用のブラウザが Kibana のセキュリティ要件を満たしていません。", "core.euiBasicTable.selectAllRows": "すべての行を選択", "core.euiBasicTable.selectThisRow": "この行を選択", - "core.euiBasicTable.tableDescription": "以下は {itemCount} 件のアイテムの表です。", "core.euiBottomBar.screenReaderAnnouncement": "ドキュメントの最後にページレベルのコントロールと共に開く新しいメニューがあります。", "core.euiBreadcrumbs.collapsedBadge.ariaLabel": "すべてのブレッドクラムを表示", "core.euiCardSelect.select": "選択してください", @@ -398,14 +397,12 @@ "core.euiColumnSortingDraggable.toggleLegend": "フィールドの並び替え方法を選択：", "core.euiComboBoxOptionsList.allOptionsSelected": "利用可能なオプションをすべて選択しました", "core.euiComboBoxOptionsList.alreadyAdded": "{label} はすでに追加されています", - "core.euiComboBoxOptionsList.createCustomOption": "{searchValue} をカスタムオプションとして追加するには、{key} を押してください。", "core.euiComboBoxOptionsList.loadingOptions": "オプションを読み込み中", "core.euiComboBoxOptionsList.noAvailableOptions": "利用可能なオプションがありません", "core.euiComboBoxOptionsList.noMatchingOptions": "{searchValue} はどのオプションにも一致していません", "core.euiComboBoxPill.removeSelection": "グループの選択項目から {children} を削除してください", "core.euiCommonlyUsedTimeRanges.legend": "頻繁に使用", "core.euiDataGrid.screenReaderNotice": "セルにはインタラクティブコンテンツが含まれます。", - "core.euiDataGridCell.expandButtonTitle": "クリックするか enter を押すと、セルのコンテンツとインタラクトできます。", "core.euiDataGridSchema.booleanSortTextAsc": "True-False", "core.euiDataGridSchema.booleanSortTextDesc": "False-True", "core.euiDataGridSchema.currencySortTextAsc": "低-高", @@ -427,10 +424,6 @@ "core.euiImage.openImage": "全画面 {alt} 画像を開く", "core.euiLink.external.ariaLabel": "外部リンク", "core.euiModal.closeModal": "このモーダルウィンドウを閉じます", - "core.euiPagination.jumpToLastPage": "最後のページ {pageCount} に移動します", - "core.euiPagination.nextPage": "次のページ", - "core.euiPagination.pageOfTotal": "{total} ページ中 {page} ページ目", - "core.euiPagination.previousPage": "前のページ", "core.euiPopover.screenReaderAnnouncement": "これはダイアログです。ダイアログを閉じるには、 escape を押してください。", "core.euiQuickSelect.applyButton": "適用", "core.euiQuickSelect.fullDescription": "現在 {timeTense} {timeValue} {timeUnit}に設定されています。", @@ -455,12 +448,6 @@ "core.euiSelectable.noAvailableOptions": "利用可能なオプションがありません", "core.euiSelectable.noMatchingOptions": "{searchValue} はどのオプションにも一致していません", "core.euiStat.loadingText": "統計を読み込み中です", - "core.euiStep.ariaLabel": "{stepStatus}", - "core.euiStepHorizontal.buttonTitle": "ステップ {step}：{title}{titleAppendix}", - "core.euiStepHorizontal.step": "手順", - "core.euiStepNumber.hasErrors": "エラーがあります", - "core.euiStepNumber.hasWarnings": "警告があります", - "core.euiStepNumber.isComplete": "完了", "core.euiStyleSelector.buttonText": "密度", "core.euiSuperDatePicker.showDatesButtonLabel": "日付を表示", "core.euiSuperSelect.screenReaderAnnouncement": "{optionsCount} 件のアイテムのフォームセレクターを使用しています。1 つのオプションを選択する必要があります。上下の矢印キーで移動するか、Esc キーで閉じます。", @@ -8664,7 +8651,6 @@ "xpack.fleet.settings.elasticHostError": "無効なURL", "xpack.fleet.settings.elasticsearchUrlLabel": "Elasticsearch URL", "xpack.fleet.settings.flyoutTitle": "Fleet 設定", - "xpack.fleet.settings.globalOutputTitle": "グローバル出力", "xpack.fleet.settings.invalidYamlFormatErrorMessage": "無効なYAML形式：{reason}", "xpack.fleet.settings.saveButtonLabel": "設定を保存", "xpack.fleet.settings.success.message": "設定が保存されました", @@ -13612,8 +13598,6 @@ "xpack.ml.datavisualizer.dataGrid.showDistributionsAriaLabel": "分布を表示", "xpack.ml.datavisualizer.dataGrid.typeColumnName": "型", "xpack.ml.datavisualizer.dataLoader.internalServerErrorMessage": "インデックス {index} のデータの読み込み中にエラーが発生。{message}。リクエストがタイムアウトした可能性があります。小さなサンプルサイズを使うか、時間範囲を狭めてみてください。", - "xpack.ml.dataVisualizer.fileBased.fieldNameSelect": "フィールド名", - "xpack.ml.dataVisualizer.fileBased.fieldTypeSelect": "フィールド型", "xpack.ml.dataVisualizer.fileBasedLabel": "ファイル", "xpack.ml.dataVisualizer.indexBased.fieldNameSelect": "フィールド名", "xpack.ml.dataVisualizer.indexBased.fieldTypeSelect": "フィールド型", @@ -13790,163 +13774,6 @@ "xpack.ml.fieldTypeIcon.numberTypeAriaLabel": "数字タイプ", "xpack.ml.fieldTypeIcon.textTypeAriaLabel": "テキストタイプ", "xpack.ml.fieldTypeIcon.unknownTypeAriaLabel": "不明なタイプ", - "xpack.ml.fileDatavisualizer.aboutPanel.analyzingDataTitle": "データを分析中", - "xpack.ml.fileDatavisualizer.aboutPanel.selectOrDragAndDropFileDescription": "ファイルを選択するかドラッグ &amp; ドロップしてください", - "xpack.ml.fileDatavisualizer.addCombinedFieldsLabel": "結合されたフィールドを追加", - "xpack.ml.fileDatavisualizer.advancedImportSettings.createIndexPatternLabel": "インデックスパターンを作成", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexNameLabel": "インデックス名", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexNamePlaceholder": "インデックス名", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexPatternNameLabel": "インデックスパターン名", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexSettingsLabel": "インデックス設定", - "xpack.ml.fileDatavisualizer.advancedImportSettings.ingestPipelineLabel": "パイプラインを投入", - "xpack.ml.fileDatavisualizer.advancedImportSettings.mappingsLabel": "マッピング", - "xpack.ml.fileDatavisualizer.analysisSummary.analyzedLinesNumberTitle": "分析した行数", - "xpack.ml.fileDatavisualizer.analysisSummary.delimiterTitle": "区切り記号", - "xpack.ml.fileDatavisualizer.analysisSummary.formatTitle": "フォーマット", - "xpack.ml.fileDatavisualizer.analysisSummary.grokPatternTitle": "Grok パターン", - "xpack.ml.fileDatavisualizer.analysisSummary.hasHeaderRowTitle": "ヘッダー行があります", - "xpack.ml.fileDatavisualizer.analysisSummary.summaryTitle": "まとめ", - "xpack.ml.fileDatavisualizer.analysisSummary.timeFieldTitle": "時間フィールド", - "xpack.ml.fileDatavisualizer.bottomBar.backButtonLabel": "戻る", - "xpack.ml.fileDatavisualizer.bottomBar.cancelButtonLabel": "キャンセル", - "xpack.ml.fileDatavisualizer.bottomBar.missingImportPrivilegesMessage": "データインポートを有効にするには、ingest_adminロールが必要です", - "xpack.ml.fileDatavisualizer.bottomBar.readMode.cancelButtonLabel": "キャンセル", - "xpack.ml.fileDatavisualizer.bottomBar.readMode.importButtonLabel": "インポート", - "xpack.ml.fileDatavisualizer.combinedFieldsForm.mappingsParseError": "マッピングのパース中にエラーが発生しました：{error}", - "xpack.ml.fileDatavisualizer.combinedFieldsForm.pipelineParseError": "パイプラインのパース中にエラーが発生しました：{error}", - "xpack.ml.fileDatavisualizer.combinedFieldsLabel": "結合されたフィールド", - "xpack.ml.fileDatavisualizer.combinedFieldsReadOnlyHelpTextLabel": "詳細タグで結合されたフィールドを編集", - "xpack.ml.fileDatavisualizer.combinedFieldsReadOnlyLabel": "結合されたフィールド", - "xpack.ml.fileDatavisualizer.editFlyout.applyOverrideSettingsButtonLabel": "適用", - "xpack.ml.fileDatavisualizer.editFlyout.closeOverrideSettingsButtonLabel": "閉じる", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.customDelimiterFormRowLabel": "カスタム区切り記号", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.customTimestampFormatErrorMessage": "タイムスタンプのフォーマットは、これらの Java 日付/時刻フォーマットの組み合わせでなければなりません：\n yy, yyyy, M, MM, MMM, MMMM, d, dd, EEE, EEEE, H, HH, h, mm, ss, S-SSSSSSSSS, a, XX, XXX, zzz", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.customTimestampFormatFormRowLabel": "カスタムタイムスタンプフォーマット", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.dataFormatFormRowLabel": "データフォーマット", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.delimiterFormRowLabel": "区切り記号", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.editFieldNamesTitle": "フィールド名の編集", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.grokPatternFormRowLabel": "Grok パターン", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.hasHeaderRowLabel": "ヘッダー行があります", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.linesToSampleErrorMessage": "値は {min} よりも大きく {max} 以下でなければなりません", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.linesToSampleFormRowLabel": "サンプルする行数", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.quoteCharacterFormRowLabel": "引用符", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timeFieldFormRowLabel": "時間フィールド", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage": "タイムスタンプフォーマットにタイムフォーマット文字グループがありません {timestampFormat}", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampFormatFormRowLabel": "タイムスタンプフォーマット", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampFormatHelpText": "対応フォーマットの詳細をご覧ください", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage": "{format} の文字 { length, plural, one { {lg} } other { グループ {lg} } } は、ss と {sep} からの区切りで始まっていないため、サポートされていません", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage": "{format} の文字 { length, plural, one { {lg} } other { グループ {lg} } } はサポートされていません", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage": "タイムスタンプフォーマット {timestampFormat} は、疑問符 ({fieldPlaceholder}) が含まれているためサポートされていません", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.trimFieldsLabel": "フィールドを切り抜く", - "xpack.ml.fileDatavisualizer.editFlyout.overrideSettingsTitle": "上書き設定", - "xpack.ml.fileDatavisualizer.experimentalBadge.experimentalLabel": "実験的", - "xpack.ml.fileDatavisualizer.explanationFlyout.closeButton": "閉じる", - "xpack.ml.fileDatavisualizer.explanationFlyout.content": "分析結果を生成した論理ステップ。", - "xpack.ml.fileDatavisualizer.explanationFlyout.title": "分析説明", - "xpack.ml.fileDatavisualizer.fieldStatsCard.maxTitle": "最高", - "xpack.ml.fileDatavisualizer.fieldStatsCard.medianTitle": "中間", - "xpack.ml.fileDatavisualizer.fieldStatsCard.minTitle": "分", - "xpack.ml.fileDatavisualizer.fileBeatConfig.paths": "ファイルのパスをここに追加してください", - "xpack.ml.fileDatavisualizer.fileBeatConfigFlyout.closeButton": "閉じる", - "xpack.ml.fileDatavisualizer.fileBeatConfigFlyout.copyButton": "クリップボードにコピー", - "xpack.ml.fileDatavisualizer.fileContents.fileContentsTitle": "ファイルコンテンツ", - "xpack.ml.fileDatavisualizer.fileDatavisualizerView.xmlNotCurrentlySupportedErrorMessage": "XML は現在サポートされていません", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.applyOverridesDescription": "ファイル形式やタイムスタンプ形式などこのデータに関する何らかの情報がある場合は、初期オーバーライドを追加すると、残りの構造を推論するのに役立つことがあります。", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileCouldNotBeReadTitle": "ファイル構造を決定できません", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage": "アップロードするよう選択されたファイルのサイズが {diffFormatted} に許可された最大サイズの {maxFileSizeFormatted} を超えています", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage": "アップロードするよう選択されたファイルのサイズは {fileSizeFormatted} で、許可された最大サイズの {maxFileSizeFormatted} を超えています。", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileSizeTooLargeTitle": "ファイルサイズが大きすぎます。", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.overrideButton": "上書き設定を適用", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription": "以前の設定に戻しています。", - "xpack.ml.fileDatavisualizer.geoPointCombinedFieldLabel": "地理ポイントフィールドを追加", - "xpack.ml.fileDatavisualizer.geoPointForm.geoPointFieldAriaLabel": "地理ポイントフィールド、必須フィールド", - "xpack.ml.fileDatavisualizer.geoPointForm.geoPointFieldLabel": "地理ポイントフィールド", - "xpack.ml.fileDatavisualizer.geoPointForm.latFieldLabel": "緯度フィールド", - "xpack.ml.fileDatavisualizer.geoPointForm.lonFieldLabel": "経度フィールド", - "xpack.ml.fileDatavisualizer.geoPointForm.submitButtonLabel": "追加", - "xpack.ml.fileDatavisualizer.importErrors.checkingPermissionErrorMessage": "パーミッションエラーをインポートします", - "xpack.ml.fileDatavisualizer.importErrors.creatingIndexErrorMessage": "インデックスの作成中にエラーが発生しました", - "xpack.ml.fileDatavisualizer.importErrors.creatingIndexPatternErrorMessage": "インデックスパターンの作成中にエラーが発生しました", - "xpack.ml.fileDatavisualizer.importErrors.creatingIngestPipelineErrorMessage": "投入パイプラインの作成中にエラーが発生しました", - "xpack.ml.fileDatavisualizer.importErrors.defaultErrorMessage": "エラー", - "xpack.ml.fileDatavisualizer.importErrors.moreButtonLabel": "詳細", - "xpack.ml.fileDatavisualizer.importErrors.parsingJSONErrorMessage": "JSON のパース中にエラーが発生しました", - "xpack.ml.fileDatavisualizer.importErrors.readingFileErrorMessage": "ファイルの読み込み中にエラーが発生しました", - "xpack.ml.fileDatavisualizer.importErrors.unknownErrorMessage": "不明なエラー", - "xpack.ml.fileDatavisualizer.importErrors.uploadingDataErrorMessage": "データのアップロード中にエラーが発生しました", - "xpack.ml.fileDatavisualizer.importProgress.createIndexPatternTitle": "インデックスパターンを作成", - "xpack.ml.fileDatavisualizer.importProgress.createIndexTitle": "インデックスの作成", - "xpack.ml.fileDatavisualizer.importProgress.createIngestPipelineTitle": "投入パイプラインの作成", - "xpack.ml.fileDatavisualizer.importProgress.creatingIndexPatternDescription": "インデックスパターンを作成中です", - "xpack.ml.fileDatavisualizer.importProgress.creatingIndexPatternTitle": "インデックスパターンを作成中です", - "xpack.ml.fileDatavisualizer.importProgress.creatingIndexTitle": "インデックスを作成中です", - "xpack.ml.fileDatavisualizer.importProgress.creatingIngestPipelineTitle": "投入パイプラインを作成中", - "xpack.ml.fileDatavisualizer.importProgress.dataUploadedTitle": "データがアップロードされました", - "xpack.ml.fileDatavisualizer.importProgress.fileProcessedTitle": "ファイルが処理されました", - "xpack.ml.fileDatavisualizer.importProgress.indexCreatedTitle": "インデックスが作成されました", - "xpack.ml.fileDatavisualizer.importProgress.indexPatternCreatedTitle": "インデックスパターンが作成されました", - "xpack.ml.fileDatavisualizer.importProgress.ingestPipelineCreatedTitle": "投入パイプラインが作成されました", - "xpack.ml.fileDatavisualizer.importProgress.processFileTitle": "ファイルの処理", - "xpack.ml.fileDatavisualizer.importProgress.processingFileTitle": "ファイルを処理中", - "xpack.ml.fileDatavisualizer.importProgress.processingImportedFileDescription": "インポートするファイルを処理中", - "xpack.ml.fileDatavisualizer.importProgress.stepTwoCreatingIndexDescription": "インデックスを作成中です", - "xpack.ml.fileDatavisualizer.importProgress.stepTwoCreatingIndexIngestPipelineDescription": "インデックスと投入パイプラインを作成中です", - "xpack.ml.fileDatavisualizer.importProgress.uploadDataTitle": "データのアップロード", - "xpack.ml.fileDatavisualizer.importProgress.uploadingDataDescription": "データをアップロード中です", - "xpack.ml.fileDatavisualizer.importProgress.uploadingDataTitle": "データをアップロード中です", - "xpack.ml.fileDatavisualizer.importSettings.advancedTabName": "高度な設定", - "xpack.ml.fileDatavisualizer.importSettings.simpleTabName": "シンプル", - "xpack.ml.fileDatavisualizer.importSummary.documentsCouldNotBeImportedDescription": "{importFailuresLength}/{docCount} 個のドキュメントをインポートできませんでした。行が Grok パターンと一致していないことが原因の可能性があります。", - "xpack.ml.fileDatavisualizer.importSummary.documentsCouldNotBeImportedTitle": "ドキュメントの一部をインポートできませんでした。", - "xpack.ml.fileDatavisualizer.importSummary.documentsIngestedTitle": "ドキュメントが投入されました", - "xpack.ml.fileDatavisualizer.importSummary.failedDocumentsButtonLabel": "失敗したドキュメント", - "xpack.ml.fileDatavisualizer.importSummary.failedDocumentsTitle": "失敗したドキュメント", - "xpack.ml.fileDatavisualizer.importSummary.importCompleteTitle": "インポート完了", - "xpack.ml.fileDatavisualizer.importSummary.indexPatternTitle": "インデックスパターン", - "xpack.ml.fileDatavisualizer.importSummary.indexTitle": "インデックス", - "xpack.ml.fileDatavisualizer.importSummary.ingestPipelineTitle": "パイプラインを投入", - "xpack.ml.fileDatavisualizer.importView.experimentalFeatureTooltip": "実験的機能。フィードバックをお待ちしています。", - "xpack.ml.fileDatavisualizer.importView.importButtonLabel": "インポート", - "xpack.ml.fileDatavisualizer.importView.importDataTitle": "データのインポート", - "xpack.ml.fileDatavisualizer.importView.importPermissionError": "インデックス {index} にデータを作成またはインポートするパーミッションがありません。", - "xpack.ml.fileDatavisualizer.importView.indexNameAlreadyExistsErrorMessage": "インデックス名がすでに存在します", - "xpack.ml.fileDatavisualizer.importView.indexNameContainsIllegalCharactersErrorMessage": "インデックス名に許可されていない文字が含まれています。", - "xpack.ml.fileDatavisualizer.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "インデックスパターンがインデックス名と一致しません", - "xpack.ml.fileDatavisualizer.importView.indexPatternNameAlreadyExistsErrorMessage": "インデックスパターン名がすでに存在します", - "xpack.ml.fileDatavisualizer.importView.parseMappingsError": "マッピングのパース中にエラーが発生しました：", - "xpack.ml.fileDatavisualizer.importView.parsePipelineError": "投入パイプラインのパース中にエラーが発生しました：", - "xpack.ml.fileDatavisualizer.importView.parseSettingsError": "設定のパース中にエラーが発生しました：", - "xpack.ml.fileDatavisualizer.importView.resetButtonLabel": "リセット", - "xpack.ml.fileDatavisualizer.nameCollisionMsg": "「{name}」はすでに存在します。一意の名前を入力してください。", - "xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel": "結合されたフィールドを削除", - "xpack.ml.fileDatavisualizer.resultsLinks.createNewMLJobTitle": "新規 ML ジョブの作成", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfig": "Filebeat 構成を作成", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigBottomText": "{password} が {user} ユーザーのパスワードである場合、{esUrl} は Elasticsearch の URL です。", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigBottomTextNoUsername": "{esUrl} が Elasticsearch の URL である場合", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigTitle": "Filebeat 構成", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigTopText1": "Filebeat を使用して {index} インデックスに追加データをアップロードできます。", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigTopText2": "{filebeatYml} を修正して接続情報を設定します。", - "xpack.ml.fileDatavisualizer.resultsLinks.indexManagementTitle": "インデックス管理", - "xpack.ml.fileDatavisualizer.resultsLinks.indexPatternManagementTitle": "インデックスパターン管理", - "xpack.ml.fileDatavisualizer.resultsLinks.openInDataVisualizerTitle": "データビジュアライザーを開く", - "xpack.ml.fileDatavisualizer.resultsLinks.viewIndexInDiscoverTitle": "インデックスを Discover で表示", - "xpack.ml.fileDatavisualizer.resultsView.analysisExplanationButtonLabel": "分析説明", - "xpack.ml.fileDatavisualizer.resultsView.fileStatsName": "ファイル統計", - "xpack.ml.fileDatavisualizer.resultsView.overrideSettingsButtonLabel": "上書き設定", - "xpack.ml.fileDatavisualizer.simpleImportSettings.createIndexPatternLabel": "インデックスパターンを作成", - "xpack.ml.fileDatavisualizer.simpleImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド", - "xpack.ml.fileDatavisualizer.simpleImportSettings.indexNameFormRowLabel": "インデックス名", - "xpack.ml.fileDatavisualizer.simpleImportSettings.indexNamePlaceholder": "インデックス名", - "xpack.ml.fileDatavisualizer.welcomeContent.delimitedTextFilesDescription": "CSV や TSV などの区切られたテキストファイル", - "xpack.ml.fileDatavisualizer.welcomeContent.experimentalFeatureDescription": "これは実験的な機能です。フィードバックがありますか？{githubLink}で問題を報告してください。", - "xpack.ml.fileDatavisualizer.welcomeContent.experimentalFeatureTooltip": "実験的機能。フィードバックをお待ちしています。", - "xpack.ml.fileDatavisualizer.welcomeContent.logFilesWithCommonFormatDescription": "タイムスタンプの一般的フォーマットのログファイル", - "xpack.ml.fileDatavisualizer.welcomeContent.newlineDelimitedJsonDescription": "改行区切りの JSON", - "xpack.ml.fileDatavisualizer.welcomeContent.supportedFileFormatDescription": "ファイルデータビジュアライザーはこれらのファイル形式をサポートしています：", - "xpack.ml.fileDatavisualizer.welcomeContent.uploadedFilesAllowedSizeDescription": "最大{maxFileSize}のファイルをアップロードできます。", - "xpack.ml.fileDatavisualizer.welcomeContent.visualizeDataFromLogFileDescription": "ファイルデータビジュアライザーは、ログファイルのフィールドとメトリックの理解に役立ちます。ファイルをアップロードして、データを分析し、 Elasticsearch インデックスにインポートするか選択できます。", - "xpack.ml.fileDatavisualizer.welcomeContent.visualizeDataFromLogFileTitle": "ログファイルのデータを可視化 {experimentalBadge}", "xpack.ml.fileDataVisualizerDescription": "CSV、NDJSON、またはログファイルをインポートします。", "xpack.ml.fileDataVisualizerTitle": "ファイルをアップロード", "xpack.ml.formatters.metricChangeDescription.actualSameAsTypicalDescription": "実際値が通常値と同じ", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 3bfa13dfbe164..d5f8c7533a54c 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -371,7 +371,6 @@ "core.chrome.legacyBrowserWarning": "您的浏览器不满足 Kibana 的安全要求。", "core.euiBasicTable.selectAllRows": "选择所有行", "core.euiBasicTable.selectThisRow": "选择此行", - "core.euiBasicTable.tableDescription": "以下是包含 {itemCount} 个项的列表。", "core.euiBottomBar.screenReaderAnnouncement": "会有新的菜单打开，其中页面级别控件位于文档的结尾。", "core.euiBreadcrumbs.collapsedBadge.ariaLabel": "显示所有痕迹导航", "core.euiCardSelect.select": "选择", @@ -401,14 +400,12 @@ "core.euiColumnSortingDraggable.toggleLegend": "为字段选择排序方法：", "core.euiComboBoxOptionsList.allOptionsSelected": "您已选择所有可用选项", "core.euiComboBoxOptionsList.alreadyAdded": "{label} 已添加", - "core.euiComboBoxOptionsList.createCustomOption": "按 {key} 键将 {searchValue} 添加为自定义选项", "core.euiComboBoxOptionsList.loadingOptions": "正在加载选项", "core.euiComboBoxOptionsList.noAvailableOptions": "没有任何可用选项", "core.euiComboBoxOptionsList.noMatchingOptions": "{searchValue} 不匹配任何选项", "core.euiComboBoxPill.removeSelection": "将 {children} 从此组中的选择移除", "core.euiCommonlyUsedTimeRanges.legend": "常用", "core.euiDataGrid.screenReaderNotice": "单元格包含交互内容。", - "core.euiDataGridCell.expandButtonTitle": "单击或按 Enter 键以便与单元格内容进行交互", "core.euiDataGridSchema.booleanSortTextAsc": "True-False", "core.euiDataGridSchema.booleanSortTextDesc": "False-True", "core.euiDataGridSchema.currencySortTextAsc": "低-高", @@ -430,10 +427,6 @@ "core.euiImage.openImage": "打开全屏 {alt} 图像", "core.euiLink.external.ariaLabel": "外部链接", "core.euiModal.closeModal": "关闭此模式窗口", - "core.euiPagination.jumpToLastPage": "跳转到末页，即页 {pageCount}", - "core.euiPagination.nextPage": "下一页", - "core.euiPagination.pageOfTotal": "第 {page} 页，共 {total} 页", - "core.euiPagination.previousPage": "上一页", "core.euiPopover.screenReaderAnnouncement": "您在对话框中。要关闭此对话框，请按 Esc 键。", "core.euiQuickSelect.applyButton": "应用", "core.euiQuickSelect.fullDescription": "当前设置为 {timeTense} {timeValue} {timeUnit}。", @@ -458,12 +451,6 @@ "core.euiSelectable.noAvailableOptions": "没有任何可用选项", "core.euiSelectable.noMatchingOptions": "{searchValue} 不匹配任何选项", "core.euiStat.loadingText": "统计正在加载", - "core.euiStep.ariaLabel": "{stepStatus}", - "core.euiStepHorizontal.buttonTitle": "第 {step} 步：{title}{titleAppendix}", - "core.euiStepHorizontal.step": "步骤", - "core.euiStepNumber.hasErrors": "有错误", - "core.euiStepNumber.hasWarnings": "有警告", - "core.euiStepNumber.isComplete": "已完成", "core.euiStyleSelector.buttonText": "密度", "core.euiSuperDatePicker.showDatesButtonLabel": "显示日期", "core.euiSuperSelect.screenReaderAnnouncement": "您位于包含 {optionsCount} 个项目的表单选择器中，必须选择单个选项。使用向上和向下键导航，使用 Esc 键关闭。", @@ -8750,7 +8737,6 @@ "xpack.fleet.settings.elasticHostError": "URL 无效", "xpack.fleet.settings.elasticsearchUrlLabel": "Elasticsearch URL", "xpack.fleet.settings.flyoutTitle": "Fleet 设置", - "xpack.fleet.settings.globalOutputTitle": "全局输出", "xpack.fleet.settings.invalidYamlFormatErrorMessage": "YAML 无效：{reason}", "xpack.fleet.settings.saveButtonLabel": "保存设置", "xpack.fleet.settings.success.message": "设置已保存", @@ -13790,8 +13776,6 @@ "xpack.ml.datavisualizer.dataGrid.showDistributionsAriaLabel": "显示分布", "xpack.ml.datavisualizer.dataGrid.typeColumnName": "类型", "xpack.ml.datavisualizer.dataLoader.internalServerErrorMessage": "加载索引 {index} 中的数据时出错。{message}。请求可能已超时。请尝试使用较小的样例大小或缩小时间范围。", - "xpack.ml.dataVisualizer.fileBased.fieldNameSelect": "字段名称", - "xpack.ml.dataVisualizer.fileBased.fieldTypeSelect": "字段类型", "xpack.ml.dataVisualizer.fileBasedLabel": "文件", "xpack.ml.dataVisualizer.indexBased.fieldNameSelect": "字段名称", "xpack.ml.dataVisualizer.indexBased.fieldTypeSelect": "字段类型", @@ -13974,165 +13958,6 @@ "xpack.ml.fieldTypeIcon.numberTypeAriaLabel": "数字类型", "xpack.ml.fieldTypeIcon.textTypeAriaLabel": "文本类型", "xpack.ml.fieldTypeIcon.unknownTypeAriaLabel": "未知类型", - "xpack.ml.fileDatavisualizer.aboutPanel.analyzingDataTitle": "正在分析数据", - "xpack.ml.fileDatavisualizer.aboutPanel.selectOrDragAndDropFileDescription": "选择或拖放文件", - "xpack.ml.fileDatavisualizer.addCombinedFieldsLabel": "添加组合字段", - "xpack.ml.fileDatavisualizer.advancedImportSettings.createIndexPatternLabel": "创建索引模式", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexNameAriaLabel": "索引名称，必填字段", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexNameLabel": "索引名称", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexNamePlaceholder": "索引名称", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexPatternNameLabel": "索引模式名称", - "xpack.ml.fileDatavisualizer.advancedImportSettings.indexSettingsLabel": "索引设置", - "xpack.ml.fileDatavisualizer.advancedImportSettings.ingestPipelineLabel": "采集管道", - "xpack.ml.fileDatavisualizer.advancedImportSettings.mappingsLabel": "映射", - "xpack.ml.fileDatavisualizer.analysisSummary.analyzedLinesNumberTitle": "已分析的行数", - "xpack.ml.fileDatavisualizer.analysisSummary.delimiterTitle": "分隔符", - "xpack.ml.fileDatavisualizer.analysisSummary.formatTitle": "格式", - "xpack.ml.fileDatavisualizer.analysisSummary.grokPatternTitle": "Grok 模式", - "xpack.ml.fileDatavisualizer.analysisSummary.hasHeaderRowTitle": "包含标题行", - "xpack.ml.fileDatavisualizer.analysisSummary.summaryTitle": "摘要", - "xpack.ml.fileDatavisualizer.analysisSummary.timeFieldTitle": "时间字段", - "xpack.ml.fileDatavisualizer.analysisSummary.timeFormatTitle": "时间{timestampFormats, plural, other {格式}}", - "xpack.ml.fileDatavisualizer.bottomBar.backButtonLabel": "返回", - "xpack.ml.fileDatavisualizer.bottomBar.cancelButtonLabel": "取消", - "xpack.ml.fileDatavisualizer.bottomBar.missingImportPrivilegesMessage": "您需要具有 ingest_admin 角色才能启用数据导入", - "xpack.ml.fileDatavisualizer.bottomBar.readMode.cancelButtonLabel": "取消", - "xpack.ml.fileDatavisualizer.bottomBar.readMode.importButtonLabel": "导入", - "xpack.ml.fileDatavisualizer.combinedFieldsForm.mappingsParseError": "解析映射时出错：{error}", - "xpack.ml.fileDatavisualizer.combinedFieldsForm.pipelineParseError": "解析管道时出错：{error}", - "xpack.ml.fileDatavisualizer.combinedFieldsLabel": "组合字段", - "xpack.ml.fileDatavisualizer.combinedFieldsReadOnlyHelpTextLabel": "在高级选项卡中编辑组合字段", - "xpack.ml.fileDatavisualizer.combinedFieldsReadOnlyLabel": "组合字段", - "xpack.ml.fileDatavisualizer.editFlyout.applyOverrideSettingsButtonLabel": "应用", - "xpack.ml.fileDatavisualizer.editFlyout.closeOverrideSettingsButtonLabel": "关闭", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.customDelimiterFormRowLabel": "定制分隔符", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.customTimestampFormatErrorMessage": "时间戳格式必须为以下 Java 日期/时间格式的组合：\n yy、yyyy、M、MM、MMM、MMMM、d、dd、EEE、EEEE、H、HH、h、mm、ss、S 至 SSSSSSSSS、a、XX、XXX、zzz", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.customTimestampFormatFormRowLabel": "定制时间戳格式", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.dataFormatFormRowLabel": "数据格式", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.delimiterFormRowLabel": "分隔符", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.editFieldNamesTitle": "编辑字段名称", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.grokPatternFormRowLabel": "Grok 模式", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.hasHeaderRowLabel": "包含标题行", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.linesToSampleErrorMessage": "值必须大于 {min} 并小于或等于 {max}", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.linesToSampleFormRowLabel": "要采样的行数", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.quoteCharacterFormRowLabel": "引用字符", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timeFieldFormRowLabel": "时间字段", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage": "时间戳格式 {timestampFormat} 中没有时间格式字母组", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampFormatFormRowLabel": "时间戳格式", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampFormatHelpText": "请参阅有关接受格式的更多内容。", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage": "{format}的字母 { length, plural, one { {lg} } other { 组 {lg} } } 不受支持，因为其未前置 ss 和 {sep} 中的分隔符", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage": "{format}的字母 { length, plural, one { {lg} } other { 组 {lg} } } 不受支持", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage": "时间戳格式 {timestampFormat} 不受支持，因为其包含问号字符 ({fieldPlaceholder})", - "xpack.ml.fileDatavisualizer.editFlyout.overrides.trimFieldsLabel": "应剪裁字段", - "xpack.ml.fileDatavisualizer.editFlyout.overrideSettingsTitle": "替代设置", - "xpack.ml.fileDatavisualizer.experimentalBadge.experimentalLabel": "实验性", - "xpack.ml.fileDatavisualizer.explanationFlyout.closeButton": "关闭", - "xpack.ml.fileDatavisualizer.explanationFlyout.content": "产生分析结果的逻辑步骤。", - "xpack.ml.fileDatavisualizer.explanationFlyout.title": "分析说明", - "xpack.ml.fileDatavisualizer.fieldStatsCard.maxTitle": "最大值", - "xpack.ml.fileDatavisualizer.fieldStatsCard.medianTitle": "中值", - "xpack.ml.fileDatavisualizer.fieldStatsCard.minTitle": "最小值", - "xpack.ml.fileDatavisualizer.fileBeatConfig.paths": "在此处将路径添加您的文件中", - "xpack.ml.fileDatavisualizer.fileBeatConfigFlyout.closeButton": "关闭", - "xpack.ml.fileDatavisualizer.fileBeatConfigFlyout.copyButton": "复制到剪贴板", - "xpack.ml.fileDatavisualizer.fileContents.fileContentsTitle": "文件内容", - "xpack.ml.fileDatavisualizer.fileContents.firstLinesDescription": "前 {numberOfLines, plural, other {# 行}}", - "xpack.ml.fileDatavisualizer.fileDatavisualizerView.xmlNotCurrentlySupportedErrorMessage": "当前不支持 XML", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.applyOverridesDescription": "如果您对此数据有所了解，例如文件格式或时间戳格式，则添加初始覆盖可以帮助我们推理结构的其余部分。", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileCouldNotBeReadTitle": "无法确定文件结构", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage": "您选择用于上传的文件大小超过上限值 {maxFileSizeFormatted} 的 {diffFormatted}", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage": "您选择用于上传的文件大小为 {fileSizeFormatted}，超过上限值 {maxFileSizeFormatted}", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.fileSizeTooLargeTitle": "文件太大", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.overrideButton": "应用覆盖设置", - "xpack.ml.fileDatavisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription": "恢复到以前的设置", - "xpack.ml.fileDatavisualizer.geoPointCombinedFieldLabel": "添加地理点字段", - "xpack.ml.fileDatavisualizer.geoPointForm.geoPointFieldAriaLabel": "地理点字段，必填字段", - "xpack.ml.fileDatavisualizer.geoPointForm.geoPointFieldLabel": "地理点字段", - "xpack.ml.fileDatavisualizer.geoPointForm.latFieldLabel": "纬度字段", - "xpack.ml.fileDatavisualizer.geoPointForm.lonFieldLabel": "经度字段", - "xpack.ml.fileDatavisualizer.geoPointForm.submitButtonLabel": "添加", - "xpack.ml.fileDatavisualizer.importErrors.checkingPermissionErrorMessage": "导入权限错误", - "xpack.ml.fileDatavisualizer.importErrors.creatingIndexErrorMessage": "创建索引时出错", - "xpack.ml.fileDatavisualizer.importErrors.creatingIndexPatternErrorMessage": "创建索引模式时出错", - "xpack.ml.fileDatavisualizer.importErrors.creatingIngestPipelineErrorMessage": "创建采集管道时出错", - "xpack.ml.fileDatavisualizer.importErrors.defaultErrorMessage": "错误", - "xpack.ml.fileDatavisualizer.importErrors.moreButtonLabel": "更多", - "xpack.ml.fileDatavisualizer.importErrors.parsingJSONErrorMessage": "解析 JSON 出错", - "xpack.ml.fileDatavisualizer.importErrors.readingFileErrorMessage": "读取文件时出错", - "xpack.ml.fileDatavisualizer.importErrors.unknownErrorMessage": "未知错误", - "xpack.ml.fileDatavisualizer.importErrors.uploadingDataErrorMessage": "上传数据时出错", - "xpack.ml.fileDatavisualizer.importProgress.createIndexPatternTitle": "创建索引模式", - "xpack.ml.fileDatavisualizer.importProgress.createIndexTitle": "创建索引", - "xpack.ml.fileDatavisualizer.importProgress.createIngestPipelineTitle": "创建采集管道", - "xpack.ml.fileDatavisualizer.importProgress.creatingIndexPatternDescription": "正在创建索引模式", - "xpack.ml.fileDatavisualizer.importProgress.creatingIndexPatternTitle": "正在创建索引模式", - "xpack.ml.fileDatavisualizer.importProgress.creatingIndexTitle": "正在创建索引", - "xpack.ml.fileDatavisualizer.importProgress.creatingIngestPipelineTitle": "正在创建采集管道", - "xpack.ml.fileDatavisualizer.importProgress.dataUploadedTitle": "数据已上传", - "xpack.ml.fileDatavisualizer.importProgress.fileProcessedTitle": "文件已处理", - "xpack.ml.fileDatavisualizer.importProgress.indexCreatedTitle": "索引已创建", - "xpack.ml.fileDatavisualizer.importProgress.indexPatternCreatedTitle": "索引模式已创建", - "xpack.ml.fileDatavisualizer.importProgress.ingestPipelineCreatedTitle": "采集管道已创建", - "xpack.ml.fileDatavisualizer.importProgress.processFileTitle": "处理文件", - "xpack.ml.fileDatavisualizer.importProgress.processingFileTitle": "正在处理文件", - "xpack.ml.fileDatavisualizer.importProgress.processingImportedFileDescription": "正在处理要导入的文件", - "xpack.ml.fileDatavisualizer.importProgress.stepTwoCreatingIndexDescription": "正在创建索引", - "xpack.ml.fileDatavisualizer.importProgress.stepTwoCreatingIndexIngestPipelineDescription": "正在创建索引和采集管道", - "xpack.ml.fileDatavisualizer.importProgress.uploadDataTitle": "上传数据", - "xpack.ml.fileDatavisualizer.importProgress.uploadingDataDescription": "正在上传数据", - "xpack.ml.fileDatavisualizer.importProgress.uploadingDataTitle": "正在上传数据", - "xpack.ml.fileDatavisualizer.importSettings.advancedTabName": "高级", - "xpack.ml.fileDatavisualizer.importSettings.simpleTabName": "简单", - "xpack.ml.fileDatavisualizer.importSummary.documentsCouldNotBeImportedDescription": "无法导入 {importFailuresLength} 个文档，共 {docCount} 个。这可能是由于行与 Grok 模式不匹配。", - "xpack.ml.fileDatavisualizer.importSummary.documentsCouldNotBeImportedTitle": "部分文档无法导入", - "xpack.ml.fileDatavisualizer.importSummary.documentsIngestedTitle": "已采集的文档", - "xpack.ml.fileDatavisualizer.importSummary.failedDocumentsButtonLabel": "失败的文档", - "xpack.ml.fileDatavisualizer.importSummary.failedDocumentsTitle": "失败的文档", - "xpack.ml.fileDatavisualizer.importSummary.importCompleteTitle": "导入完成", - "xpack.ml.fileDatavisualizer.importSummary.indexPatternTitle": "索引模式", - "xpack.ml.fileDatavisualizer.importSummary.indexTitle": "索引", - "xpack.ml.fileDatavisualizer.importSummary.ingestPipelineTitle": "采集管道", - "xpack.ml.fileDatavisualizer.importView.experimentalFeatureTooltip": "实验性功能。我们很乐意听取您的反馈意见。", - "xpack.ml.fileDatavisualizer.importView.importButtonLabel": "导入", - "xpack.ml.fileDatavisualizer.importView.importDataTitle": "导入数据", - "xpack.ml.fileDatavisualizer.importView.importPermissionError": "您无权创建或将数据导入索引 {index}", - "xpack.ml.fileDatavisualizer.importView.indexNameAlreadyExistsErrorMessage": "索引名称已存在", - "xpack.ml.fileDatavisualizer.importView.indexNameContainsIllegalCharactersErrorMessage": "索引名称包含非法字符", - "xpack.ml.fileDatavisualizer.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "索引模式与索引名称不匹配", - "xpack.ml.fileDatavisualizer.importView.indexPatternNameAlreadyExistsErrorMessage": "索引模式名称已存在", - "xpack.ml.fileDatavisualizer.importView.parseMappingsError": "解析映射时出错：", - "xpack.ml.fileDatavisualizer.importView.parsePipelineError": "解析采集管道时出错：", - "xpack.ml.fileDatavisualizer.importView.parseSettingsError": "解析设置时出错：", - "xpack.ml.fileDatavisualizer.importView.resetButtonLabel": "重置", - "xpack.ml.fileDatavisualizer.nameCollisionMsg": "“{name}”已存在，请提供唯一名称", - "xpack.ml.fileDatavisualizer.removeCombinedFieldsLabel": "移除组合字段", - "xpack.ml.fileDatavisualizer.resultsLinks.createNewMLJobTitle": "新建 ML 作业", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfig": "创建 Filebeat 配置", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigBottomText": "其中 {password} 是 {user} 用户的密码，{esUrl} 是 Elasticsearch 的 URL。", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigBottomTextNoUsername": "其中 {esUrl} 是 Elasticsearch 的 URL。", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigTitle": "Filebeat 配置", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigTopText1": "可以使用 Filebeat 将其他数据上传到 {index} 索引。", - "xpack.ml.fileDatavisualizer.resultsLinks.fileBeatConfigTopText2": "修改 {filebeatYml} 以设置连接信息：", - "xpack.ml.fileDatavisualizer.resultsLinks.indexManagementTitle": "索引管理", - "xpack.ml.fileDatavisualizer.resultsLinks.indexPatternManagementTitle": "索引模式管理", - "xpack.ml.fileDatavisualizer.resultsLinks.openInDataVisualizerTitle": "在数据可视化工具中打开", - "xpack.ml.fileDatavisualizer.resultsLinks.viewIndexInDiscoverTitle": "在 Discover 中查看索引", - "xpack.ml.fileDatavisualizer.resultsView.analysisExplanationButtonLabel": "分析说明", - "xpack.ml.fileDatavisualizer.resultsView.fileStatsName": "文件统计", - "xpack.ml.fileDatavisualizer.resultsView.overrideSettingsButtonLabel": "替代设置", - "xpack.ml.fileDatavisualizer.simpleImportSettings.createIndexPatternLabel": "创建索引模式", - "xpack.ml.fileDatavisualizer.simpleImportSettings.indexNameAriaLabel": "索引名称，必填字段", - "xpack.ml.fileDatavisualizer.simpleImportSettings.indexNameFormRowLabel": "索引名称", - "xpack.ml.fileDatavisualizer.simpleImportSettings.indexNamePlaceholder": "索引名称", - "xpack.ml.fileDatavisualizer.welcomeContent.delimitedTextFilesDescription": "分隔的文本文件，例如 CSV 和 TSV", - "xpack.ml.fileDatavisualizer.welcomeContent.experimentalFeatureDescription": "此功能为实验性功能。有反馈？如欲提供反馈，请在 {githubLink} 中创建问题。", - "xpack.ml.fileDatavisualizer.welcomeContent.experimentalFeatureTooltip": "实验性功能。我们很乐意听取您的反馈意见。", - "xpack.ml.fileDatavisualizer.welcomeContent.logFilesWithCommonFormatDescription": "具有时间戳通用格式的日志文件", - "xpack.ml.fileDatavisualizer.welcomeContent.newlineDelimitedJsonDescription": "换行符分隔的 JSON", - "xpack.ml.fileDatavisualizer.welcomeContent.supportedFileFormatDescription": "File Data Visualizer 支持以下文件格式：", - "xpack.ml.fileDatavisualizer.welcomeContent.uploadedFilesAllowedSizeDescription": "您可以上传不超过 {maxFileSize} 的文件。", - "xpack.ml.fileDatavisualizer.welcomeContent.visualizeDataFromLogFileDescription": "File Data Visualizer 可帮助您理解日志文件中的字段和指标。上传文件、分析文件数据，然后选择是否将数据导入 Elasticsearch 索引。", - "xpack.ml.fileDatavisualizer.welcomeContent.visualizeDataFromLogFileTitle": "可视化来自日志文件的数据 {experimentalBadge}", "xpack.ml.fileDataVisualizerDescription": "导入您自己的 CSV、NDJSON 或日志文件。", "xpack.ml.fileDataVisualizerTitle": "上传文件", "xpack.ml.formatters.metricChangeDescription.actualSameAsTypicalDescription": "实际上与典型模式相同", diff --git a/x-pack/plugins/uptime/common/runtime_types/common.ts b/x-pack/plugins/uptime/common/runtime_types/common.ts index de738158cee45..4262a1a244568 100644 --- a/x-pack/plugins/uptime/common/runtime_types/common.ts +++ b/x-pack/plugins/uptime/common/runtime_types/common.ts @@ -30,6 +30,7 @@ export const SummaryType = t.partial({ export const StatesIndexStatusType = t.type({ indexExists: t.boolean, docCount: t.number, + indices: t.string, }); export const DateRangeType = t.type({ diff --git a/x-pack/plugins/uptime/public/apps/plugin.ts b/x-pack/plugins/uptime/public/apps/plugin.ts index c6a08e84c6da9..0832274f0785a 100644 --- a/x-pack/plugins/uptime/public/apps/plugin.ts +++ b/x-pack/plugins/uptime/public/apps/plugin.ts @@ -85,11 +85,11 @@ export class UptimePlugin if (plugins.observability) { plugins.observability.dashboard.register({ - appName: 'uptime', + appName: 'synthetics', hasData: async () => { const dataHelper = await getUptimeDataHelper(); const status = await dataHelper.indexStatus(); - return status.docCount > 0; + return { hasData: status.docCount > 0, indices: status.indices }; }, fetchData: async (params: FetchDataParams) => { const dataHelper = await getUptimeDataHelper(); diff --git a/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx b/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx index db4e7b968c2db..09273b1a3f95e 100644 --- a/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx +++ b/x-pack/plugins/uptime/public/components/common/charts/ping_histogram.tsx @@ -16,7 +16,7 @@ import { XYChartElementEvent, ElementClickListener, } from '@elastic/charts'; -import { EuiTitle, EuiSpacer } from '@elastic/eui'; +import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React, { useContext } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -26,10 +26,12 @@ import { getChartDateLabel } from '../../../lib/helper'; import { ChartWrapper } from './chart_wrapper'; import { UptimeThemeContext } from '../../../contexts'; import { HistogramResult } from '../../../../common/runtime_types'; -import { useUrlParams } from '../../../hooks'; +import { useMonitorId, useUrlParams } from '../../../hooks'; import { ChartEmptyState } from './chart_empty_state'; import { getDateRangeFromChartElement } from './utils'; import { STATUS_DOWN_LABEL, STATUS_UP_LABEL } from '../translations'; +import { createExploratoryViewUrl } from '../../../../../observability/public'; +import { useUptimeSettingsContext } from '../../../contexts/uptime_settings_context'; export interface PingHistogramComponentProps { /** @@ -69,7 +71,13 @@ export const PingHistogramComponent: React.FC = ({ chartTheme, } = useContext(UptimeThemeContext); - const [, updateUrlParams] = useUrlParams(); + const monitorId = useMonitorId(); + + const { basePath } = useUptimeSettingsContext(); + + const [getUrlParams, updateUrlParams] = useUrlParams(); + + const { dateRangeStart, dateRangeEnd } = getUrlParams(); let content: JSX.Element | undefined; if (!data?.histogram?.length) { @@ -179,17 +187,36 @@ export const PingHistogramComponent: React.FC = ({ ); } + const pingHistogramExploratoryViewLink = createExploratoryViewUrl( + { + 'pings-over-time': { + reportType: 'upp', + time: { from: dateRangeStart, to: dateRangeEnd }, + ...(monitorId ? { filters: [{ field: 'monitor.id', values: [monitorId] }] } : {}), + }, + }, + basePath + ); + return ( <> - -

- -

- - + + + +

+ +

+ + + + + + + + {content} ); diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx index d6a64e6511024..45b107928d79a 100644 --- a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx +++ b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.test.tsx @@ -19,6 +19,7 @@ describe('EmptyState component', () => { statesIndexStatus = { indexExists: true, docCount: 1, + indices: 'heartbeat-*,synthetics-*', }; }); @@ -72,6 +73,7 @@ describe('EmptyState component', () => { statesIndexStatus = { docCount: 0, indexExists: true, + indices: 'heartbeat-*,synthetics-*', }; const text = 'If this is in the snapshot the test should fail'; render( diff --git a/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts b/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts index 620b85b1c3233..d02ba142b907a 100644 --- a/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts +++ b/x-pack/plugins/uptime/public/state/effects/fetch_effect.test.ts @@ -18,9 +18,13 @@ describe('fetch saga effect factory', () => { let fetchEffect; it('works with success workflow', () => { - const indexStatusResult = { indexExists: true, docCount: 2712532 }; + const indexStatusResult = { + indexExists: true, + docCount: 2712532, + indices: 'heartbeat-*,synthetics-*', + }; const fetchStatus = async (): Promise => { - return { indexExists: true, docCount: 2712532 }; + return { indexExists: true, docCount: 2712532, indices: 'heartbeat-*,synthetics-*' }; }; fetchEffect = fetchEffectFactory( fetchStatus, diff --git a/x-pack/plugins/uptime/server/lib/lib.ts b/x-pack/plugins/uptime/server/lib/lib.ts index a91ff3d3b0faf..e79d3c28a7d3a 100644 --- a/x-pack/plugins/uptime/server/lib/lib.ts +++ b/x-pack/plugins/uptime/server/lib/lib.ts @@ -29,15 +29,18 @@ export interface UMServerLibs extends UMDomainLibs { } export interface CountResponse { - body: { - count: number; - _shards: { - total: number; - successful: number; - skipped: number; - failed: number; + result: { + body: { + count: number; + _shards: { + total: number; + successful: number; + skipped: number; + failed: number; + }; }; }; + indices: string; } export type UptimeESClient = ReturnType; @@ -107,7 +110,7 @@ export function createUptimeESClient({ throw esError; } - return res; + return { result: res, indices: dynamicSettings.heartbeatIndices }; }, getSavedObjectsClient() { return savedObjectsClient; diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts index 6a00e586ffb17..dcd61d5331aa4 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts @@ -12,12 +12,16 @@ export const getIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = asy uptimeEsClient, }) => { const { - body: { - _shards: { total }, - count, + indices, + result: { + body: { + _shards: { total }, + count, + }, }, } = await uptimeEsClient.count({ terminateAfter: 1 }); return { + indices, indexExists: total > 0, docCount: count, }; diff --git a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts index 3e410a0608094..b54515e84289a 100644 --- a/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts +++ b/x-pack/plugins/uptime/server/lib/requests/search/query_context.ts @@ -48,7 +48,9 @@ export class QueryContext { } async count(params: any): Promise { - const { body } = await this.callES.count(params); + const { + result: { body }, + } = await this.callES.count(params); return body; } diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json index f56440f2e4c4f..12cdf0a98b410 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/cluster.json @@ -1052,6 +1052,107 @@ ] ] } + ], + "apm_memory_cgroup": [ + { + "bucket_size": "30 seconds", + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + null + ], + [ + 1535723940000, + null + ] + ], + "metric": { + "app": "apm", + "description": "Memory usage of the container", + "field": "beats_stats.metrics.beat.cgroup.memory.mem.usage.bytes", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false, + "label": "Memory Utilization (cgroup)", + "metricAgg": "max", + "title": "Memory", + "units": "B" + }, + "timeRange": { + "max": 1535723989104, + "min": 1535720389104 + } + }, + { + "bucket_size": "30 seconds", + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + null + ], + [ + 1535723940000, + null + ] + ], + "metric": { + "app": "apm", + "description": "Memory limit of the container", + "field": "beats_stats.metrics.beat.cgroup.memory.mem.limit.bytes", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false, + "label": "Memory Limit", + "metricAgg": "max", + "title": "Memory", + "units": "B" + }, + "timeRange": { + "max": 1535723989104, + "min": 1535720389104 + } + }, + { + "bucket_size": "30 seconds", + "data": [ + [ + 1535723880000, + 5212816 + ], + [ + 1535723910000, + 4996912 + ], + [ + 1535723940000, + 4886176 + ] + ], + "metric": { + "app": "apm", + "description": "Limit of allocated memory at which garbage collection will occur", + "field": "beats_stats.metrics.beat.memstats.gc_next", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false, + "label": "GC Next", + "metricAgg": "max", + "title": "Memory", + "units": "B" + }, + "timeRange": { + "max": 1535723989104, + "min": 1535720389104 + } + } ] } } diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json index 089ad3db54069..558ca36edade0 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json +++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json @@ -147,7 +147,7 @@ "isDerivative": false }, "data": [ - [1535723880000, 4996912], + [1535723880000, 5212816], [1535723910000, 4996912], [1535723940000, 4886176] ] @@ -884,6 +884,107 @@ [1535723940000, 0] ] } + ], + "apm_memory_cgroup": [ + { + "bucket_size": "30 seconds", + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + null + ], + [ + 1535723940000, + null + ] + ], + "metric": { + "app": "apm", + "description": "Memory usage of the container", + "field": "beats_stats.metrics.beat.cgroup.memory.mem.usage.bytes", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false, + "label": "Memory Utilization (cgroup)", + "metricAgg": "max", + "title": "Memory", + "units": "B" + }, + "timeRange": { + "max": 1535723989104, + "min": 1535720389104 + } + }, + { + "bucket_size": "30 seconds", + "data": [ + [ + 1535723880000, + null + ], + [ + 1535723910000, + null + ], + [ + 1535723940000, + null + ] + ], + "metric": { + "app": "apm", + "description": "Memory limit of the container", + "field": "beats_stats.metrics.beat.cgroup.memory.mem.limit.bytes", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false, + "label": "Memory Limit", + "metricAgg": "max", + "title": "Memory", + "units": "B" + }, + "timeRange": { + "max": 1535723989104, + "min": 1535720389104 + } + }, + { + "bucket_size": "30 seconds", + "data": [ + [ + 1535723880000, + 5212816 + ], + [ + 1535723910000, + 4996912 + ], + [ + 1535723940000, + 4886176 + ] + ], + "metric": { + "app": "apm", + "description": "Limit of allocated memory at which garbage collection will occur", + "field": "beats_stats.metrics.beat.memstats.gc_next", + "format": "0,0.0 b", + "hasCalculation": false, + "isDerivative": false, + "label": "GC Next", + "metricAgg": "max", + "title": "Memory", + "units": "B" + }, + "timeRange": { + "max": 1535723989104, + "min": 1535720389104 + } + } ] }, "apmSummary": { diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instance.js b/x-pack/test/api_integration/apis/monitoring/apm/instance.js index 23c11dd530985..5f603d25b7d69 100644 --- a/x-pack/test/api_integration/apis/monitoring/apm/instance.js +++ b/x-pack/test/api_integration/apis/monitoring/apm/instance.js @@ -9,6 +9,8 @@ import expect from '@kbn/expect'; import apmInstanceFixture from './fixtures/instance'; export default function ({ getService }) { + // Skipping for now since failure is unclear + return void 0; const supertest = getService('supertest'); const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json index 6ff7ea58c30f0..5151f0adb0011 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json @@ -1,4 +1,5 @@ { "indexExists": true, - "docCount": 1 + "docCount": 1, + "indices": "heartbeat-8*,synthetics-*" } diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts index 33fff4fb232d7..a46aa653b6f2b 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/index.ts +++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts @@ -55,7 +55,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('./ping_histogram')); loadTestFile(require.resolve('./ping_list')); loadTestFile(require.resolve('./monitor_duration')); - loadTestFile(require.resolve('./doc_count')); + loadTestFile(require.resolve('./index_status')); loadTestFile(require.resolve('./monitor_states_real_data')); }); }); diff --git a/x-pack/test/api_integration/apis/uptime/rest/doc_count.ts b/x-pack/test/api_integration/apis/uptime/rest/index_status.ts similarity index 100% rename from x-pack/test/api_integration/apis/uptime/rest/doc_count.ts rename to x-pack/test/api_integration/apis/uptime/rest/index_status.ts diff --git a/x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts b/x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts index 4474d0996175b..15ddc04e2414d 100644 --- a/x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts +++ b/x-pack/test/apm_api_integration/tests/csm/has_rum_data.ts @@ -22,6 +22,7 @@ export default function rumHasDataApiTests({ getService }: FtrProviderContext) { expectSnapshot(response.body).toMatchInline(` Object { "hasData": false, + "indices": "traces-apm*,apm-*", } `); }); @@ -41,6 +42,7 @@ export default function rumHasDataApiTests({ getService }: FtrProviderContext) { expectSnapshot(response.body).toMatchInline(` Object { "hasData": true, + "indices": "traces-apm*,apm-*", "serviceName": "client", } `); diff --git a/x-pack/test/apm_api_integration/tests/index.ts b/x-pack/test/apm_api_integration/tests/index.ts index df1ed1db5900a..7c38f37093fa4 100644 --- a/x-pack/test/apm_api_integration/tests/index.ts +++ b/x-pack/test/apm_api_integration/tests/index.ts @@ -73,6 +73,10 @@ export default function apmApiIntegrationTests(providerContext: FtrProviderConte loadTestFile(require.resolve('./service_overview/instances_detailed_statistics')); }); + describe('service_overview/instance_details', function () { + loadTestFile(require.resolve('./service_overview/instance_details')); + }); + // Services describe('services/agent_name', function () { loadTestFile(require.resolve('./services/agent_name')); diff --git a/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap new file mode 100644 index 0000000000000..b4197c7dfbf67 --- /dev/null +++ b/x-pack/test/apm_api_integration/tests/service_overview/__snapshots__/instance_details.snap @@ -0,0 +1,47 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`APM API tests basic apm_8.0.0 Instance details when data is loaded fetch instance details return the correct data 1`] = ` +Object { + "@timestamp": "2020-12-08T13:59:01.971Z", + "agent": Object { + "ephemeral_id": "d27b2271-06b4-48c8-a02a-cfd963c0b4d0", + "name": "java", + "version": "1.19.1-SNAPSHOT.null", + }, + "container": Object { + "id": "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c", + }, + "host": Object { + "architecture": "amd64", + "ip": "10.8.4.45", + "os": Object { + "platform": "Linux", + }, + }, + "kubernetes": Object { + "pod": Object { + "name": "opbeans-java-6bdd78cb5c-k2qz6", + "uid": "805e875d-1fda-42c0-bb54-23eb6faf54ab", + }, + }, + "service": Object { + "environment": "production", + "framework": Object { + "name": "Servlet API", + }, + "language": Object { + "name": "Java", + "version": "11.0.9.1", + }, + "name": "opbeans-java", + "node": Object { + "name": "02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c", + }, + "runtime": Object { + "name": "Java", + "version": "11.0.9.1", + }, + "version": "2020-12-08 03:35:36", + }, +} +`; diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts new file mode 100644 index 0000000000000..ee3966aa10a49 --- /dev/null +++ b/x-pack/test/apm_api_integration/tests/service_overview/instance_details.ts @@ -0,0 +1,101 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ +import url from 'url'; +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; +import archives from '../../common/fixtures/es_archiver/archives_metadata'; +import { registry } from '../../common/registry'; +import { APIReturnType } from '../../../../plugins/apm/public/services/rest/createCallApmApi'; + +type ServiceOverviewInstanceDetails = APIReturnType<'GET /api/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}'>; + +export default function ApiTest({ getService }: FtrProviderContext) { + const supertest = getService('supertest'); + + const archiveName = 'apm_8.0.0'; + const { start, end } = archives[archiveName]; + + registry.when( + 'Instance details when data is not loaded', + { config: 'basic', archives: [] }, + () => { + describe('when data is not loaded', () => { + it('handles empty state', async () => { + const response = await supertest.get( + url.format({ + pathname: '/api/apm/services/opbeans-java/service_overview_instances/details/foo', + query: { + start, + end, + transactionType: 'request', + }, + }) + ); + + expect(response.status).to.be(200); + expect(response.body).to.eql({}); + }); + }); + } + ); + + registry.when( + 'Instance details when data is loaded', + { config: 'basic', archives: [archiveName] }, + () => { + describe('fetch instance details', () => { + let response: { + status: number; + body: ServiceOverviewInstanceDetails; + }; + + before(async () => { + response = await supertest.get( + url.format({ + pathname: + '/api/apm/services/opbeans-java/service_overview_instances/details/02950c4c5fbb0fda1cc98c47bf4024b473a8a17629db6530d95dcee68bd54c6c', + query: { + start, + end, + transactionType: 'request', + }, + }) + ); + }); + + it('returns the instance details', () => { + expect(response.body).to.not.eql({}); + }); + + it('return the correct data', () => { + expectSnapshot(response.body).toMatch(); + }); + }); + } + ); + + registry.when( + 'Instance details when data is loaded but details not found', + { config: 'basic', archives: [archiveName] }, + () => { + it('handles empty state when instance id not found', async () => { + const response = await supertest.get( + url.format({ + pathname: '/api/apm/services/opbeans-java/service_overview_instances/details/foo', + query: { + start, + end, + transactionType: 'request', + }, + }) + ); + expect(response.status).to.be(200); + expect(response.body).to.eql({}); + }); + } + ); +} diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts index 6f437f7bcc8e5..ed758aa85bde9 100644 --- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts +++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/generating_signals.ts @@ -1322,5 +1322,118 @@ export default ({ getService }: FtrProviderContext) => { }); }); }); + + describe('Signals generated from events with timestamp override field and ensures search_after continues to work when documents are missing timestamp override field', () => { + beforeEach(async () => { + await createSignalsIndex(supertest); + await esArchiver.load('auditbeat/hosts'); + }); + + afterEach(async () => { + await deleteSignalsIndex(supertest); + await deleteAllAlerts(supertest); + await esArchiver.unload('auditbeat/hosts'); + }); + + /** + * This represents our worst case scenario where this field is not mapped on any index + * We want to check that our logic continues to function within the constraints of search after + * Elasticsearch returns java's long.MAX_VALUE for unmapped date fields + * Javascript does not support numbers this large, but without passing in a number of this size + * The search_after will continue to return the same results and not iterate to the next set + * So to circumvent this limitation of javascript we return the stringified version of Java's + * Long.MAX_VALUE so that search_after does not enter into an infinite loop. + * + * ref: https://github.com/elastic/elasticsearch/issues/28806#issuecomment-369303620 + */ + it('should generate 200 signals when timestamp override does not exist', async () => { + const rule: QueryCreateSchema = { + ...getRuleForSignalTesting(['auditbeat-*']), + timestamp_override: 'event.fakeingested', + max_signals: 200, + }; + + const { id } = await createRule(supertest, rule); + await waitForRuleSuccessOrStatus(supertest, id, 'partial failure'); + await waitForSignalsToBePresent(supertest, 200, [id]); + const signalsResponse = await getSignalsByIds(supertest, [id], 200); + const signals = signalsResponse.hits.hits.map((hit) => hit._source); + + expect(signals.length).equal(200); + }); + }); + + /** + * Here we test the functionality of timestamp overrides. If the rule specifies a timestamp override, + * then the documents will be queried and sorted using the timestamp override field. + * If no timestamp override field exists in the indices but one was provided to the rule, + * the rule's query will additionally search for events using the `@timestamp` field + */ + describe('Signals generated from events with timestamp override field', async () => { + beforeEach(async () => { + await deleteSignalsIndex(supertest); + await createSignalsIndex(supertest); + await esArchiver.load('security_solution/timestamp_override_1'); + await esArchiver.load('security_solution/timestamp_override_2'); + await esArchiver.load('security_solution/timestamp_override_3'); + await esArchiver.load('security_solution/timestamp_override_4'); + }); + + afterEach(async () => { + await deleteSignalsIndex(supertest); + await deleteAllAlerts(supertest); + await esArchiver.unload('security_solution/timestamp_override_1'); + await esArchiver.unload('security_solution/timestamp_override_2'); + await esArchiver.unload('security_solution/timestamp_override_3'); + await esArchiver.unload('security_solution/timestamp_override_4'); + }); + + it('should generate signals with event.ingested, @timestamp and (event.ingested + timestamp)', async () => { + const rule: QueryCreateSchema = { + ...getRuleForSignalTesting(['myfa*']), + timestamp_override: 'event.ingested', + }; + + const { id } = await createRule(supertest, rule); + + await waitForRuleSuccessOrStatus(supertest, id, 'partial failure'); + await waitForSignalsToBePresent(supertest, 3, [id]); + const signalsResponse = await getSignalsByIds(supertest, [id], 3); + const signals = signalsResponse.hits.hits.map((hit) => hit._source); + const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc'); + + expect(signalsOrderedByEventId.length).equal(3); + }); + + it('should generate 2 signals with @timestamp', async () => { + const rule: QueryCreateSchema = getRuleForSignalTesting(['myfa*']); + + const { id } = await createRule(supertest, rule); + + await waitForRuleSuccessOrStatus(supertest, id, 'partial failure'); + await waitForSignalsToBePresent(supertest, 2, [id]); + const signalsResponse = await getSignalsByIds(supertest, [id]); + const signals = signalsResponse.hits.hits.map((hit) => hit._source); + const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc'); + + expect(signalsOrderedByEventId.length).equal(2); + }); + + it('should generate 2 signals when timestamp override does not exist', async () => { + const rule: QueryCreateSchema = { + ...getRuleForSignalTesting(['myfa*']), + timestamp_override: 'event.fakeingestfield', + }; + const { id } = await createRule(supertest, rule); + + await waitForRuleSuccessOrStatus(supertest, id, 'partial failure'); + await waitForSignalsToBePresent(supertest, 2, [id]); + const signalsResponse = await getSignalsByIds(supertest, [id, id]); + const signals = signalsResponse.hits.hits.map((hit) => hit._source); + const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc'); + + expect(signalsOrderedByEventId.length).equal(2); + }); + }); }); }; diff --git a/x-pack/test/fleet_api_integration/apis/index.js b/x-pack/test/fleet_api_integration/apis/index.js index 722d15751564d..4d2bf1d74a495 100644 --- a/x-pack/test/fleet_api_integration/apis/index.js +++ b/x-pack/test/fleet_api_integration/apis/index.js @@ -43,5 +43,8 @@ export default function ({ loadTestFile }) { // Preconfiguration loadTestFile(require.resolve('./preconfiguration/index')); + + // Service tokens + loadTestFile(require.resolve('./service_tokens')); }); } diff --git a/x-pack/test/fleet_api_integration/apis/service_tokens.ts b/x-pack/test/fleet_api_integration/apis/service_tokens.ts new file mode 100644 index 0000000000000..ddd4aed30f76b --- /dev/null +++ b/x-pack/test/fleet_api_integration/apis/service_tokens.ts @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License + * 2.0; you may not use this file except in compliance with the Elastic License + * 2.0. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../api_integration/ftr_provider_context'; + +export default function (providerContext: FtrProviderContext) { + const { getService } = providerContext; + const supertest = getService('supertest'); + const esArchiver = getService('esArchiver'); + const esClient = getService('es'); + + describe('fleet_service_tokens', async () => { + before(async () => { + await esArchiver.load('empty_kibana'); + }); + + after(async () => { + await esArchiver.unload('empty_kibana'); + }); + + describe('POST /api/fleet/service-tokens', () => { + it('should create a valid service account token', async () => { + const { body: apiResponse } = await supertest + .post(`/api/fleet/service-tokens`) + .set('kbn-xsrf', 'xxxx') + .expect(200); + + expect(apiResponse).have.property('name'); + expect(apiResponse).have.property('value'); + + const { body: tokensResponse } = await esClient.transport.request({ + method: 'GET', + path: `_security/service/elastic/fleet-server/credential`, + }); + + expect(tokensResponse.tokens).have.property(apiResponse.name); + }); + }); + }); +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override/data.json.gz b/x-pack/test/functional/es_archives/security_solution/timestamp_override/data.json.gz index be351495c2f2e..a2c561471289f 100644 Binary files a/x-pack/test/functional/es_archives/security_solution/timestamp_override/data.json.gz and b/x-pack/test/functional/es_archives/security_solution/timestamp_override/data.json.gz differ diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json index 28de7eeb2eb01..085ab34a3d58a 100644 --- a/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json @@ -1,19 +1,19 @@ { - "type": "index", - "value": { - "index": "myfakeindex-1", - "mappings" : { - "properties" : { - "message" : { - "type" : "text", - "fields" : { - "keyword" : { - "type" : "keyword", - "ignore_above" : 256 - } - } - } + "type": "index", + "value": { + "index": "myfakeindex-1", + "mappings": { + "properties": { + "message": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 } } + } + } } -} \ No newline at end of file + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/data.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/data.json new file mode 100644 index 0000000000000..a07bf9fdd653b --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/data.json @@ -0,0 +1,10 @@ +{ + "type": "doc", + "value": { + "index": "myfakeindex-1", + "source": { + "message": "hello world 1" + }, + "type": "_doc" + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json new file mode 100644 index 0000000000000..085ab34a3d58a --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json @@ -0,0 +1,19 @@ +{ + "type": "index", + "value": { + "index": "myfakeindex-1", + "mappings": { + "properties": { + "message": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + } + } + } + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/data.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/data.json new file mode 100644 index 0000000000000..24ba2aa42fb82 --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/data.json @@ -0,0 +1,13 @@ +{ + "type": "doc", + "value": { + "index": "myfakeindex-2", + "source": { + "message": "hello world 2", + "event": { + "ingested": "2020-12-16T15:16:18.570Z" + } + }, + "type": "_doc" + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json new file mode 100644 index 0000000000000..49a27a423cdaa --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json @@ -0,0 +1,26 @@ +{ + "type": "index", + "value": { + "index": "myfakeindex-2", + "mappings": { + "properties": { + "message": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "event": { + "properties": { + "ingested": { + "type": "date" + } + } + } + } + } + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/data.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/data.json new file mode 100644 index 0000000000000..56b0c8dff6eba --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/data.json @@ -0,0 +1,11 @@ +{ + "type": "doc", + "value": { + "index": "myfakeindex-3", + "source": { + "message": "hello world 3", + "@timestamp": "2020-12-16T15:16:18.570Z" + }, + "type": "_doc" + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json new file mode 100644 index 0000000000000..736584386a705 --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json @@ -0,0 +1,22 @@ +{ + "type": "index", + "value": { + "index": "myfakeindex-3", + "mappings": { + "properties": { + "message": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "@timestamp": { + "type": "date" + } + } + } + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json new file mode 100644 index 0000000000000..ca7025b36154c --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json @@ -0,0 +1,14 @@ +{ + "type": "doc", + "value": { + "index": "myfakeindex-4", + "source": { + "message": "hello world 4", + "@timestamp": "2020-12-16T15:16:18.570Z", + "event": { + "ingested": "2020-12-16T15:16:18.570Z" + } + }, + "type": "_doc" + } +} diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json new file mode 100644 index 0000000000000..ab4edc9f300e1 --- /dev/null +++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json @@ -0,0 +1,29 @@ +{ + "type": "index", + "value": { + "index": "myfakeindex-4", + "mappings": { + "properties": { + "@timestamp": { + "type": "date" + }, + "message": { + "type": "text", + "fields": { + "keyword": { + "type": "keyword", + "ignore_above": 256 + } + } + }, + "event": { + "properties": { + "ingested": { + "type": "date" + } + } + } + } + } + } +} diff --git a/yarn.lock b/yarn.lock index a849407238216..4b7d3aee4d3f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1192,10 +1192,10 @@ resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047" integrity sha512-4Th98KlMHr5+JkxfcoDT//6vY8vM+iSPrLNpHhRyLx2CFYi8e2RfqPLdpbnpo0Q5lQC5hNB79yes07zb02fvCw== -"@bazel/ibazel@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.14.0.tgz#86fa0002bed2ce1123b7ad98d4dd4623a0d93244" - integrity sha512-s0gyec6lArcRDwVfIP6xpY8iEaFpzrSpyErSppd3r2O49pOEg7n6HGS/qJ8ncvme56vrDk6crl/kQ6VAdEO+rg== +"@bazel/ibazel@^0.15.10": + version "0.15.10" + resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.15.10.tgz#cf0cff1aec6d8e7bb23e1fc618d09fbd39b7a13f" + integrity sha512-0v+OwCQ6fsGFa50r6MXWbUkSGuWOoZ22K4pMSdtWiL5LKFIE4kfmMmtQS+M7/ICNwk2EIYob+NRreyi/DGUz5A== "@bazel/typescript@^3.2.3": version "3.2.3"