From 29a986beb502d27cbcee02fb368de2ad56b7f926 Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Wed, 18 Apr 2018 13:00:37 -0700 Subject: [PATCH 01/47] Rollup index pattern creation as xpack plugin Co-authored-by: CJ Cenizal --- src/core_plugins/kibana/mappings.json | 6 + src/core_plugins/kibana/public/kibana.js | 1 + .../components/header/header.js | 44 ++++-- .../components/header/header.js | 19 ++- .../components/indices_list/indices_list.js | 8 + .../status_message/status_message.js | 4 +- .../step_index_pattern/step_index_pattern.js | 34 ++-- .../components/header/header.js | 8 +- .../step_time_field/step_time_field.js | 14 +- .../create_index_pattern_wizard.js | 16 +- .../create_index_pattern_wizard/index.js | 8 +- .../lib/get_indices.js | 22 ++- .../edit_index_pattern.html | 19 ++- .../edit_index_pattern/edit_index_pattern.js | 5 + .../components/table/table.js | 37 +++-- .../indexed_fields_table.js | 4 +- .../management/sections/indices/index.html | 53 +------ .../management/sections/indices/index.js | 81 +++++++++- .../management/sections/indices/index.less | 24 +++ .../components/create_button/create_button.js | 126 +++++++++++++++ .../components/create_button/index.js | 20 +++ .../components/header/header.js | 29 ++++ .../components/header/index.js | 20 +++ .../components/list/index.js | 20 +++ .../components/list/list.js | 56 +++++++ .../indices/index_pattern_list/index.js | 20 +++ .../index_pattern_list/index_pattern_list.js | 45 ++++++ .../service/index_patterns_service.js | 2 +- .../public/index_patterns/_index_pattern.js | 4 +- .../public/index_patterns/fields_fetcher.js | 5 +- .../index_patterns_api_client.js | 15 +- src/ui/public/management/index.js | 34 +--- .../index_pattern_creation/index.js | 23 +++ .../index_pattern_creation.js | 56 +++++++ .../index_pattern_creation_config.js | 94 +++++++++++ .../index_pattern_creation_config_registry.js | 26 ++++ .../index_pattern_creation/register.js | 23 +++ .../public/management/index_pattern_list.js | 52 +++++++ src/ui/public/management/sections_register.js | 44 ++++++ src/ui/ui_exports/ui_export_types/index.js | 1 + .../ui_export_types/ui_app_extensions.js | 1 + x-pack/index.js | 2 + .../plugins/rollup/common/constants/index.js | 7 + .../plugins/rollup/common/constants/plugin.js | 9 ++ x-pack/plugins/rollup/index.js | 29 ++++ .../components/rollup_prompt/index.js | 7 + .../components/rollup_prompt/rollup_prompt.js | 24 +++ .../public/index_pattern_creation/index.js | 7 + .../public/index_pattern_creation/register.js | 10 ++ .../rollup_index_pattern_creation_config.js | 122 +++++++++++++++ .../rollup/public/index_pattern_list/index.js | 7 + .../public/index_pattern_list/register.js | 49 ++++++ x-pack/plugins/rollup/public/services/api.js | 17 ++ .../server/client/elasticsearch_rollup.js | 30 ++++ .../call_with_request_factory.js | 24 +++ .../lib/call_with_request_factory/index.js | 7 + .../check_license/__tests__/check_license.js | 146 ++++++++++++++++++ .../server/lib/check_license/check_license.js | 58 +++++++ .../rollup/server/lib/check_license/index.js | 7 + .../__tests__/wrap_custom_error.js | 21 +++ .../error_wrappers/__tests__/wrap_es_error.js | 39 +++++ .../__tests__/wrap_unknown_error.js | 19 +++ .../rollup/server/lib/error_wrappers/index.js | 9 ++ .../lib/error_wrappers/wrap_custom_error.js | 18 +++ .../lib/error_wrappers/wrap_es_error.js | 30 ++++ .../lib/error_wrappers/wrap_unknown_error.js | 17 ++ .../__tests__/is_es_error_factory.js | 48 ++++++ .../server/lib/is_es_error_factory/index.js | 7 + .../is_es_error_factory.js | 18 +++ .../rollup/server/lib/map_capabilities.js | 51 ++++++ .../lib/register_license_checker/index.js | 7 + .../register_license_checker.js | 21 +++ .../plugins/rollup/server/routes/api/index.js | 8 + .../server/routes/api/index_patterns.js | 89 +++++++++++ .../rollup/server/routes/api/indices.js | 35 +++++ 75 files changed, 1962 insertions(+), 160 deletions(-) create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index.less create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/create_button.js create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/index.js create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/header.js create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/index.js create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/index.js create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index.js create mode 100644 src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js create mode 100644 src/ui/public/management/index_pattern_creation/index.js create mode 100644 src/ui/public/management/index_pattern_creation/index_pattern_creation.js create mode 100644 src/ui/public/management/index_pattern_creation/index_pattern_creation_config.js create mode 100644 src/ui/public/management/index_pattern_creation/index_pattern_creation_config_registry.js create mode 100644 src/ui/public/management/index_pattern_creation/register.js create mode 100644 src/ui/public/management/index_pattern_list.js create mode 100644 src/ui/public/management/sections_register.js create mode 100644 x-pack/plugins/rollup/common/constants/index.js create mode 100644 x-pack/plugins/rollup/common/constants/plugin.js create mode 100644 x-pack/plugins/rollup/index.js create mode 100644 x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js create mode 100644 x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js create mode 100644 x-pack/plugins/rollup/public/index_pattern_creation/index.js create mode 100644 x-pack/plugins/rollup/public/index_pattern_creation/register.js create mode 100644 x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js create mode 100644 x-pack/plugins/rollup/public/index_pattern_list/index.js create mode 100644 x-pack/plugins/rollup/public/index_pattern_list/register.js create mode 100644 x-pack/plugins/rollup/public/services/api.js create mode 100644 x-pack/plugins/rollup/server/client/elasticsearch_rollup.js create mode 100644 x-pack/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js create mode 100644 x-pack/plugins/rollup/server/lib/call_with_request_factory/index.js create mode 100644 x-pack/plugins/rollup/server/lib/check_license/__tests__/check_license.js create mode 100644 x-pack/plugins/rollup/server/lib/check_license/check_license.js create mode 100644 x-pack/plugins/rollup/server/lib/check_license/index.js create mode 100644 x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_custom_error.js create mode 100644 x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_es_error.js create mode 100644 x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_unknown_error.js create mode 100644 x-pack/plugins/rollup/server/lib/error_wrappers/index.js create mode 100644 x-pack/plugins/rollup/server/lib/error_wrappers/wrap_custom_error.js create mode 100644 x-pack/plugins/rollup/server/lib/error_wrappers/wrap_es_error.js create mode 100644 x-pack/plugins/rollup/server/lib/error_wrappers/wrap_unknown_error.js create mode 100644 x-pack/plugins/rollup/server/lib/is_es_error_factory/__tests__/is_es_error_factory.js create mode 100644 x-pack/plugins/rollup/server/lib/is_es_error_factory/index.js create mode 100644 x-pack/plugins/rollup/server/lib/is_es_error_factory/is_es_error_factory.js create mode 100644 x-pack/plugins/rollup/server/lib/map_capabilities.js create mode 100644 x-pack/plugins/rollup/server/lib/register_license_checker/index.js create mode 100644 x-pack/plugins/rollup/server/lib/register_license_checker/register_license_checker.js create mode 100644 x-pack/plugins/rollup/server/routes/api/index.js create mode 100644 x-pack/plugins/rollup/server/routes/api/index_patterns.js create mode 100644 x-pack/plugins/rollup/server/routes/api/indices.js diff --git a/src/core_plugins/kibana/mappings.json b/src/core_plugins/kibana/mappings.json index 471cee57da565..c65fd5377f1ec 100644 --- a/src/core_plugins/kibana/mappings.json +++ b/src/core_plugins/kibana/mappings.json @@ -21,6 +21,12 @@ }, "title": { "type": "text" + }, + "type": { + "type": "keyword" + }, + "typeMeta": { + "type": "keyword" } } }, diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js index 7daafbf6411a9..ed88791241d13 100644 --- a/src/core_plugins/kibana/public/kibana.js +++ b/src/core_plugins/kibana/public/kibana.js @@ -37,6 +37,7 @@ import 'uiExports/fieldFormatEditors'; import 'uiExports/navbarExtensions'; import 'uiExports/contextMenuActions'; import 'uiExports/managementSections'; +import 'uiExports/indexManagement'; import 'uiExports/devTools'; import 'uiExports/docViews'; import 'uiExports/embeddableFactories'; diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js index c6c749d400bab..c29acc22f6ac4 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js @@ -17,7 +17,7 @@ * under the License. */ -import React from 'react'; +import React, { Fragment } from 'react'; import { EuiSpacer, @@ -32,6 +32,9 @@ import { import { FormattedMessage } from '@kbn/i18n/react'; export const Header = ({ + prompt, + indexPatternName, + showSystemIndices, isIncludingSystemIndices, onChangeIncludingSystemIndices, }) => ( @@ -41,7 +44,10 @@ export const Header = ({

@@ -58,18 +64,30 @@ export const Header = ({

- - } - id="checkboxShowSystemIndices" - checked={isIncludingSystemIndices} - onChange={onChangeIncludingSystemIndices} - /> - + { + showSystemIndices ? ( + + } + id="checkboxShowSystemIndices" + checked={isIncludingSystemIndices} + onChange={onChangeIncludingSystemIndices} + /> + + ) : '' + } + { + prompt ? ( + + + {prompt} + + ) : '' + } ); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/header.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/header.js index aab39f8851ef7..0c1262964c298 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/header.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/header.js @@ -40,6 +40,7 @@ export const HeaderComponent = ({ onQueryChanged, goToNextStep, isNextStepDisabled, + allowWildcards, intl, ...rest }) => ( @@ -67,13 +68,17 @@ export const HeaderComponent = ({ error={errors} helpText={
-

- * }} - /> -

+ { + allowWildcards ? ( +

+ * }} + /> +

+ ) : '' + }

{this.highlightIndexName(index.name, queryWithoutWildcard)} + + {index.tags.map(tag => { + return ( + {tag.name} + ); + })} + ); }); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js index a403925f24dd1..772d7ec900ec1 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js @@ -35,6 +35,7 @@ export const StatusMessage = ({ }, isIncludingSystemIndices, query, + showSystemIndicies, }) => { let statusIcon; let statusMessage; @@ -58,7 +59,7 @@ export const StatusMessage = ({ ); } - else if (!isIncludingSystemIndices) { + else if (!isIncludingSystemIndices && showSystemIndicies) { statusMessage = ( { - const { esService } = this.props; + const { esService, indexPatternCreationType } = this.props; const { existingIndexPatterns } = this.state; if (existingIndexPatterns.includes(query)) { @@ -104,7 +109,7 @@ export class StepIndexPatternComponent extends Component { this.setState({ isLoadingIndices: true, indexPatternExists: false }); if (query.endsWith('*')) { - const exactMatchedIndices = await ensureMinimumTime(getIndices(esService, query, MAX_SEARCH_SIZE)); + const exactMatchedIndices = await ensureMinimumTime(getIndices(esService, indexPatternCreationType, query, MAX_SEARCH_SIZE)); // If the search changed, discard this state if (query !== this.lastQuery) { return; @@ -117,8 +122,8 @@ export class StepIndexPatternComponent extends Component { partialMatchedIndices, exactMatchedIndices, ] = await ensureMinimumTime([ - getIndices(esService, `${query}*`, MAX_SEARCH_SIZE), - getIndices(esService, query, MAX_SEARCH_SIZE), + getIndices(esService, indexPatternCreationType, `${query}*`, MAX_SEARCH_SIZE), + getIndices(esService, indexPatternCreationType, query, MAX_SEARCH_SIZE), ]); // If the search changed, discard this state @@ -134,11 +139,11 @@ export class StepIndexPatternComponent extends Component { } onQueryChanged = e => { - const { appendedWildcard } = this.state; + const { appendedWildcard, allowWildcards } = this.state; const { target } = e; let query = target.value; - if (query.length === 1 && canAppendWildcard(query)) { + if (query.length === 1 && allowWildcards && canAppendWildcard(query)) { query += '*'; this.setState({ appendedWildcard: true }); setTimeout(() => target.setSelectionRange(1, 1)); @@ -167,6 +172,7 @@ export class StepIndexPatternComponent extends Component { } renderStatusMessage(matchedIndices) { + const { indexPatternCreationType } = this.props; const { query, isLoadingIndices, indexPatternExists, isIncludingSystemIndices } = this.state; if (isLoadingIndices || indexPatternExists) { @@ -176,6 +182,7 @@ export class StepIndexPatternComponent extends Component { return ( @@ -230,12 +237,13 @@ export class StepIndexPatternComponent extends Component { } renderHeader({ exactMatchedIndices: indices }) { - const { goToNextStep, intl } = this.props; - const { query, showingIndexPatternQueryErrors, indexPatternExists } = this.state; + const { goToNextStep, indexPatternCreationType, intl } = this.props; + const { query, showingIndexPatternQueryErrors, indexPatternExists, indexPatternName, allowWildcards } = this.state; let containsErrors = false; const errors = []; - const characterList = ILLEGAL_CHARACTERS.slice(0, ILLEGAL_CHARACTERS.length - 1).join(', '); + const characterList = this.ILLEGAL_CHARACTERS.slice(0, this.ILLEGAL_CHARACTERS.length - 1).join(', '); + const checkIndices = indexPatternCreationType.checkIndicesForErrors(indices); if (!query || !query.length || query === '.' || query === '..') { // This is an error scenario but do not report an error @@ -245,12 +253,15 @@ export class StepIndexPatternComponent extends Component { const errorMessage = intl.formatMessage( { id: 'kbn.management.createIndexPattern.step.invalidCharactersErrorMessage', - defaultMessage: 'An index pattern cannot contain spaces or the characters: {characterList}' + defaultMessage: 'A ${indexPatternName} cannot contain spaces or the characters: {characterList}' }, - { characterList }); + { characterList, indexPatternName }); errors.push(errorMessage); containsErrors = true; + } else if(checkIndices) { + errors.push(...checkIndices); + containsErrors = true; } const isInputInvalid = showingIndexPatternQueryErrors && containsErrors && errors.length > 0; @@ -266,6 +277,7 @@ export class StepIndexPatternComponent extends Component { onQueryChanged={this.onQueryChanged} goToNextStep={goToNextStep} isNextStepDisabled={isNextStepDisabled} + allowWildcards={allowWildcards} /> ); } diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js index 1ccaf90f66484..67e8053eb6bbd 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js @@ -29,6 +29,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; export const Header = ({ indexPattern, + indexPatternName, }) => (

@@ -43,8 +44,11 @@ export const Header = ({ {indexPattern} }} + defaultMessage="You've defined {indexPattern} as your {indexPatternName}. Now you can specify some settings before we create it." + values={{ + indexPattern: {indexPattern}, + indexPatternName, + }} />
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/step_time_field.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/step_time_field.js index b514e571166d1..a94c5c0f926b4 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/step_time_field.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/step_time_field.js @@ -43,6 +43,7 @@ export class StepTimeFieldComponent extends Component { indexPatternsService: PropTypes.object.isRequired, goToPreviousStep: PropTypes.func.isRequired, createIndexPattern: PropTypes.func.isRequired, + indexPatternCreationType: PropTypes.object.isRequired, } constructor(props) { @@ -56,6 +57,8 @@ export class StepTimeFieldComponent extends Component { isFetchingTimeFields: false, isCreating: false, indexPatternId: '', + indexPatternType: props.indexPatternCreationType.getIndexPatternType(), + indexPatternName: props.indexPatternCreationType.getIndexPatternName(), }; } @@ -65,9 +68,10 @@ export class StepTimeFieldComponent extends Component { fetchTimeFields = async () => { const { indexPatternsService, indexPattern } = this.props; + const { indexPatternType } = this.state; this.setState({ isFetchingTimeFields: true }); - const fields = await ensureMinimumTime(indexPatternsService.fieldsFetcher.fetchForWildcard(indexPattern)); + const fields = await ensureMinimumTime(indexPatternsService.fieldsFetcher.fetchForWildcard(indexPattern, indexPatternType)); const timeFields = extractTimeFields(fields); this.setState({ timeFields, isFetchingTimeFields: false }); @@ -113,6 +117,7 @@ export class StepTimeFieldComponent extends Component { indexPatternId, isCreating, isFetchingTimeFields, + indexPatternName, } = this.state; if (isCreating) { @@ -156,8 +161,11 @@ export class StepTimeFieldComponent extends Component { return ( -
- +
+ { this.setState({ allIndices: [], isInitiallyLoadingIndices: true }); const { services } = this.props; - const allIndices = await ensureMinimumTime(getIndices(services.es, `*`, MAX_SEARCH_SIZE)); + const allIndices = await ensureMinimumTime(getIndices(services.es, this.indexPatternCreationType, `*`, MAX_SEARCH_SIZE)); // this.setState({ allIndices, isInitiallyLoadingIndices: false }); } @@ -74,6 +78,7 @@ export class CreateIndexPatternWizard extends Component { id: indexPatternId, title: indexPattern, timeFieldName, + ...this.indexPatternCreationType.getIndexPatternMappings() }); const createdId = await emptyPattern.create(); @@ -105,8 +110,11 @@ export class CreateIndexPatternWizard extends Component { return (
); } @@ -138,6 +146,7 @@ export class CreateIndexPatternWizard extends Component { isIncludingSystemIndices={isIncludingSystemIndices} esService={services.es} savedObjectsClient={services.savedObjectsClient} + indexPatternCreationType={this.indexPatternCreationType} goToNextStep={this.goToTimeFieldStep} /> ); @@ -151,6 +160,7 @@ export class CreateIndexPatternWizard extends Component { indexPatternsService={services.indexPatterns} goToPreviousStep={this.goToIndexPatternStep} createIndexPattern={this.createIndexPattern} + indexPatternCreationType={this.indexPatternCreationType} /> ); } diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js index 2b5c3987af420..ced5b1c69b83e 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js @@ -21,6 +21,8 @@ import { SavedObjectsClientProvider } from 'ui/saved_objects'; import uiRoutes from 'ui/routes'; import angularTemplate from './angular_template.html'; import 'ui/index_patterns'; +import { documentationLinks } from 'ui/documentation_links'; +import { IndexPatternCreationFactory } from 'ui/management/index_pattern_creation'; import { renderCreateIndexPatternWizard, destroyCreateIndexPatternWizard } from './render'; @@ -29,13 +31,17 @@ uiRoutes.when('/management/kibana/index', { controller: function ($scope, $injector) { // Wait for the directives to execute const kbnUrl = $injector.get('kbnUrl'); + const Private = $injector.get('Private'); $scope.$$postDigest(() => { const $routeParams = $injector.get('$routeParams'); + const indexPatternCreationProvider = Private(IndexPatternCreationFactory)($routeParams.type); + const indexPatternCreationType = indexPatternCreationProvider.getType(); const services = { config: $injector.get('config'), es: $injector.get('es'), indexPatterns: $injector.get('indexPatterns'), - savedObjectsClient: $injector.get('Private')(SavedObjectsClientProvider), + savedObjectsClient: Private(SavedObjectsClientProvider), + indexPatternCreationType, changeUrl: url => { $scope.$evalAsync(() => kbnUrl.changePath(url)); }, diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js index 7638daf1c5720..45a34efa314e6 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js @@ -19,7 +19,7 @@ import { get, sortBy } from 'lodash'; -export async function getIndices(es, rawPattern, limit) { +export async function getIndices(es, indexPatternCreationType, rawPattern, limit) { const pattern = rawPattern.trim(); // Searching for `*:` fails for CCS environments. The search request @@ -57,7 +57,8 @@ export async function getIndices(es, rawPattern, limit) { size: limit, } } - } + }, + ...indexPatternCreationType.getIndexPatternCreationQuery(), } }; @@ -67,11 +68,18 @@ export async function getIndices(es, rawPattern, limit) { return []; } - return sortBy(response.aggregations.indices.buckets.map(bucket => { - return { - name: bucket.key - }; - }), 'name'); + return sortBy( + response.aggregations.indices.buckets.map(bucket => { + return bucket.key; + }) + .map((index) => { + return { + name: index, + tags: indexPatternCreationType.getIndexTags(index) + }; + }) + , 'name' + ); } catch (err) { const type = get(err, 'body.error.caused_by.type'); diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html index 9e8d982090177..9b42d52159206 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html @@ -15,15 +15,22 @@ delete="removePattern()" > -

- - - +

+ + + + + +   + + + {{tag.name}}

+

, @@ -184,11 +186,14 @@ uiModules.get('apps/management') $scope, $location, $route, config, indexPatterns, Private, AppState, docTitle, confirmModal) { const $state = $scope.state = new AppState(); const { fieldWildcardMatcher } = Private(FieldWildcardProvider); + const indexPatternListProvider = Private(IndexPatternListFactory)(); $scope.fieldWildcardMatcher = fieldWildcardMatcher; $scope.editSectionsProvider = Private(IndicesEditSectionsProvider); $scope.kbnUrl = Private(KbnUrlProvider); $scope.indexPattern = $route.current.locals.indexPattern; + $scope.indexPattern.tags = indexPatternListProvider.getIndexPatternTags($scope.indexPattern); + $scope.getFieldInfo = indexPatternListProvider.getFieldInfo; docTitle.change($scope.indexPattern.title); const otherPatterns = _.filter($route.current.locals.indexPatterns, pattern => { diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/components/table/table.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/components/table/table.js index 628e42e9e9653..72ca608040c3f 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/components/table/table.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/components/table/table.js @@ -39,13 +39,19 @@ export class TableComponent extends PureComponent { return value ? : ; } - renderFieldName(name, isTimeField) { + renderFieldName(name, field) { + const { indexPattern } = this.props; const { intl } = this.props; - const label = intl.formatMessage({ + + const infoLabel = intl.formatMessage({ + id: 'kbn.management.editIndexPattern.fields.table.additionalInfo', + defaultMessage: 'Additional field information' + }); + const timeLabel = intl.formatMessage({ id: 'kbn.management.editIndexPattern.fields.table.primaryTimeAria', defaultMessage: 'Primary time field' }); - const content = intl.formatMessage({ + const timeContent = intl.formatMessage({ id: 'kbn.management.editIndexPattern.fields.table.primaryTimeTooltip', defaultMessage: 'This field represents the time that events occurred.' }); @@ -53,17 +59,28 @@ export class TableComponent extends PureComponent { return ( {name} - {isTimeField ? ( + {field.info && field.info.length ? ( + +   +

{info}
)} + /> + + ) : null} + {indexPattern.timeFieldName === name ? (   - ) : ''} + ) : null} ); } @@ -98,7 +115,7 @@ export class TableComponent extends PureComponent { } render() { - const { indexPattern, items, editField, intl } = this.props; + const { items, editField, intl } = this.props; const pagination = { initialPageSize: 10, @@ -111,8 +128,8 @@ export class TableComponent extends PureComponent { name: intl.formatMessage({ id: 'kbn.management.editIndexPattern.fields.table.nameHeader', defaultMessage: 'Name' }), dataType: 'string', sortable: true, - render: (value) => { - return this.renderFieldName(value, indexPattern.timeFieldName === value); + render: (value, field) => { + return this.renderFieldName(value, field); }, width: '38%', 'data-test-subj': 'indexedFieldName', diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js index 646abf6798756..607e7fa66242c 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/indexed_fields_table/indexed_fields_table.js @@ -36,6 +36,7 @@ export class IndexedFieldsTable extends Component { indexedFieldTypeFilter: PropTypes.string, helpers: PropTypes.shape({ redirectToRoute: PropTypes.func.isRequired, + getFieldInfo: PropTypes.func, }), fieldWildcardMatcher: PropTypes.func.isRequired, } @@ -57,7 +58,7 @@ export class IndexedFieldsTable extends Component { } mapFields(fields) { - const { indexPattern, fieldWildcardMatcher } = this.props; + const { indexPattern, fieldWildcardMatcher, helpers } = this.props; const sourceFilters = indexPattern.sourceFilters && indexPattern.sourceFilters.map(f => f.value); const fieldWildcardMatch = fieldWildcardMatcher(sourceFilters || []); @@ -70,6 +71,7 @@ export class IndexedFieldsTable extends Component { indexPattern: field.indexPattern, format: getFieldFormat(indexPattern, field.name), excluded: fieldWildcardMatch ? fieldWildcardMatch(field.name) : false, + info: helpers.getFieldInfo && helpers.getFieldInfo(indexPattern, field.name), }; }) || []; } diff --git a/src/core_plugins/kibana/public/management/sections/indices/index.html b/src/core_plugins/kibana/public/management/sections/indices/index.html index 26dee3efa77b8..bf7577e2379b1 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/index.html +++ b/src/core_plugins/kibana/public/management/sections/indices/index.html @@ -1,53 +1,6 @@ -
-
-
-
-
- - - - -
-
- -
+
+
+
diff --git a/src/core_plugins/kibana/public/management/sections/indices/index.js b/src/core_plugins/kibana/public/management/sections/indices/index.js index 69416c56e5c39..7a15d41e08786 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/index.js +++ b/src/core_plugins/kibana/public/management/sections/indices/index.js @@ -17,7 +17,8 @@ * under the License. */ -import { management } from 'ui/management'; +import { management, IndexPatternListFactory } from 'ui/management'; +import { IndexPatternCreationFactory } from 'ui/management/index_pattern_creation'; import './create_index_pattern_wizard'; import './edit_index_pattern'; import uiRoutes from 'ui/routes'; @@ -27,13 +28,47 @@ import { SavedObjectsClientProvider } from 'ui/saved_objects'; import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; import { i18n } from '@kbn/i18n'; +import React from 'react'; +import { render, unmountComponentAtNode } from 'react-dom'; +import { IndexPatternList } from './index_pattern_list'; +import './index.less'; + +const INDEX_PATTERN_LIST_DOM_ELEMENT_ID = 'indexPatternListReact'; + +export function updateIndexPatternList( + $scope, + indexPatternCreationOptions, + defaultIndex, + indexPatterns, +) { + const node = document.getElementById(INDEX_PATTERN_LIST_DOM_ELEMENT_ID); + if (!node) { + return; + } + + render( + , + node, + ); +} + +export function destroyIndexPatternList() { + const node = document.getElementById(INDEX_PATTERN_LIST_DOM_ELEMENT_ID); + node && unmountComponentAtNode(node); +} + + const indexPatternsResolutions = { indexPatterns: function (Private) { const savedObjectsClient = Private(SavedObjectsClientProvider); return savedObjectsClient.find({ type: 'index-pattern', - fields: ['title'], + fields: ['title', 'type'], perPage: 10000 }).then(response => response.savedObjects); } @@ -52,27 +87,59 @@ uiRoutes // wrapper directive, which sets some global stuff up like the left nav uiModules.get('apps/management') - .directive('kbnManagementIndices', function ($route, config, kbnUrl) { + .directive('kbnManagementIndices', function ($route, config, kbnUrl, Private) { return { restrict: 'E', transclude: true, template: indexTemplate, - link: function ($scope) { + link: async function ($scope) { + const indexPatternListProvider = Private(IndexPatternListFactory)(); + const indexPatternCreationProvider = Private(IndexPatternCreationFactory)(); + const indexPatternCreationOptions = await indexPatternCreationProvider.getIndexPatternCreationOptions((url) => { + $scope.$evalAsync(() => kbnUrl.change(url)); + }); + $scope.editingId = $route.current.params.indexPatternId; config.bindToScope($scope, 'defaultIndex'); - $scope.$watch('defaultIndex', function () { + const renderList = () => { $scope.indexPatternList = $route.current.locals.indexPatterns.map(pattern => { const id = pattern.id; + const tags = indexPatternListProvider.getIndexPatternTags(pattern, $scope.defaultIndex === id); return { id: id, title: pattern.get('title'), url: kbnUrl.eval('#/management/kibana/indices/{{id}}', { id: id }), - class: 'sidebar-item-title ' + ($scope.editingId === id ? 'active' : ''), - default: $scope.defaultIndex === id + active: $scope.editingId === id, + default: $scope.defaultIndex === id, + tag: tags && tags.length ? tags[0] : null, }; + }).sort((a, b) => { + if(a.default) { + return -1; + } + if(b.default) { + return 1; + } + if(a.title < b.title) { + return -1; + } + if(a.title > b.title) { + return 1; + } + return 0; }); + + updateIndexPatternList($scope, indexPatternCreationOptions, $scope.defaultIndex, $scope.indexPatternList); + }; + + $scope.$watch('defaultIndex', renderList); + + renderList(); + + $scope.$on('$destroy', () => { + destroyIndexPatternList(); }); } }; diff --git a/src/core_plugins/kibana/public/management/sections/indices/index.less b/src/core_plugins/kibana/public/management/sections/indices/index.less new file mode 100644 index 0000000000000..08fd614c55a66 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index.less @@ -0,0 +1,24 @@ +@import (reference) "~ui/styles/variables"; + +#indexPatternListReact { + .indexPatternList__headerWrapper { + padding: 8px; + } + + .euiButtonEmpty { + width: 100%; + padding: 0 8px; + } + + .euiButtonEmpty__content { + justify-content: left; + span { + text-overflow: ellipsis; + overflow: hidden; + } + } +} + +#indexPatternFields { + padding: 0 16px; +} diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/create_button.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/create_button.js new file mode 100644 index 0000000000000..323de75c69749 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/create_button.js @@ -0,0 +1,126 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; + +import { + EuiButton, + EuiPopover, + EuiContextMenuPanel, + EuiContextMenuItem, + EuiDescriptionList, + EuiDescriptionListTitle, + EuiDescriptionListDescription, +} from '@elastic/eui'; + +export class CreateButton extends Component { + constructor(props) { + super(props); + this.state = { + isPopoverOpen: false, + }; + } + + static propTypes = { + options: PropTypes.arrayOf(PropTypes.shape({ + text: PropTypes.string.isRequired, + description: PropTypes.string, + onClick: PropTypes.func.isRequired, + })), + } + + togglePopover = () => { + this.setState({ + isPopoverOpen: !this.state.isPopoverOpen, + }); + } + + closePopover = () => { + this.setState({ + isPopoverOpen: false, + }); + } + + render() { + const { options, children } = this.props; + const { isPopoverOpen } = this.state; + + if(!options || !options.length) { + return null; + } + + if(options.length === 1) { + return ( + + {children} + + ); + } + + const button = ( + + {children} + + ); + + if(options.length > 1) { + return ( + + { + return ( + + + + {option.text} + + + {option.description} + + + + ); + })} + /> + + ); + } + } +} diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/index.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/index.js new file mode 100644 index 0000000000000..caf956479ad99 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/create_button/index.js @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { CreateButton } from './create_button'; diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/header.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/header.js new file mode 100644 index 0000000000000..e52754e8807a8 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/header.js @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import React from 'react'; +import { CreateButton } from '../create_button'; + +export const Header = ({ + indexPatternCreationOptions +}) => ( + + Create index pattern + +); diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/index.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/index.js new file mode 100644 index 0000000000000..ac1e7bac06c87 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/header/index.js @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { Header } from './header'; diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/index.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/index.js new file mode 100644 index 0000000000000..501bca9658d8e --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/index.js @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { List } from './list'; diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js new file mode 100644 index 0000000000000..a50927dd8c3d7 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/components/list/list.js @@ -0,0 +1,56 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import React, { Component, Fragment } from 'react'; +import PropTypes from 'prop-types'; + +import { + EuiButtonEmpty, + EuiBadge, +} from '@elastic/eui'; + +export class List extends Component { + static propTypes = { + indexPatterns: PropTypes.array, + } + + render() { + const { indexPatterns } = this.props; + return ( +
+ { + indexPatterns.map(pattern => { + return ( +
+ + {pattern.default ? : ''} + {pattern.active ? {pattern.title} : pattern.title} {pattern.tag ? ( + + {{pattern.tag.name} } + + ) : null} + +
+ ); + }) + } +
+ ); + } +} diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index.js new file mode 100644 index 0000000000000..6a030202731c1 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index.js @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { IndexPatternList } from './index_pattern_list'; diff --git a/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js new file mode 100644 index 0000000000000..831b357512516 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/index_pattern_list/index_pattern_list.js @@ -0,0 +1,45 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import React, { Component, Fragment } from 'react'; +import PropTypes from 'prop-types'; + +import { Header } from './components/header'; +import { List } from './components/list'; + +export class IndexPatternList extends Component { + static propTypes = { + indexPatternCreationOptions: PropTypes.array.isRequired, + defaultIndex: PropTypes.string, + indexPatterns: PropTypes.array.isRequired, + } + + render() { + const { indexPatterns, indexPatternCreationOptions } = this.props; + + return( + +
+
+
+ + + ); + } +} diff --git a/src/server/index_patterns/service/index_patterns_service.js b/src/server/index_patterns/service/index_patterns_service.js index 68e800e4277f3..62b99b26ed7e4 100644 --- a/src/server/index_patterns/service/index_patterns_service.js +++ b/src/server/index_patterns/service/index_patterns_service.js @@ -32,7 +32,7 @@ export class IndexPatternsService { * Get a list of field objects for an index pattern that may contain wildcards * * @param {Object} [options={}] - * @property {String} options.pattern The moment compatible time pattern + * @property {String} options.pattern The index pattern * @property {Number} options.metaFields The list of underscore prefixed fields that should * be left in the field list (all others are removed). * @return {Promise>} diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js index f73952a3e845b..13a5aee2d9eb2 100644 --- a/src/ui/public/index_patterns/_index_pattern.js +++ b/src/ui/public/index_patterns/_index_pattern.js @@ -79,7 +79,9 @@ export function IndexPatternProvider(Private, config, Promise, confirmModalPromi _deserialize(map = '{}') { return _.mapValues(angular.fromJson(map), deserializeFieldFormatMap); } - } + }, + type: 'keyword', + typeMeta: 'json', }); function serializeFieldFormatMap(flat, format, field) { diff --git a/src/ui/public/index_patterns/fields_fetcher.js b/src/ui/public/index_patterns/fields_fetcher.js index ef19e07f52b2f..4118ca2c02476 100644 --- a/src/ui/public/index_patterns/fields_fetcher.js +++ b/src/ui/public/index_patterns/fields_fetcher.js @@ -25,7 +25,7 @@ export function createFieldsFetcher(apiClient, config) { return this.fetchForTimePattern(indexPattern.title, interval); } - return this.fetchForWildcard(indexPattern.title); + return this.fetchForWildcard(indexPattern.title, indexPattern.type); } fetchForTimePattern(indexPatternId) { @@ -36,10 +36,11 @@ export function createFieldsFetcher(apiClient, config) { }); } - fetchForWildcard(indexPatternId) { + fetchForWildcard(indexPatternId, indexPatternType) { return apiClient.getFieldsForWildcard({ pattern: indexPatternId, metaFields: config.get('metaFields'), + type: indexPatternType, }); } } diff --git a/src/ui/public/index_patterns/index_patterns_api_client.js b/src/ui/public/index_patterns/index_patterns_api_client.js index f2715cc3baae3..fe42df87f3203 100644 --- a/src/ui/public/index_patterns/index_patterns_api_client.js +++ b/src/ui/public/index_patterns/index_patterns_api_client.js @@ -85,6 +85,7 @@ export function createIndexPatternsApiClient($http, basePath) { const { pattern, metaFields, + type, } = options; const url = getUrl(['_fields_for_wildcard'], { @@ -92,7 +93,19 @@ export function createIndexPatternsApiClient($http, basePath) { meta_fields: metaFields, }); - return request('GET', url).then(resp => resp.fields); + return request('GET', url).then(resp => { + if(type) { + const typeUrl = type ? getUrl([type, '_fields_for_wildcard'], { + pattern, + fields: resp.fields, + meta_fields: metaFields, + }) : null; + + return request('GET', typeUrl).then(typeResp => typeResp.fields); + } else { + return resp.fields; + } + }); } } diff --git a/src/ui/public/management/index.js b/src/ui/public/management/index.js index dfbea11df606a..425e9de3297b4 100644 --- a/src/ui/public/management/index.js +++ b/src/ui/public/management/index.js @@ -17,42 +17,12 @@ * under the License. */ -import { ManagementSection } from './section'; - export { PAGE_TITLE_COMPONENT, PAGE_SUBTITLE_COMPONENT, PAGE_FOOTER_COMPONENT, } from '../../../core_plugins/kibana/public/management/sections/settings/components/default_component_registry'; - export { registerSettingsComponent } from '../../../core_plugins/kibana/public/management/sections/settings/components/component_registry'; - export { Field } from '../../../core_plugins/kibana/public/management/sections/settings/components/field/field'; - -export const management = new ManagementSection('management', { - display: 'Management' -}); - -// TODO: where should this live? -management.register('data', { - display: 'Connect Data', - order: 0 -}); - -management.register('elasticsearch', { - display: 'Elasticsearch', - order: 20, - icon: 'logoElasticsearch' -}); - -management.register('kibana', { - display: 'Kibana', - order: 30, - icon: 'logoKibana', -}); - -management.register('logstash', { - display: 'Logstash', - order: 30, - icon: 'logoLogstash', -}); +export { management } from './sections_register'; +export { IndexPatternListRegistry, IndexPatternListFactory } from './index_pattern_list'; diff --git a/src/ui/public/management/index_pattern_creation/index.js b/src/ui/public/management/index_pattern_creation/index.js new file mode 100644 index 0000000000000..6b1dbcc084e2f --- /dev/null +++ b/src/ui/public/management/index_pattern_creation/index.js @@ -0,0 +1,23 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import './register'; +export { IndexPatternCreationFactory } from './index_pattern_creation'; +export { IndexPatternCreationConfig } from './index_pattern_creation_config'; +export { IndexPatternCreationConfigRegistry } from './index_pattern_creation_config_registry'; diff --git a/src/ui/public/management/index_pattern_creation/index_pattern_creation.js b/src/ui/public/management/index_pattern_creation/index_pattern_creation.js new file mode 100644 index 0000000000000..4e44173151080 --- /dev/null +++ b/src/ui/public/management/index_pattern_creation/index_pattern_creation.js @@ -0,0 +1,56 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { IndexPatternCreationConfigRegistry } from './index_pattern_creation_config_registry'; + +class IndexPatternCreation { + constructor(registry, httpClient, type) { + this._registry = registry; + this._allTypes = this._registry.inOrder.map(Plugin => new Plugin({ httpClient })); + this._setCurrentType(type); + } + + _setCurrentType = (type) => { + const index = type ? this._registry.inOrder.findIndex(Plugin => Plugin.key === type) : -1; + this._currentType = index > -1 && this._allTypes[index] ? this._allTypes[index] : null; + } + + getType = () => { + return this._currentType || null; + } + + getIndexPatternCreationOptions = async (urlHandler) => { + const options = []; + await Promise.all(this._allTypes.map(async type => { + const option = type.getIndexPatternCreationOption ? await type.getIndexPatternCreationOption(urlHandler) : null; + if(option) { + options.push(option); + } + })); + return options; + } +} + +export const IndexPatternCreationFactory = (Private, $http) => { + return (type = 'default') => { + const indexPatternCreationRegistry = Private(IndexPatternCreationConfigRegistry); + const indexPatternCreationProvider = new IndexPatternCreation(indexPatternCreationRegistry, $http, type); + return indexPatternCreationProvider; + }; +}; diff --git a/src/ui/public/management/index_pattern_creation/index_pattern_creation_config.js b/src/ui/public/management/index_pattern_creation/index_pattern_creation_config.js new file mode 100644 index 0000000000000..62b53ee16d41c --- /dev/null +++ b/src/ui/public/management/index_pattern_creation/index_pattern_creation_config.js @@ -0,0 +1,94 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { i18n } from '@kbn/i18n'; + +const indexPatternTypeName = i18n.translate('kbn.management.editIndexPattern.createIndex.defaultTypeName', + { defaultMessage: 'index pattern' }); +const indexPatternButtonText = i18n.translate('kbn.management.editIndexPattern.createIndex.defaultButtonText', + { defaultMessage: 'Standard index pattern' }); +const indexPatternButtonDescription = i18n.translate('kbn.management.editIndexPattern.createIndex.defaultButtonDescription', + { defaultMessage: 'Can perform full aggregations against any data' }); + +export class IndexPatternCreationConfig { + static key = 'default'; + + constructor({ + type = '', + name = indexPatternTypeName, + showSystemIndices = true, + allowWildcards = true, + httpClient = null, + }) { + this.type = type; + this.name = name; + this.showSystemIndices = showSystemIndices; + this.allowWildcards = allowWildcards; + this.httpClient = httpClient; + } + + async getIndexPatternCreationOption(urlHandler) { + return { + text: indexPatternButtonText, + description: indexPatternButtonDescription, + onClick: () => { + urlHandler('/management/kibana/index'); + }, + }; + } + + getIndexPatternType = () => { + return this.type; + } + + getIndexPatternName = () => { + return this.name; + } + + getIndexPatternCreationQuery = () => { + return {}; + }; + + getShowSystemIndices = () => { + return this.showSystemIndices; + } + + getAllowWildcards = () => { + return this.allowWildcards; + } + + illegalCharacters = (characters = []) => { + return characters; + } + + getIndexTags() { + return []; + } + + checkIndicesForErrors = () => { + return undefined; + } + + getIndexPatternMappings = () => { + return {}; + } + + renderPrompt = () => { + return null; + } +} diff --git a/src/ui/public/management/index_pattern_creation/index_pattern_creation_config_registry.js b/src/ui/public/management/index_pattern_creation/index_pattern_creation_config_registry.js new file mode 100644 index 0000000000000..9fb65a1bcb002 --- /dev/null +++ b/src/ui/public/management/index_pattern_creation/index_pattern_creation_config_registry.js @@ -0,0 +1,26 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { uiRegistry } from 'ui/registry/_registry'; + +export const IndexPatternCreationConfigRegistry = uiRegistry({ + name: 'indexPatternCreation', + index: ['name'], + order: ['order'], +}); diff --git a/src/ui/public/management/index_pattern_creation/register.js b/src/ui/public/management/index_pattern_creation/register.js new file mode 100644 index 0000000000000..764c275fdf3a0 --- /dev/null +++ b/src/ui/public/management/index_pattern_creation/register.js @@ -0,0 +1,23 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { IndexPatternCreationConfig } from './index_pattern_creation_config'; +import { IndexPatternCreationConfigRegistry } from './index_pattern_creation_config_registry'; + +IndexPatternCreationConfigRegistry.register(() => IndexPatternCreationConfig); diff --git a/src/ui/public/management/index_pattern_list.js b/src/ui/public/management/index_pattern_list.js new file mode 100644 index 0000000000000..e45f650492ebf --- /dev/null +++ b/src/ui/public/management/index_pattern_list.js @@ -0,0 +1,52 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { uiRegistry } from 'ui/registry/_registry'; + +export const IndexPatternListRegistry = uiRegistry({ + name: 'indexPatternList', + index: ['name'], + order: ['order'], +}); + +class IndexPatternList { + constructor(registry) { + this._plugins = registry.inOrder.map(Plugin => new Plugin); + } + + getIndexPatternTags = (indexPattern) => { + return this._plugins.reduce((tags, plugin) => { + return plugin.getIndexPatternTags ? tags.concat(plugin.getIndexPatternTags(indexPattern)) : tags; + }, []); + } + + getFieldInfo = (indexPattern, field) => { + return this._plugins.reduce((info, plugin) => { + return plugin.getFieldInfo ? info.concat(plugin.getFieldInfo(indexPattern, field)) : info; + }, []); + } +} + +export const IndexPatternListFactory = (Private) => { + return function () { + const indexPatternListRegistry = Private(IndexPatternListRegistry); + const indexPatternListProvider = new IndexPatternList(indexPatternListRegistry); + return indexPatternListProvider; + }; +}; diff --git a/src/ui/public/management/sections_register.js b/src/ui/public/management/sections_register.js new file mode 100644 index 0000000000000..fb86655b1e771 --- /dev/null +++ b/src/ui/public/management/sections_register.js @@ -0,0 +1,44 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { ManagementSection } from './section'; + +export const management = new ManagementSection('management', { + display: 'Management' +}); + +management.register('data', { + display: 'Connect Data', + order: 0 +}); + +management.register('elasticsearch', { + display: 'Elasticsearch', + order: 20 +}); + +management.register('kibana', { + display: 'Kibana', + order: 30, +}); + +management.register('logstash', { + display: 'Logstash', + order: 30, +}); diff --git a/src/ui/ui_exports/ui_export_types/index.js b/src/ui/ui_exports/ui_export_types/index.js index 9eb295bee7546..fa7847fccbf2a 100644 --- a/src/ui/ui_exports/ui_export_types/index.js +++ b/src/ui/ui_exports/ui_export_types/index.js @@ -48,6 +48,7 @@ export { navbarExtensions, contextMenuActions, managementSections, + indexManagement, devTools, docViews, hacks, diff --git a/src/ui/ui_exports/ui_export_types/ui_app_extensions.js b/src/ui/ui_exports/ui_export_types/ui_app_extensions.js index d2d91efb4be83..02232f5532f93 100644 --- a/src/ui/ui_exports/ui_export_types/ui_app_extensions.js +++ b/src/ui/ui_exports/ui_export_types/ui_app_extensions.js @@ -46,6 +46,7 @@ export const fieldFormatEditors = appExtension; export const chromeNavControls = appExtension; export const navbarExtensions = appExtension; export const managementSections = appExtension; +export const indexManagement = appExtension; export const devTools = appExtension; export const docViews = appExtension; export const hacks = appExtension; diff --git a/x-pack/index.js b/x-pack/index.js index f047000d8c606..44f525ed1d700 100644 --- a/x-pack/index.js +++ b/x-pack/index.js @@ -26,6 +26,7 @@ import { notifications } from './plugins/notifications'; import { kueryAutocomplete } from './plugins/kuery_autocomplete'; import { canvas } from './plugins/canvas'; import { infra } from './plugins/infra'; +import { rollup } from './plugins/rollup'; module.exports = function (kibana) { return [ @@ -51,5 +52,6 @@ module.exports = function (kibana) { notifications(kibana), kueryAutocomplete(kibana), infra(kibana), + rollup(kibana), ]; }; diff --git a/x-pack/plugins/rollup/common/constants/index.js b/x-pack/plugins/rollup/common/constants/index.js new file mode 100644 index 0000000000000..035454fd7b435 --- /dev/null +++ b/x-pack/plugins/rollup/common/constants/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { PLUGIN } from './plugin'; diff --git a/x-pack/plugins/rollup/common/constants/plugin.js b/x-pack/plugins/rollup/common/constants/plugin.js new file mode 100644 index 0000000000000..783627a8f6444 --- /dev/null +++ b/x-pack/plugins/rollup/common/constants/plugin.js @@ -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; + * you may not use this file except in compliance with the Elastic License. + */ + +export const PLUGIN = { + ID: 'rollup' +}; diff --git a/x-pack/plugins/rollup/index.js b/x-pack/plugins/rollup/index.js new file mode 100644 index 0000000000000..96b9a24d25034 --- /dev/null +++ b/x-pack/plugins/rollup/index.js @@ -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; + * you may not use this file except in compliance with the Elastic License. + */ + +import { resolve } from 'path'; +import { PLUGIN } from './common/constants'; +import { registerLicenseChecker } from './server/lib/register_license_checker'; +import { registerIndicesRoute, registerFieldsForWildcardRoute } from './server/routes/api'; + +export function rollup(kibana) { + return new kibana.Plugin({ + id: PLUGIN.ID, + publicDir: resolve(__dirname, 'public'), + require: ['kibana', 'elasticsearch', 'xpack_main'], + uiExports: { + indexManagement: [ + 'plugins/rollup/index_pattern_creation', + 'plugins/rollup/index_pattern_list', + ], + }, + init: function (server) { + registerLicenseChecker(server); + registerIndicesRoute(server); + registerFieldsForWildcardRoute(server); + } + }); +} diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js b/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js new file mode 100644 index 0000000000000..9edb97b1e6749 --- /dev/null +++ b/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { RollupPrompt } from './rollup_prompt'; diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js b/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js new file mode 100644 index 0000000000000..9964e9c5d9482 --- /dev/null +++ b/x-pack/plugins/rollup/public/index_pattern_creation/components/rollup_prompt/rollup_prompt.js @@ -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; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +import { + EuiCallOut +} from '@elastic/eui'; + +export const RollupPrompt = () => ( + +); diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/index.js b/x-pack/plugins/rollup/public/index_pattern_creation/index.js new file mode 100644 index 0000000000000..ec6615a75c2a0 --- /dev/null +++ b/x-pack/plugins/rollup/public/index_pattern_creation/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import './register'; diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/register.js b/x-pack/plugins/rollup/public/index_pattern_creation/register.js new file mode 100644 index 0000000000000..db9cb1691c6fa --- /dev/null +++ b/x-pack/plugins/rollup/public/index_pattern_creation/register.js @@ -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; + * you may not use this file except in compliance with the Elastic License. + */ + +import { IndexPatternCreationConfigRegistry } from 'ui/management/index_pattern_creation'; +import { RollupIndexPatternCreationConfig } from './rollup_index_pattern_creation_config'; + +IndexPatternCreationConfigRegistry.register(() => RollupIndexPatternCreationConfig); diff --git a/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js b/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js new file mode 100644 index 0000000000000..7bd3fed9cdb23 --- /dev/null +++ b/x-pack/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js @@ -0,0 +1,122 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import isEqual from 'lodash/lang/isEqual'; +import { IndexPatternCreationConfig } from 'ui/management/index_pattern_creation'; + +import { RollupPrompt } from './components/rollup_prompt'; +import { setHttpClient, getRollupIndices } from '../services/api'; + +export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig { + static key = 'rollup'; + + constructor(options) { + super({ + type: 'rollup', + name: 'rollup index pattern', + showSystemIndices: false, + allowWildcards: false, + ...options, + }); + + setHttpClient(this.httpClient); + this.rollupIndex = null; + this.rollupJobs = []; + this.rollupIndicesCapabilities = {}; + this.rollupIndices = []; + this.settingUp = this.setRollupIndices(); + } + + async setRollupIndices() { + this.rollupIndicesCapabilities = await getRollupIndices(); + this.rollupIndices = Object.keys(this.rollupIndicesCapabilities); + } + + async getIndexPatternCreationOption(urlHandler) { + await this.settingUp; + return this.rollupIndices && this.rollupIndices.length ? { + text: `Rollup index pattern`, + description: `Can perform limited aggregations against summarized data`, + onClick: () => { + urlHandler('/management/kibana/index?type=rollup'); + }, + } : null; + } + + getIndexPatternCreationQuery = () => { + return { + query: { + exists: { + field: "_rollup.version" + } + }, + }; + }; + + illegalCharacters = (characters = []) => { + return ['*'].concat(characters); + } + + getIndexTags() { + return [{ + key: 'rollup', + name: 'Rollup', + }]; + } + + checkIndicesForErrors = (indices) => { + this.rollupIndex = null; + this.rollupJobs = []; + + if(!indices || !indices.length) { + return; + } + + if(indices.length > 1) { + return ['Index pattern can only match one rollup index']; + } + + let i = 0; + let sameCapabilities = true; + const capabilities = this.rollupIndicesCapabilities[indices[0].name].capabilities; + const jobs = Object.keys(capabilities); + + if(!jobs.length) { + return ['This rollup index has no capabilities']; + } + + if(jobs.length > 1) { + while(i < jobs.length - 1 && sameCapabilities) { + sameCapabilities = isEqual(capabilities[jobs[i]].fields, capabilities[jobs[i + 1]].fields); + i++; + } + + if(!sameCapabilities) { + return ['There is more than one configuration for this rollup index']; + } + } + + this.rollupIndex = indices[0].name; + this.rollupJobs = [...jobs]; + } + + getIndexPatternMappings = () => { + return this.rollupIndex ? { + type: 'rollup', + typeMeta: { + jobs: this.rollupJobs, + capabilities: this.rollupIndicesCapabilities[this.rollupIndex].capabilities, + }, + } : {}; + } + + renderPrompt = () => { + return ( + + ); + } +} diff --git a/x-pack/plugins/rollup/public/index_pattern_list/index.js b/x-pack/plugins/rollup/public/index_pattern_list/index.js new file mode 100644 index 0000000000000..4d2947eb36f46 --- /dev/null +++ b/x-pack/plugins/rollup/public/index_pattern_list/index.js @@ -0,0 +1,7 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import './register'; diff --git a/x-pack/plugins/rollup/public/index_pattern_list/register.js b/x-pack/plugins/rollup/public/index_pattern_list/register.js new file mode 100644 index 0000000000000..a6fcb97084a50 --- /dev/null +++ b/x-pack/plugins/rollup/public/index_pattern_list/register.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ +import { IndexPatternListRegistry } from 'ui/management'; + +IndexPatternListRegistry.register(() => { + return class RollupIndexPatternList { + static key = 'rollup'; + + getIndexPatternTags = (indexPattern) => { + const tags = []; + if(indexPattern.type === 'rollup' || (indexPattern.get && indexPattern.get('type') === 'rollup')) { + tags.push({ + key: 'rollup', + name: 'Rollup', + }); + + if(indexPattern.typeMeta && indexPattern.typeMeta.jobs) { + tags.push({ + key: 'rollup_jobs', + name: `Rollup jobs: ${indexPattern.typeMeta.jobs.join(', ')}`, + }); + } + } + return tags; + } + + getFieldInfo = (indexPattern, field) => { + const jobs = indexPattern.typeMeta && indexPattern.typeMeta.jobs; + const capabilities = jobs && indexPattern.typeMeta.capabilities && indexPattern.typeMeta.capabilities[jobs[0]].fields[field]; + + if(!capabilities) { + return []; + } + + return ['Rollup capabilities:'].concat(capabilities.map(cap => { + if(cap.agg === 'date_histogram') { + return `${cap.agg} (interval: ${cap.interval}, ${cap.delay ? `delay: ${cap.delay},` : ''} ${cap.time_zone})`; + } else if(cap.agg === 'histogram') { + return `${cap.agg} (interval: ${cap.interval})`; + } else { + return cap.agg; + } + })); + } + }; +}); diff --git a/x-pack/plugins/rollup/public/services/api.js b/x-pack/plugins/rollup/public/services/api.js new file mode 100644 index 0000000000000..f72d4fd26de3f --- /dev/null +++ b/x-pack/plugins/rollup/public/services/api.js @@ -0,0 +1,17 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import chrome from 'ui/chrome'; +let httpClient; +export const setHttpClient = (client) => { + httpClient = client; +}; +const apiPrefix = chrome.addBasePath('/api/rollup'); + +export async function getRollupIndices() { + const response = await httpClient.get(`${apiPrefix}/indices`); + return response.data || {}; +} diff --git a/x-pack/plugins/rollup/server/client/elasticsearch_rollup.js b/x-pack/plugins/rollup/server/client/elasticsearch_rollup.js new file mode 100644 index 0000000000000..22148a0b112b1 --- /dev/null +++ b/x-pack/plugins/rollup/server/client/elasticsearch_rollup.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +export const elasticsearchJsPlugin = (Client, config, components) => { + const ca = components.clientAction.factory; + + Client.prototype.rollup = components.clientAction.namespaceFactory(); + const rollup = Client.prototype.rollup.prototype; + + rollup.capabilities = ca({ + urls: [ + { + fmt: '/_xpack/rollup/data/<%=indices%>', + req: { + indices: { + type: 'string' + } + } + }, + { + fmt: '/_xpack/rollup/data/', + } + ], + method: 'GET' + }); +}; + diff --git a/x-pack/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js b/x-pack/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js new file mode 100644 index 0000000000000..0152623b75e44 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +import { once } from 'lodash'; +import { elasticsearchJsPlugin } from '../../client/elasticsearch_rollup'; + +const callWithRequest = once((server) => { + const config = { + plugins: [ elasticsearchJsPlugin ], + ...server.config().get('elasticsearch') + }; + const cluster = server.plugins.elasticsearch.createCluster('rollup', config); + + return cluster.callWithRequest; +}); + +export const callWithRequestFactory = (server, request) => { + return (...args) => { + return callWithRequest(server)(request, ...args); + }; +}; diff --git a/x-pack/plugins/rollup/server/lib/call_with_request_factory/index.js b/x-pack/plugins/rollup/server/lib/call_with_request_factory/index.js new file mode 100644 index 0000000000000..4cc2b91d5f182 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/call_with_request_factory/index.js @@ -0,0 +1,7 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +export { callWithRequestFactory } from './call_with_request_factory'; diff --git a/x-pack/plugins/rollup/server/lib/check_license/__tests__/check_license.js b/x-pack/plugins/rollup/server/lib/check_license/__tests__/check_license.js new file mode 100644 index 0000000000000..66e1f27fc40ce --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/check_license/__tests__/check_license.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +import expect from 'expect.js'; +import { set } from 'lodash'; +import { checkLicense } from '../check_license'; + +describe('check_license', function () { + + let mockLicenseInfo; + beforeEach(() => mockLicenseInfo = {}); + + describe('license information is undefined', () => { + beforeEach(() => mockLicenseInfo = undefined); + + it('should set isAvailable to false', () => { + expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false); + }); + + it('should set showLinks to true', () => { + expect(checkLicense(mockLicenseInfo).showLinks).to.be(true); + }); + + it('should set enableLinks to false', () => { + expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false); + }); + + it('should set a message', () => { + expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined); + }); + }); + + describe('license information is not available', () => { + beforeEach(() => mockLicenseInfo.isAvailable = () => false); + + it('should set isAvailable to false', () => { + expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false); + }); + + it('should set showLinks to true', () => { + expect(checkLicense(mockLicenseInfo).showLinks).to.be(true); + }); + + it('should set enableLinks to false', () => { + expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false); + }); + + it('should set a message', () => { + expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined); + }); + }); + + describe('license information is available', () => { + beforeEach(() => { + mockLicenseInfo.isAvailable = () => true; + set(mockLicenseInfo, 'license.getType', () => 'basic'); + }); + + describe('& license is trial, standard, gold, platinum', () => { + beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true)); + + describe('& license is active', () => { + beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true)); + + it('should set isAvailable to true', () => { + expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true); + }); + + it ('should set showLinks to true', () => { + expect(checkLicense(mockLicenseInfo).showLinks).to.be(true); + }); + + it ('should set enableLinks to true', () => { + expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true); + }); + + it('should not set a message', () => { + expect(checkLicense(mockLicenseInfo).message).to.be(undefined); + }); + }); + + describe('& license is expired', () => { + beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false)); + + it('should set isAvailable to false', () => { + expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false); + }); + + it ('should set showLinks to true', () => { + expect(checkLicense(mockLicenseInfo).showLinks).to.be(true); + }); + + it ('should set enableLinks to false', () => { + expect(checkLicense(mockLicenseInfo).enableLinks).to.be(false); + }); + + it('should set a message', () => { + expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined); + }); + }); + }); + + describe('& license is basic', () => { + beforeEach(() => set(mockLicenseInfo, 'license.isOneOf', () => true)); + + describe('& license is active', () => { + beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => true)); + + it('should set isAvailable to true', () => { + expect(checkLicense(mockLicenseInfo).isAvailable).to.be(true); + }); + + it ('should set showLinks to true', () => { + expect(checkLicense(mockLicenseInfo).showLinks).to.be(true); + }); + + it ('should set enableLinks to true', () => { + expect(checkLicense(mockLicenseInfo).enableLinks).to.be(true); + }); + + it('should not set a message', () => { + expect(checkLicense(mockLicenseInfo).message).to.be(undefined); + }); + }); + + describe('& license is expired', () => { + beforeEach(() => set(mockLicenseInfo, 'license.isActive', () => false)); + + it('should set isAvailable to false', () => { + expect(checkLicense(mockLicenseInfo).isAvailable).to.be(false); + }); + + it ('should set showLinks to true', () => { + expect(checkLicense(mockLicenseInfo).showLinks).to.be(true); + }); + + it('should set a message', () => { + expect(checkLicense(mockLicenseInfo).message).to.not.be(undefined); + }); + }); + }); + }); +}); diff --git a/x-pack/plugins/rollup/server/lib/check_license/check_license.js b/x-pack/plugins/rollup/server/lib/check_license/check_license.js new file mode 100644 index 0000000000000..ef2bed3449195 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/check_license/check_license.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +export function checkLicense(xpackLicenseInfo) { + const pluginName = 'Rollups'; + + // If, for some reason, we cannot get the license information + // from Elasticsearch, assume worst case and disable + if (!xpackLicenseInfo || !xpackLicenseInfo.isAvailable()) { + return { + isAvailable: false, + showLinks: true, + enableLinks: false, + message: `You cannot use ${pluginName} because license information is not available at this time.` + }; + } + + const VALID_LICENSE_MODES = [ + 'trial', + 'basic', + 'standard', + 'gold', + 'platinum' + ]; + + const isLicenseModeValid = xpackLicenseInfo.license.isOneOf(VALID_LICENSE_MODES); + const isLicenseActive = xpackLicenseInfo.license.isActive(); + const licenseType = xpackLicenseInfo.license.getType(); + + // License is not valid + if (!isLicenseModeValid) { + return { + isAvailable: false, + showLinks: false, + message: `Your ${licenseType} license does not support ${pluginName}. Please upgrade your license.` + }; + } + + // License is valid but not active + if (!isLicenseActive) { + return { + isAvailable: false, + showLinks: true, + enableLinks: false, + message: `You cannot use ${pluginName} because your ${licenseType} license has expired.` + }; + } + + // License is valid and active + return { + isAvailable: true, + showLinks: true, + enableLinks: true + }; +} diff --git a/x-pack/plugins/rollup/server/lib/check_license/index.js b/x-pack/plugins/rollup/server/lib/check_license/index.js new file mode 100644 index 0000000000000..64935b475f3fb --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/check_license/index.js @@ -0,0 +1,7 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +export { checkLicense } from './check_license'; diff --git a/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_custom_error.js b/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_custom_error.js new file mode 100644 index 0000000000000..c55971ecda61e --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_custom_error.js @@ -0,0 +1,21 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import expect from 'expect.js'; +import { wrapCustomError } from '../wrap_custom_error'; + +describe('wrap_custom_error', () => { + describe('#wrapCustomError', () => { + it('should return a Boom object', () => { + const originalError = new Error('I am an error'); + const statusCode = 404; + const wrappedError = wrapCustomError(originalError, statusCode); + + expect(wrappedError.isBoom).to.be(true); + expect(wrappedError.output.statusCode).to.equal(statusCode); + }); + }); +}); diff --git a/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_es_error.js b/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_es_error.js new file mode 100644 index 0000000000000..32e3690187da2 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_es_error.js @@ -0,0 +1,39 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import expect from 'expect.js'; +import { wrapEsError } from '../wrap_es_error'; + +describe('wrap_es_error', () => { + describe('#wrapEsError', () => { + + let originalError; + beforeEach(() => { + originalError = new Error('I am an error'); + originalError.statusCode = 404; + }); + + it('should return a Boom object', () => { + const wrappedError = wrapEsError(originalError); + + expect(wrappedError.isBoom).to.be(true); + }); + + it('should return the correct Boom object', () => { + const wrappedError = wrapEsError(originalError); + + expect(wrappedError.output.statusCode).to.be(originalError.statusCode); + expect(wrappedError.output.payload.message).to.be(originalError.message); + }); + + it('should return the correct Boom object with custom message', () => { + const wrappedError = wrapEsError(originalError, { 404: 'No encontrado!' }); + + expect(wrappedError.output.statusCode).to.be(originalError.statusCode); + expect(wrappedError.output.payload.message).to.be('No encontrado!'); + }); + }); +}); diff --git a/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_unknown_error.js b/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_unknown_error.js new file mode 100644 index 0000000000000..d9091864bab16 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/error_wrappers/__tests__/wrap_unknown_error.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +import expect from 'expect.js'; +import { wrapUnknownError } from '../wrap_unknown_error'; + +describe('wrap_unknown_error', () => { + describe('#wrapUnknownError', () => { + it('should return a Boom object', () => { + const originalError = new Error('I am an error'); + const wrappedError = wrapUnknownError(originalError); + + expect(wrappedError.isBoom).to.be(true); + }); + }); +}); diff --git a/x-pack/plugins/rollup/server/lib/error_wrappers/index.js b/x-pack/plugins/rollup/server/lib/error_wrappers/index.js new file mode 100644 index 0000000000000..913302598826b --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/error_wrappers/index.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +export { wrapCustomError } from './wrap_custom_error'; +export { wrapEsError } from './wrap_es_error'; +export { wrapUnknownError } from './wrap_unknown_error'; diff --git a/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_custom_error.js b/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_custom_error.js new file mode 100644 index 0000000000000..5a0fac8873a9a --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_custom_error.js @@ -0,0 +1,18 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import Boom from 'boom'; + +/** + * Wraps a custom error into a Boom error response and returns it + * + * @param err Object error + * @param statusCode Error status code + * @return Object Boom error response + */ +export function wrapCustomError(err, statusCode) { + return Boom.wrap(err, statusCode); +} diff --git a/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_es_error.js b/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_es_error.js new file mode 100644 index 0000000000000..1a03708ce5fd9 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_es_error.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +import Boom from 'boom'; + +/** + * Wraps an error thrown by the ES JS client into a Boom error response and returns it + * + * @param err Object Error thrown by ES JS client + * @param statusCodeToMessageMap Object Optional map of HTTP status codes => error messages + * @return Object Boom error response + */ +export function wrapEsError(err, statusCodeToMessageMap = {}) { + + const statusCode = err.statusCode; + + // If no custom message if specified for the error's status code, just + // wrap the error as a Boom error response and return it + if (!statusCodeToMessageMap[statusCode]) { + return Boom.wrap(err, err.statusCode); + } + + // Otherwise, use the custom message to create a Boom error response and + // return it + const message = statusCodeToMessageMap[statusCode]; + return Boom.create(statusCode, message); +} diff --git a/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_unknown_error.js b/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_unknown_error.js new file mode 100644 index 0000000000000..7e6a7dd1e075c --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/error_wrappers/wrap_unknown_error.js @@ -0,0 +1,17 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import Boom from 'boom'; + +/** + * Wraps an unknown error into a Boom error response and returns it + * + * @param err Object Unknown error + * @return Object Boom error response + */ +export function wrapUnknownError(err) { + return Boom.wrap(err); +} diff --git a/x-pack/plugins/rollup/server/lib/is_es_error_factory/__tests__/is_es_error_factory.js b/x-pack/plugins/rollup/server/lib/is_es_error_factory/__tests__/is_es_error_factory.js new file mode 100644 index 0000000000000..0be95026ef2eb --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/is_es_error_factory/__tests__/is_es_error_factory.js @@ -0,0 +1,48 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import expect from 'expect.js'; +import { isEsErrorFactory } from '../is_es_error_factory'; +import { set } from 'lodash'; + +class MockAbstractEsError {} + +describe('is_es_error_factory', () => { + + let mockServer; + let isEsError; + + beforeEach(() => { + const mockEsErrors = { + _Abstract: MockAbstractEsError + }; + mockServer = {}; + set(mockServer, 'plugins.elasticsearch.getCluster', () => ({ errors: mockEsErrors })); + + isEsError = isEsErrorFactory(mockServer); + }); + + describe('#isEsErrorFactory', () => { + + it('should return a function', () => { + expect(isEsError).to.be.a(Function); + }); + + describe('returned function', () => { + + it('should return true if passed-in err is a known esError', () => { + const knownEsError = new MockAbstractEsError(); + expect(isEsError(knownEsError)).to.be(true); + }); + + it('should return false if passed-in err is not a known esError', () => { + const unknownEsError = {}; + expect(isEsError(unknownEsError)).to.be(false); + + }); + }); + }); +}); diff --git a/x-pack/plugins/rollup/server/lib/is_es_error_factory/index.js b/x-pack/plugins/rollup/server/lib/is_es_error_factory/index.js new file mode 100644 index 0000000000000..4af76cab3c370 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/is_es_error_factory/index.js @@ -0,0 +1,7 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +export { isEsErrorFactory } from './is_es_error_factory'; diff --git a/x-pack/plugins/rollup/server/lib/is_es_error_factory/is_es_error_factory.js b/x-pack/plugins/rollup/server/lib/is_es_error_factory/is_es_error_factory.js new file mode 100644 index 0000000000000..911c98e9ab19d --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/is_es_error_factory/is_es_error_factory.js @@ -0,0 +1,18 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import { memoize } from 'lodash'; + +const esErrorsFactory = memoize((server) => { + return server.plugins.elasticsearch.getCluster('admin').errors; +}); + +export function isEsErrorFactory(server) { + const esErrors = esErrorsFactory(server); + return function isEsError(err) { + return err instanceof esErrors._Abstract; + }; +} diff --git a/x-pack/plugins/rollup/server/lib/map_capabilities.js b/x-pack/plugins/rollup/server/lib/map_capabilities.js new file mode 100644 index 0000000000000..84b7134c00a26 --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/map_capabilities.js @@ -0,0 +1,51 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +const mapCapabilities = (capabilities, optionalIndexName) => { + if (!capabilities) { + return {}; + } + + const indexNameToCapabilitiesMap = {}; + + Object.keys(capabilities).forEach(pattern => { + capabilities[pattern].rollup_jobs.forEach(job => { + const { + job_id: jobId, + rollup_index: rollupIndexName, + fields, + } = job; + + // If we're looking for a particular index, ignore ones which don't match. + if(optionalIndexName && rollupIndexName !== optionalIndexName) { + return; + } + + if(!indexNameToCapabilitiesMap[rollupIndexName]) { + indexNameToCapabilitiesMap[rollupIndexName] = { + rollup_index: rollupIndexName, + capabilities: {}, + }; + } + + // Collect capabilities for each job within the index. + indexNameToCapabilitiesMap[rollupIndexName].capabilities[jobId] = { + fields, + }; + }); + }); + + return indexNameToCapabilitiesMap; +}; + +export const getIndexNameToCapabilitiesMap = (capabilities) => { + return mapCapabilities(capabilities); +}; + + +export const getCapabilitiesForIndexName = (capabilities, indexName) => { + return mapCapabilities(capabilities, indexName)[indexName].capabilities; +}; diff --git a/x-pack/plugins/rollup/server/lib/register_license_checker/index.js b/x-pack/plugins/rollup/server/lib/register_license_checker/index.js new file mode 100644 index 0000000000000..fe66b317396da --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/register_license_checker/index.js @@ -0,0 +1,7 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +export { registerLicenseChecker } from './register_license_checker'; diff --git a/x-pack/plugins/rollup/server/lib/register_license_checker/register_license_checker.js b/x-pack/plugins/rollup/server/lib/register_license_checker/register_license_checker.js new file mode 100644 index 0000000000000..fbc5bdd9deeda --- /dev/null +++ b/x-pack/plugins/rollup/server/lib/register_license_checker/register_license_checker.js @@ -0,0 +1,21 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import { mirrorPluginStatus } from '../../../../../server/lib/mirror_plugin_status'; +import { checkLicense } from '../check_license'; +import { PLUGIN } from '../../../common/constants'; + +export function registerLicenseChecker(server) { + const xpackMainPlugin = server.plugins.xpack_main; + const rollupPlugin = server.plugins[PLUGIN.ID]; + + mirrorPluginStatus(xpackMainPlugin, rollupPlugin); + xpackMainPlugin.status.once('green', () => { + // Register a function that is called whenever the xpack info changes, + // to re-compute the license check results for this plugin + xpackMainPlugin.info.feature(PLUGIN.ID).registerLicenseCheckResultsGenerator(checkLicense); + }); +} diff --git a/x-pack/plugins/rollup/server/routes/api/index.js b/x-pack/plugins/rollup/server/routes/api/index.js new file mode 100644 index 0000000000000..5e9e9644d422e --- /dev/null +++ b/x-pack/plugins/rollup/server/routes/api/index.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +export { registerIndicesRoute } from './indices'; +export { registerFieldsForWildcardRoute } from './index_patterns'; diff --git a/x-pack/plugins/rollup/server/routes/api/index_patterns.js b/x-pack/plugins/rollup/server/routes/api/index_patterns.js new file mode 100644 index 0000000000000..3e8454db1d7f8 --- /dev/null +++ b/x-pack/plugins/rollup/server/routes/api/index_patterns.js @@ -0,0 +1,89 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ +import { callWithRequestFactory } from '../../lib/call_with_request_factory'; +import { isEsErrorFactory } from '../../lib/is_es_error_factory'; +import { wrapEsError, wrapUnknownError } from '../../lib/error_wrappers'; +import { getCapabilitiesForIndexName } from '../../lib/map_capabilities'; + +import indexBy from 'lodash/collection/indexBy'; + +export function registerFieldsForWildcardRoute(server) { + const isEsError = isEsErrorFactory(server); + + server.route({ + path: '/api/index_patterns/rollup/_fields_for_wildcard', + method: 'GET', + config: { + handler: async (request, reply) => { + const { + pattern: indexName, + fields, + meta_fields: metaFields, + } = request.query; + + const fieldsFromIndex = indexBy(JSON.parse(fields), 'name'); + const callWithRequest = callWithRequestFactory(server, request); + + try { + const allCapabilities = await callWithRequest('rollup.capabilities', { + indices: '_all' + }); + + const rollupFields = []; + const indexCapabilities = getCapabilitiesForIndexName(allCapabilities, indexName); + const jobs = indexCapabilities && Object.keys(indexCapabilities); + const fieldsFromFieldCapsByName = jobs && indexCapabilities[jobs[0]].fields; + + // Keep meta fields + JSON.parse(metaFields).forEach(field => fieldsFromIndex[field] && rollupFields.push(fieldsFromIndex[field])); + + // Map rollup capabilities + Object.keys(fieldsFromFieldCapsByName).forEach(capField => { + const capabilities = fieldsFromFieldCapsByName[capField].reduce((aggs, cap) => aggs.push(cap.agg) && aggs, []); + const defaultField = { + name: capField, + searchable: true, + aggregatable: true, + readFromDocValues: true, + }; + + if(capabilities.includes('date_histogram')) { + rollupFields.push({ + ...fieldsFromIndex[`${capField}.date_histogram.timestamp`], + ...defaultField, + }); + } else if(capabilities.includes('histogram')) { + rollupFields.push({ + ...fieldsFromIndex[`${capField}.histogram.value`], + ...defaultField, + }); + } else if(capabilities.includes('terms')) { + rollupFields.push({ + ...fieldsFromIndex[`${capField}.terms.value`], + ...defaultField, + }); + } else { + rollupFields.push({ + ...defaultField, + type: 'number', + searchable: false, + }); + } + }); + + return reply({ + fields: rollupFields, + }); + } catch(err) { + if (isEsError(err)) { + return reply(wrapEsError(err)); + } + reply(wrapUnknownError(err)); + } + } + } + }); +} diff --git a/x-pack/plugins/rollup/server/routes/api/indices.js b/x-pack/plugins/rollup/server/routes/api/indices.js new file mode 100644 index 0000000000000..6029255c9ae0a --- /dev/null +++ b/x-pack/plugins/rollup/server/routes/api/indices.js @@ -0,0 +1,35 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ +import { callWithRequestFactory } from '../../lib/call_with_request_factory'; +import { isEsErrorFactory } from '../../lib/is_es_error_factory'; +import { wrapEsError, wrapUnknownError } from '../../lib/error_wrappers'; +import { getIndexNameToCapabilitiesMap } from '../../lib/map_capabilities'; + +export function registerIndicesRoute(server) { + const isEsError = isEsErrorFactory(server); + + server.route({ + path: '/api/rollup/indices', + method: 'GET', + handler: async (request, reply) => { + const callWithRequest = callWithRequestFactory(server, request); + try { + const capabilities = await callWithRequest('rollup.capabilities', { + indices: '_all' + }); + reply(getIndexNameToCapabilitiesMap(capabilities)); + } catch(err) { + if (isEsError(err)) { + return reply(wrapEsError(err)); + } + reply(wrapUnknownError(err)); + } + }, + // config: { + // pre: [ licensePreRouting ] + // } + }); +} From 89ba0898230181ff4dac9dfa2613a8d3d1b1427d Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Thu, 21 Jun 2018 14:24:44 -0700 Subject: [PATCH 02/47] Initial pass at limiting agg types based on rollup caps --- x-pack/plugins/rollup/index.js | 3 ++ .../public/vis_type_agg_filter/index.js | 7 ++++ .../public/vis_type_agg_filter/register.js | 32 +++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 x-pack/plugins/rollup/public/vis_type_agg_filter/index.js create mode 100644 x-pack/plugins/rollup/public/vis_type_agg_filter/register.js diff --git a/x-pack/plugins/rollup/index.js b/x-pack/plugins/rollup/index.js index 96b9a24d25034..2bba337b55d4c 100644 --- a/x-pack/plugins/rollup/index.js +++ b/x-pack/plugins/rollup/index.js @@ -19,6 +19,9 @@ export function rollup(kibana) { 'plugins/rollup/index_pattern_creation', 'plugins/rollup/index_pattern_list', ], + visualize: [ + 'plugins/rollup/vis_type_agg_filter', + ], }, init: function (server) { registerLicenseChecker(server); diff --git a/x-pack/plugins/rollup/public/vis_type_agg_filter/index.js b/x-pack/plugins/rollup/public/vis_type_agg_filter/index.js new file mode 100644 index 0000000000000..4d2947eb36f46 --- /dev/null +++ b/x-pack/plugins/rollup/public/vis_type_agg_filter/index.js @@ -0,0 +1,7 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import './register'; diff --git a/x-pack/plugins/rollup/public/vis_type_agg_filter/register.js b/x-pack/plugins/rollup/public/vis_type_agg_filter/register.js new file mode 100644 index 0000000000000..157af07c49003 --- /dev/null +++ b/x-pack/plugins/rollup/public/vis_type_agg_filter/register.js @@ -0,0 +1,32 @@ +/* +* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one +* or more contributor license agreements. Licensed under the Elastic License; +* you may not use this file except in compliance with the Elastic License. +*/ + +import { aggTypeFilters } from 'ui/agg_types/filter'; +import { uniq } from 'lodash'; + +/** + * If rollup index pattern, check its capabilities + * and limit available aggregations based on that. + */ +aggTypeFilters.addFilter( + (aggType, indexPattern) => { + if(indexPattern.type !== 'rollup') { + return true; + } + + const jobs = indexPattern.typeMeta.jobs; + let allAggs = []; + + jobs.forEach(job => { + const fields = indexPattern.typeMeta.capabilities[job].fields; + Object.keys(fields).forEach(field => { + allAggs = [...allAggs, ...fields[field].map(agg => agg.agg)]; + }); + }); + + return uniq(allAggs).includes(aggType.name); + } +); From 212d7df8d1afc2717d01da83b2c03f84510784ce Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Tue, 3 Jul 2018 08:27:40 -0700 Subject: [PATCH 03/47] Check if default agg type is part of filtered list and if not, change to first agg type in list --- src/ui/public/vis/editors/default/agg.html | 2 +- src/ui/public/vis/editors/default/agg_params.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ui/public/vis/editors/default/agg.html b/src/ui/public/vis/editors/default/agg.html index baba3554a9c3b..4cf8174c7a7ba 100644 --- a/src/ui/public/vis/editors/default/agg.html +++ b/src/ui/public/vis/editors/default/agg.html @@ -24,7 +24,7 @@ - + {{ aggForm.describeErrors() }} diff --git a/src/ui/public/vis/editors/default/agg_params.js b/src/ui/public/vis/editors/default/agg_params.js index de252c2f2dd82..0f67e687dc9d0 100644 --- a/src/ui/public/vis/editors/default/agg_params.js +++ b/src/ui/public/vis/editors/default/agg_params.js @@ -47,6 +47,11 @@ uiModules $scope.aggTypeOptions = aggTypeFilters .filter(aggTypes.byType[$scope.groupName], $scope.indexPattern, $scope.agg); + // If current agg type is not part of allowed agg types, set to first element of allowed agg types + if(!$scope.aggTypeOptions.includes($scope.agg.type)) { + $scope.agg.type = $scope.aggTypeOptions[0]; + } + $scope.advancedToggled = false; // We set up this watch prior to adding the controls below, because when the controls are added, From 4cb303d943c89cd32603b8fe9bcc34ab011326c8 Mon Sep 17 00:00:00 2001 From: Jen Huang Date: Fri, 13 Jul 2018 14:04:32 -0700 Subject: [PATCH 04/47] Filter aggregation fields for rollup indices, reorganize rollup directory --- x-pack/plugins/rollup/index.js | 2 +- .../public/visualize/agg_type_field_filter.js | 28 +++++++++++++++++++ .../agg_type_filter.js} | 0 .../index.js | 3 +- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js rename x-pack/plugins/rollup/public/{vis_type_agg_filter/register.js => visualize/agg_type_filter.js} (100%) rename x-pack/plugins/rollup/public/{vis_type_agg_filter => visualize}/index.js (79%) diff --git a/x-pack/plugins/rollup/index.js b/x-pack/plugins/rollup/index.js index 2bba337b55d4c..42879f503b445 100644 --- a/x-pack/plugins/rollup/index.js +++ b/x-pack/plugins/rollup/index.js @@ -20,7 +20,7 @@ export function rollup(kibana) { 'plugins/rollup/index_pattern_list', ], visualize: [ - 'plugins/rollup/vis_type_agg_filter', + 'plugins/rollup/visualize', ], }, init: function (server) { diff --git a/x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js b/x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js new file mode 100644 index 0000000000000..895b7d64f188b --- /dev/null +++ b/x-pack/plugins/rollup/public/visualize/agg_type_field_filter.js @@ -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; +* you may not use this file except in compliance with the Elastic License. +*/ + +import { aggTypeFieldFilters } from 'ui/agg_types/param_types/filter'; + +/** + * If rollup index pattern, check its capabilities + * and limit available fields for a given aggType based on that. + */ +aggTypeFieldFilters.addFilter( + (field, fieldParamType, indexPattern, aggConfig) => { + if(indexPattern.type !== 'rollup') { + return true; + } + + const fieldName = field.name; + const aggName = aggConfig.type.name; + const jobs = indexPattern.typeMeta.jobs; + + return !!jobs.find(job => { + const fields = indexPattern.typeMeta.capabilities[job].fields; + return fields[fieldName] && fields[fieldName].find(agg => agg.agg === aggName); + }); + } +); diff --git a/x-pack/plugins/rollup/public/vis_type_agg_filter/register.js b/x-pack/plugins/rollup/public/visualize/agg_type_filter.js similarity index 100% rename from x-pack/plugins/rollup/public/vis_type_agg_filter/register.js rename to x-pack/plugins/rollup/public/visualize/agg_type_filter.js diff --git a/x-pack/plugins/rollup/public/vis_type_agg_filter/index.js b/x-pack/plugins/rollup/public/visualize/index.js similarity index 79% rename from x-pack/plugins/rollup/public/vis_type_agg_filter/index.js rename to x-pack/plugins/rollup/public/visualize/index.js index 4d2947eb36f46..5961110b5fc07 100644 --- a/x-pack/plugins/rollup/public/vis_type_agg_filter/index.js +++ b/x-pack/plugins/rollup/public/visualize/index.js @@ -4,4 +4,5 @@ * you may not use this file except in compliance with the Elastic License. */ -import './register'; +import './agg_type_filter'; +import './agg_type_field_filter'; From 5cb426e7f3f515aca63a5f150e8724232678f78f Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Mon, 23 Jul 2018 16:01:34 -0700 Subject: [PATCH 05/47] Add rollupSearchStrategy and SearchError (#20505) * Add /api/rollup/search endpoint and rollupSearchStrategy. * Add SearchError for surfacing courier search errors. - Use toastNotifications to surface errors in visualization editor. - Add call-out react directive and use it to surface rollup errors in the visualization editor sidebar. - Temporarily assign timezone and interval values from rollup job to the search to avoid errors. --- src/ui/public/courier/fetch/fetch_now.js | 6 +- .../public/vis/editors/default/sidebar.html | 9 ++ src/ui/public/vis/editors/default/sidebar.js | 19 +++ .../public/vis/editors/default/sidebar.less | 3 + x-pack/plugins/rollup/index.js | 8 +- x-pack/plugins/rollup/public/search/index.js | 7 ++ .../plugins/rollup/public/search/register.js | 10 ++ .../public/search/rollup_search_strategy.js | 114 ++++++++++++++++++ .../server/client/elasticsearch_rollup.js | 15 +++ .../plugins/rollup/server/routes/api/index.js | 1 + .../rollup/server/routes/api/search.js | 36 ++++++ 11 files changed, 225 insertions(+), 3 deletions(-) create mode 100644 src/ui/public/vis/editors/default/sidebar.less create mode 100644 x-pack/plugins/rollup/public/search/index.js create mode 100644 x-pack/plugins/rollup/public/search/register.js create mode 100644 x-pack/plugins/rollup/public/search/rollup_search_strategy.js create mode 100644 x-pack/plugins/rollup/server/routes/api/search.js diff --git a/src/ui/public/courier/fetch/fetch_now.js b/src/ui/public/courier/fetch/fetch_now.js index adc3635d9e9c0..7bb3890fbf95e 100644 --- a/src/ui/public/courier/fetch/fetch_now.js +++ b/src/ui/public/courier/fetch/fetch_now.js @@ -73,7 +73,11 @@ export function FetchNowProvider(Private, Promise) { return startRequests(searchRequests) .then(function () { replaceAbortedRequests(); - return callClient(searchRequests); + return callClient(searchRequests) + .catch(() => { + // Silently swallow errors that result from search requests so the consumer can surface + // them as notifications instead of courier forcing fatal errors. + }); }) .then(function (responses) { replaceAbortedRequests(); diff --git a/src/ui/public/vis/editors/default/sidebar.html b/src/ui/public/vis/editors/default/sidebar.html index 9460225ff079d..6ca0ad94989b3 100644 --- a/src/ui/public/vis/editors/default/sidebar.html +++ b/src/ui/public/vis/editors/default/sidebar.html @@ -19,6 +19,15 @@