diff --git a/packages/kbn-spec-to-console/lib/__fixtures__/cluster_health_autocomplete.json b/packages/kbn-spec-to-console/lib/__fixtures__/cluster_health_autocomplete.json index 64ede603c0e0..745d9c680bb0 100644 --- a/packages/kbn-spec-to-console/lib/__fixtures__/cluster_health_autocomplete.json +++ b/packages/kbn-spec-to-console/lib/__fixtures__/cluster_health_autocomplete.json @@ -38,7 +38,7 @@ ], "patterns": [ "_cluster/health", - "_cluster/health/{indices}" + "_cluster/health/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html" } diff --git a/packages/kbn-spec-to-console/lib/convert/parts.js b/packages/kbn-spec-to-console/lib/convert/parts.js index 20e8c1cc48de..20cc0c8b909b 100644 --- a/packages/kbn-spec-to-console/lib/convert/parts.js +++ b/packages/kbn-spec-to-console/lib/convert/parts.js @@ -11,7 +11,7 @@ const replacePattern = require('../replace_pattern'); module.exports = (parts) => { const result = {}; Object.keys(parts).forEach((part) => { - const key = replacePattern(part, { exact: true }); + const key = replacePattern(part); const options = parts[part].options; if (options && options.length) { result[key] = options.sort(); diff --git a/packages/kbn-spec-to-console/lib/convert/paths.js b/packages/kbn-spec-to-console/lib/convert/paths.js index 129285ab1901..fdfd06efe2c4 100644 --- a/packages/kbn-spec-to-console/lib/convert/paths.js +++ b/packages/kbn-spec-to-console/lib/convert/paths.js @@ -10,6 +10,6 @@ const replacePattern = require('../replace_pattern'); module.exports = (patterns) => { return patterns.map((patternObject) => { - return replacePattern(patternObject.path, { brackets: true }); + return replacePattern(patternObject.path); }); }; diff --git a/packages/kbn-spec-to-console/lib/replace_pattern.js b/packages/kbn-spec-to-console/lib/replace_pattern.js index 3847900a8136..788b97ac69bb 100644 --- a/packages/kbn-spec-to-console/lib/replace_pattern.js +++ b/packages/kbn-spec-to-console/lib/replace_pattern.js @@ -6,20 +6,6 @@ * Side Public License, v 1. */ -const map = require('./static/map_interpolation.json'); - -module.exports = (pattern, { brackets, exact } = {}) => { - let newPattern = pattern; - Object.keys(map).forEach((key) => { - const replaceFrom = brackets ? `{${key}}` : key; - const replaceTo = brackets ? `{${map[key]}}` : map[key]; - if (exact) { - const exactMatch = replaceFrom === newPattern; - newPattern = exactMatch ? replaceTo : newPattern; - } else { - newPattern = newPattern.replace(replaceFrom, replaceTo); - } - }); - - return newPattern.replace(/^\//, ''); +module.exports = (pattern) => { + return pattern.replace(/^\//, ''); }; diff --git a/packages/kbn-spec-to-console/lib/static/map_interpolation.json b/packages/kbn-spec-to-console/lib/static/map_interpolation.json deleted file mode 100644 index b51ccb19f53c..000000000000 --- a/packages/kbn-spec-to-console/lib/static/map_interpolation.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "index": "indices", - "node_id": "nodes", - "metric": "metrics" -} diff --git a/src/plugins/console/README.md b/src/plugins/console/README.md index f03c7d9defe0..f61675252b7e 100644 --- a/src/plugins/console/README.md +++ b/src/plugins/console/README.md @@ -73,7 +73,8 @@ Url to Elasticsearch REST API documentation for the endpoint (If the url contain Allowed http methods (`GET`, `POST` etc) #### `patterns` -Array of API endpoints that contain variables like `{indices}` or `{fields}`. For example, `{indices}/_rollup/{rollup_index}`. See the [Variables](#variables) section below for more info. +Array of API endpoints that contain dynamic parameters like `{index}` or `{fields}`. For example, `{index}/_rollup/{rollup_index}`. Dynamic parameters used in patterns are not always defined. For example, a pattern `_ilm/policy/{policy}` indicates that any string can be used as policy name. +See the [Dynamic parameters](#dynamic-parameters) section below for more info about dynamic parameters defined in the autocomplete engine, such as `{index}`. #### `url_params` Query url parameters and their values. See the [Query url parameters](#query-url-parameters) section below for more info. An example: @@ -141,7 +142,7 @@ GET /_some_endpoint?expand_wildcards=hi ``` "hidden" is displayed for autocompletion. -Variables such as `{indices}` or `{fields}` are accepted both as an url parameter and its value in the configuration object. See the [Variables](#variables) section below for more information. +Dynamic parameters such as `{index}` or `{fields}` are accepted both as an url parameter and its value in the configuration object. See the [Dynamic parameters](#dynamic-parameters) section below for more information. ### Request body parameters Request body parameters are configured in form of an object, for example: @@ -175,7 +176,20 @@ PUT /_some_endpoint ``` Object's values can contain objects for nested configuration because the engine can work recursively while searching for autocomplete suggestions. -Following values can be used in the configuration object: +Upper case strings are used to indicate that the property's name is a dynamic value that the user needs to define. For example, the autocomplete suggestion for aggregations displays the following object: +```json +{ + "aggs": { + "NAME": { + "AGG_TYPE": {} + } + } +} +``` +Both upper case strings `NAME` and `AGG_TYPE` indicate that those values need to be filled in by the user. + +**Following values can be used in the configuration object:** + #### One value from the list (`__one_of: [..., ...]`) Use this configuration for a parameter with a list of allowed values, for example types of snapshot repository: ``` @@ -262,11 +276,24 @@ For example: To provide a different set of autocomplete suggestions based on the value configured in the request. For example, when creating a snapshot repository of different types (`fs`, `url` etc) different properties are displayed in the suggestions list based on the type. See [snapshot.create_repository.json](https://github.com/elastic/kibana/blob/main/src/plugins/console/server/lib/spec_definitions/json/overrides/snapshot.create_repository.json) for an example. -### Variables +### Dynamic parameters Some autocomplete definitions need to be configured with dynamic values that can't be hard coded into a json or js file, for example a list of indices in the cluster. -A list of variables is defined in the `parametrizedComponentFactories` function in [`kb.js`](https://github.com/elastic/kibana/blob/main/src/plugins/console/public/lib/kb/kb.js) file. The values of these variables are assigned dynamically for every cluster. -Use these variables with curly braces, for example `{indices}`, `{types}`, `{id}`, `{username}`, `{template}`, `{nodes}` etc. +A list of dynamic parameters is defined in the `parametrizedComponentFactories` function in [`kb.js`](https://github.com/elastic/kibana/blob/main/src/plugins/console/public/lib/kb/kb.js) file. The values of these parameters are assigned dynamically for every cluster. +Use these dynamic parameters with curly braces, for example `{index}`, `{fields}`, `{template}` etc. +Dynamic parameters can be used in url patterns, for example `{index}/_search`. Url patterns can also contain unknown parameters just to indicate that any value can be used in the url, for example in the url `/_ilm/policy/{policy}` the value for `{policy}` can be any accepted policy name and the dynamic parameter `{policy}` is not defined in the autocomplete engine. + +For request body parameters, only known dynamic properties are allowed. For example: +```json +{ + "data_autocomplete_rules": { + "query": { + "field": "{field}" + } + } +} +``` +If an unknown dynamic parameter (for example, `{my_param}`) is used in request body parameters, a warning will be logged in the browser: `[Console] no factory found for 'my_param'`. ### Architecture changes in 8.3 release (timeline: 07-04-2022 - 19-06-2022) One of the main changes in architecture is refactoring the retrieval of autocomplete suggestions. Console used to send a separate request to ES for each autocomplete entity (mappings, aliases, templates, data-streams etc) to retrieve the autocomplete suggestions via the original [hand-rolled ES proxy](https://github.com/elastic/kibana/blob/main/src/plugins/console/server/routes/api/console/proxy/create_handler.ts). This had a few drawbacks: diff --git a/src/plugins/console/public/application/models/sense_editor/integration.test.js b/src/plugins/console/public/application/models/sense_editor/integration.test.js index 08912871052b..cd7e13d5c6a5 100644 --- a/src/plugins/console/public/application/models/sense_editor/integration.test.js +++ b/src/plugins/console/public/application/models/sense_editor/integration.test.js @@ -196,7 +196,7 @@ describe('Integration', () => { endpoints: { _search: { methods: ['GET', 'POST'], - patterns: ['{indices}/_search', '_search'], + patterns: ['{index}/_search', '_search'], data_autocomplete_rules: { query: { match_all: {}, @@ -948,6 +948,8 @@ describe('Integration', () => { autoCompleteSet: [ tt('field1.1.1', { f: 1 }, 'string'), tt('field1.1.2', { f: 1 }, 'string'), + tt('field2.1.1', { f: 1 }, 'string'), + tt('field2.1.2', { f: 1 }, 'string'), ], }, { @@ -956,6 +958,8 @@ describe('Integration', () => { autoCompleteSet: [ { name: 'field1.1.1', meta: 'string' }, { name: 'field1.1.2', meta: 'string' }, + { name: 'field2.1.1', meta: 'string' }, + { name: 'field2.1.2', meta: 'string' }, ], }, ] @@ -996,7 +1000,7 @@ describe('Integration', () => { const CLUSTER_KB = { endpoints: { _search: { - patterns: ['_search', '{indices}/_search'], + patterns: ['_search', '{index}/_search'], url_params: { search_type: ['count', 'query_then_fetch'], scroll: '10m', diff --git a/src/plugins/console/public/lib/autocomplete/body_completer.js b/src/plugins/console/public/lib/autocomplete/body_completer.js index 647096df97f8..9759eb9b629d 100644 --- a/src/plugins/console/public/lib/autocomplete/body_completer.js +++ b/src/plugins/console/public/lib/autocomplete/body_completer.js @@ -204,7 +204,9 @@ function compileParametrizedValue(value, compilingContext, template) { value = value.substr(1, value.length - 2).toLowerCase(); let component = compilingContext.parametrizedComponentFactories.getComponent(value, true); if (!component) { - throw new Error("no factory found for '" + value + "'"); + console.warn("[Console] no factory found for '" + value + "'"); + // using upper case as an indication that this value is a parameter + return new ConstantComponent(value.toUpperCase()); } component = component(value, null, template); if (!_.isUndefined(template)) { @@ -279,7 +281,7 @@ export function globalsOnlyAutocompleteComponents() { * @param endpointComponentResolver a function (endpoint,context,editor) which should resolve an endpoint * to it's list of compiled components. * @param parametrizedComponentFactories a dict of the following structure - * that will be used as a fall back for pattern keys (i.e.: {type} ,resolved without the $s) + * that will be used as a fall back for pattern keys (i.e.: {index}, resolved without the {}) * { * TYPE: function (part, parent, endpoint) { * return new SharedComponent(part, parent) diff --git a/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js deleted file mode 100644 index abca37f19e6c..000000000000 --- a/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -import _ from 'lodash'; -import { SharedComponent } from './shared_component'; -export class IdAutocompleteComponent extends SharedComponent { - constructor(name, parent, multi) { - super(name, parent); - this.multi_match = multi; - } - match(token, context, editor) { - if (!token) { - return null; - } - if (!this.multi_match && Array.isArray(token)) { - return null; - } - token = Array.isArray(token) ? token : [token]; - if ( - _.find(token, function (t) { - return t.match(/[\/,]/); - }) - ) { - return null; - } - const r = super.match(token, context, editor); - r.context_values = r.context_values || {}; - r.context_values.id = token; - return r; - } -} diff --git a/src/plugins/console/public/lib/autocomplete/components/index.js b/src/plugins/console/public/lib/autocomplete/components/index.js index 4a8838a6fb82..594704f55094 100644 --- a/src/plugins/console/public/lib/autocomplete/components/index.js +++ b/src/plugins/console/public/lib/autocomplete/components/index.js @@ -18,9 +18,6 @@ export { AcceptEndpointComponent, URL_PATH_END_MARKER } from './accept_endpoint_ export { UrlPatternMatcher } from './url_pattern_matcher'; export { IndexAutocompleteComponent } from './index_autocomplete_component'; export { FieldAutocompleteComponent } from './field_autocomplete_component'; -export { TypeAutocompleteComponent } from './type_autocomplete_component'; -export { IdAutocompleteComponent } from './id_autocomplete_component'; -export { UsernameAutocompleteComponent } from './username_autocomplete_component'; export { IndexTemplateAutocompleteComponent } from './index_template_autocomplete_component'; export { ComponentTemplateAutocompleteComponent } from './component_template_autocomplete_component'; export { DataStreamAutocompleteComponent } from './data_stream_autocomplete_component'; diff --git a/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js index 7615c511148b..752e69c09614 100644 --- a/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js +++ b/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js @@ -24,12 +24,4 @@ export class IndexAutocompleteComponent extends ListComponent { } return !_.find(tokens, nonValidIndexType); } - - getDefaultTermMeta() { - return 'index'; - } - - getContextKey() { - return 'indices'; - } } diff --git a/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js deleted file mode 100644 index f7caf05e5805..000000000000 --- a/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -import _ from 'lodash'; -import { ListComponent } from './list_component'; -import { getTypes } from '../../autocomplete_entities'; -function TypeGenerator(context) { - return getTypes(context.indices); -} -function nonValidIndexType(token) { - return !(token === '_all' || token[0] !== '_'); -} -export class TypeAutocompleteComponent extends ListComponent { - constructor(name, parent, multiValued) { - super(name, TypeGenerator, parent, multiValued); - } - validateTokens(tokens) { - if (!this.multiValued && tokens.length > 1) { - return false; - } - - return !_.find(tokens, nonValidIndexType); - } - - getDefaultTermMeta() { - return 'type'; - } - - getContextKey() { - return 'types'; - } -} diff --git a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js index 547c4f12a371..f2666052b988 100644 --- a/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js +++ b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js @@ -19,7 +19,7 @@ import { FullRequestComponent } from './full_request_component'; /** * @param parametrizedComponentFactories a dict of the following structure - * that will be used as a fall back for pattern parameters (i.e.: {indices}) + * that will be used as a fall back for pattern parameters (i.e.: {index}) * { * indices: function (part, parent) { * return new SharedComponent(part, parent) diff --git a/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js deleted file mode 100644 index 75394787533f..000000000000 --- a/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -import _ from 'lodash'; -import { getAutocompleteInfo, ENTITIES } from '../../../services'; -import { ListComponent } from './list_component'; - -function nonValidUsernameType(token) { - return token[0] === '_'; -} - -export class UsernameAutocompleteComponent extends ListComponent { - constructor(name, parent, multiValued) { - super(name, getAutocompleteInfo().getEntityProvider(ENTITIES.INDICES), parent, multiValued); - } - validateTokens(tokens) { - if (!this.multiValued && tokens.length > 1) { - return false; - } - return !_.find(tokens, nonValidUsernameType); - } - - getDefaultTermMeta() { - return 'username'; - } - - getContextKey() { - return 'username'; - } -} diff --git a/src/plugins/console/public/lib/autocomplete_entities/index.ts b/src/plugins/console/public/lib/autocomplete_entities/index.ts index e523ce42ddc7..6b38fc424d14 100644 --- a/src/plugins/console/public/lib/autocomplete_entities/index.ts +++ b/src/plugins/console/public/lib/autocomplete_entities/index.ts @@ -12,4 +12,3 @@ export { DataStream } from './data_stream'; export { LegacyTemplate } from './legacy'; export { IndexTemplate } from './index_template'; export { ComponentTemplate } from './component_template'; -export { getTypes } from './type'; diff --git a/src/plugins/console/public/lib/autocomplete_entities/type.ts b/src/plugins/console/public/lib/autocomplete_entities/type.ts deleted file mode 100644 index 5f1d8b1308d7..000000000000 --- a/src/plugins/console/public/lib/autocomplete_entities/type.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License - * 2.0 and the Server Side Public License, v 1; you may not use this file except - * in compliance with, at your election, the Elastic License 2.0 or the Server - * Side Public License, v 1. - */ - -import _ from 'lodash'; -import { getAutocompleteInfo } from '../../services'; -import { expandAliases } from './expand_aliases'; - -export function getTypes(indices: string | string[]) { - let ret: string[] = []; - const perIndexTypes = getAutocompleteInfo().mapping.perIndexTypes; - indices = expandAliases(indices); - if (typeof indices === 'string') { - const typeDict = perIndexTypes[indices]; - if (!typeDict) { - return []; - } - - // filter what we need - if (Array.isArray(typeDict)) { - typeDict.forEach((type) => { - ret.push(type); - }); - } else if (typeof typeDict === 'object') { - Object.keys(typeDict).forEach((type) => { - ret.push(type); - }); - } - } else { - // multi index mode. - Object.keys(perIndexTypes).forEach((index) => { - if (!indices || indices.includes(index)) { - ret.push(getTypes(index) as unknown as string); - } - }); - ret = ([] as string[]).concat.apply([], ret); - } - - return _.uniq(ret); -} diff --git a/src/plugins/console/public/lib/kb/api.js b/src/plugins/console/public/lib/kb/api.js index 8dce4cf3f385..44d022a827ef 100644 --- a/src/plugins/console/public/lib/kb/api.js +++ b/src/plugins/console/public/lib/kb/api.js @@ -17,7 +17,7 @@ import { /** * * @param urlParametrizedComponentFactories a dictionary of factory functions - * that will be used as fallback for parametrized path part (i.e., {indices} ) + * that will be used as fallback for parametrized path part (i.e., {index} ) * see UrlPatternMatcher * @constructor * @param bodyParametrizedComponentFactories same as urlParametrizedComponentFactories but used for body compilation diff --git a/src/plugins/console/public/lib/kb/kb.js b/src/plugins/console/public/lib/kb/kb.js index e268f55be558..22bf26ca6e88 100644 --- a/src/plugins/console/public/lib/kb/kb.js +++ b/src/plugins/console/public/lib/kb/kb.js @@ -7,13 +7,10 @@ */ import { - TypeAutocompleteComponent, - IdAutocompleteComponent, IndexAutocompleteComponent, FieldAutocompleteComponent, ListComponent, LegacyTemplateAutocompleteComponent, - UsernameAutocompleteComponent, IndexTemplateAutocompleteComponent, ComponentTemplateAutocompleteComponent, DataStreamAutocompleteComponent, @@ -27,74 +24,38 @@ import Api from './api'; let ACTIVE_API = new Api(); const isNotAnIndexName = (name) => name[0] === '_' && name !== '_all'; -const idAutocompleteComponentFactory = (name, parent) => { - return new IdAutocompleteComponent(name, parent); -}; const parametrizedComponentFactories = { getComponent: function (name, parent, provideDefault) { if (this[name]) { return this[name]; } else if (provideDefault) { - return idAutocompleteComponentFactory; + return new ListComponent(name, [], parent, false); } }, index: function (name, parent) { - if (isNotAnIndexName(name)) return; - return new IndexAutocompleteComponent(name, parent, false); - }, - indices: function (name, parent) { if (isNotAnIndexName(name)) return; return new IndexAutocompleteComponent(name, parent, true); }, - type: function (name, parent) { - return new TypeAutocompleteComponent(name, parent, false); - }, - types: function (name, parent) { - return new TypeAutocompleteComponent(name, parent, true); - }, - id: function (name, parent) { - return idAutocompleteComponentFactory(name, parent); - }, - transform_id: function (name, parent) { - return idAutocompleteComponentFactory(name, parent); - }, - username: function (name, parent) { - return new UsernameAutocompleteComponent(name, parent); - }, - user: function (name, parent) { - return new UsernameAutocompleteComponent(name, parent); - }, - template: function (name, parent) { - return new LegacyTemplateAutocompleteComponent(name, parent); - }, - task_id: function (name, parent) { - return idAutocompleteComponentFactory(name, parent); - }, - ids: function (name, parent) { - return idAutocompleteComponentFactory(name, parent, true); - }, fields: function (name, parent) { return new FieldAutocompleteComponent(name, parent, true); }, field: function (name, parent) { return new FieldAutocompleteComponent(name, parent, false); }, - nodes: function (name, parent) { - return new ListComponent( - name, - ['_local', '_master', 'data:true', 'data:false', 'master:true', 'master:false'], - parent - ); - }, - node: function (name, parent) { - return new ListComponent(name, [], parent, false); + // legacy index templates + template: function (name, parent) { + return new LegacyTemplateAutocompleteComponent(name, parent); }, + // composable index templates + // currently seems to be unused, but that is a useful functionality index_template: function (name, parent) { return new IndexTemplateAutocompleteComponent(name, parent); }, + // currently seems to be unused, but that is a useful functionality component_template: function (name, parent) { return new ComponentTemplateAutocompleteComponent(name, parent); }, + // currently seems to be unused, but that is a useful functionality data_stream: function (name, parent) { return new DataStreamAutocompleteComponent(name, parent); }, @@ -129,23 +90,27 @@ function loadApisFromJson( urlParametrizedComponentFactories, bodyParametrizedComponentFactories ) { - urlParametrizedComponentFactories = - urlParametrizedComponentFactories || parametrizedComponentFactories; - bodyParametrizedComponentFactories = - bodyParametrizedComponentFactories || urlParametrizedComponentFactories; - const api = new Api(urlParametrizedComponentFactories, bodyParametrizedComponentFactories); - const names = []; - _.each(json, function (apiJson, name) { - names.unshift(name); - _.each(apiJson.globals || {}, function (globalJson, globalName) { - api.addGlobalAutocompleteRules(globalName, globalJson); + try { + urlParametrizedComponentFactories = + urlParametrizedComponentFactories || parametrizedComponentFactories; + bodyParametrizedComponentFactories = + bodyParametrizedComponentFactories || urlParametrizedComponentFactories; + const api = new Api(urlParametrizedComponentFactories, bodyParametrizedComponentFactories); + const names = []; + _.each(json, function (apiJson, name) { + names.unshift(name); + _.each(apiJson.globals || {}, function (globalJson, globalName) { + api.addGlobalAutocompleteRules(globalName, globalJson); + }); + _.each(apiJson.endpoints || {}, function (endpointJson, endpointName) { + api.addEndpointDescription(endpointName, endpointJson); + }); }); - _.each(apiJson.endpoints || {}, function (endpointJson, endpointName) { - api.addEndpointDescription(endpointName, endpointJson); - }); - }); - api.name = names.join(','); - return api; + api.name = names.join(','); + return api; + } catch (e) { + console.error(e); + } } // TODO: clean up setting up of active API and use of jQuery. diff --git a/src/plugins/console/public/lib/kb/kb.test.js b/src/plugins/console/public/lib/kb/kb.test.js index 8b1af7103c40..f4e662733f0e 100644 --- a/src/plugins/console/public/lib/kb/kb.test.js +++ b/src/plugins/console/public/lib/kb/kb.test.js @@ -29,22 +29,15 @@ describe('Knowledge base', () => { const MAPPING = { index1: { - 'type1.1': { - properties: { - 'field1.1.1': { type: 'string' }, - 'field1.1.2': { type: 'long' }, - }, - }, - 'type1.2': { - properties: {}, + properties: { + 'field1.1.1': { type: 'string' }, + 'field1.1.2': { type: 'long' }, }, }, index2: { - 'type2.1': { - properties: { - 'field2.1.1': { type: 'string' }, - 'field2.1.2': { type: 'string' }, - }, + properties: { + 'field2.1.1': { type: 'string' }, + 'field2.1.2': { type: 'string' }, }, }, }; @@ -95,10 +88,6 @@ describe('Knowledge base', () => { expect(context).toEqual(expectedContext); } - function t(term) { - return { name: term, meta: 'type' }; - } - function i(term) { return { name: term, meta: 'index' }; } @@ -111,7 +100,7 @@ describe('Knowledge base', () => { indexTest: { endpoints: { _multi_indices: { - patterns: ['{indices}/_multi_indices'], + patterns: ['{index}/_multi_indices'], }, _single_index: { patterns: ['{index}/_single_index'] }, _no_index: { @@ -144,71 +133,12 @@ describe('Knowledge base', () => { ); indexTest('Index integration 2', ['index1'], [], { - indices: ['index1'], + index: ['index1'], autoCompleteSet: ['_multi_indices', '_single_index'], }); indexTest('Index integration 2', [['index1', 'index2']], [], { - indices: ['index1', 'index2'], - autoCompleteSet: ['_multi_indices'], + index: ['index1', 'index2'], + autoCompleteSet: ['_multi_indices', '_single_index'], }); - - function typeTest(name, tokenPath, otherTokenValues, expectedContext) { - test(name, function () { - const testApi = kb._test.loadApisFromJson( - { - typeTest: { - endpoints: { - _multi_types: { patterns: ['{indices}/{types}/_multi_types'] }, - _single_type: { patterns: ['{indices}/{type}/_single_type'] }, - _no_types: { patterns: ['{indices}/_no_types'] }, - }, - }, - }, - kb._test.globalUrlComponentFactories - ); - kb.setActiveApi(testApi); - - autocompleteInfo.mapping.loadMappings(MAPPING); - - testUrlContext(tokenPath, otherTokenValues, expectedContext); - }); - } - - typeTest('Type integration 1', ['index1'], [], { - indices: ['index1'], - autoCompleteSet: ['_no_types', t('type1.1'), t('type1.2')], - }); - typeTest( - 'Type integration 2', - ['index1'], - ['type1.2'], - // we are not yet comitted to type1.2, so _no_types is returned - { indices: ['index1'], autoCompleteSet: ['_no_types', t('type1.1')] } - ); - - typeTest('Type integration 3', ['index2'], [], { - indices: ['index2'], - autoCompleteSet: ['_no_types', t('type2.1')], - }); - - typeTest('Type integration 4', ['index1', 'type1.2'], [], { - indices: ['index1'], - types: ['type1.2'], - autoCompleteSet: ['_multi_types', '_single_type'], - }); - - typeTest( - 'Type integration 5', - [ - ['index1', 'index2'], - ['type1.2', 'type1.1'], - ], - [], - { - indices: ['index1', 'index2'], - types: ['type1.2', 'type1.1'], - autoCompleteSet: ['_multi_types'], - } - ); }); diff --git a/src/plugins/console/server/lib/spec_definitions/js/filter.ts b/src/plugins/console/server/lib/spec_definitions/js/filter.ts index 79ce387ea142..849893437501 100644 --- a/src/plugins/console/server/lib/spec_definitions/js/filter.ts +++ b/src/plugins/console/server/lib/spec_definitions/js/filter.ts @@ -36,7 +36,6 @@ filters.ids = { __template: { values: ['ID'], }, - type: '{type}', values: [''], }; @@ -175,7 +174,6 @@ filters.geo_shape = { indexed_shape: { id: '', index: '{index}', - type: '{type}', shape_field_name: 'shape', }, relation: { @@ -189,7 +187,7 @@ filters.has_child = { type: 'TYPE', filter: {}, }, - type: '{type}', + type: '', query: {}, filter: {}, _scope: '', @@ -202,7 +200,7 @@ filters.has_parent = { parent_type: 'TYPE', filter: {}, }, - parent_type: '{type}', + parent_type: '', query: {}, filter: {}, _scope: '', diff --git a/src/plugins/console/server/lib/spec_definitions/js/mappings.ts b/src/plugins/console/server/lib/spec_definitions/js/mappings.ts index 5c3d62102184..09fc4b8e36ae 100644 --- a/src/plugins/console/server/lib/spec_definitions/js/mappings.ts +++ b/src/plugins/console/server/lib/spec_definitions/js/mappings.ts @@ -34,12 +34,6 @@ export const mappings = (specService: SpecDefinitionsService) => { _index: { enabled: BOOLEAN, }, - _parent: { - __template: { - type: '', - }, - type: '{type}', - }, _timestamp: { enabled: BOOLEAN, format: 'YYYY-MM-dd', @@ -224,7 +218,7 @@ export const mappings = (specService: SpecDefinitionsService) => { // objects properties: { - __scope_link: 'put_mapping.{type}.properties', + __scope_link: 'put_mapping.type.properties', }, // multi_field diff --git a/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts b/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts index 895d2e4ed72f..c8eceba98b52 100644 --- a/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts +++ b/src/plugins/console/server/lib/spec_definitions/js/query/dsl.ts @@ -360,7 +360,7 @@ export const query = (specService: SpecDefinitionsService) => { query: {}, }, inner_hits: { ...innerHits }, - type: '{type}', + type: '', score_mode: { __one_of: ['none', 'max', 'sum', 'avg'], }, @@ -374,7 +374,7 @@ export const query = (specService: SpecDefinitionsService) => { parent_type: 'TYPE', query: {}, }, - parent_type: '{type}', + parent_type: '', score_mode: { __one_of: ['none', 'score'], }, @@ -407,7 +407,6 @@ export const query = (specService: SpecDefinitionsService) => { docs: [ { _index: '{index}', - _type: '{type}', _id: '', }, ], diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.submit.json b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.submit.json index 635436bdb167..ba82de7871be 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.submit.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/async_search.submit.json @@ -64,7 +64,7 @@ ], "patterns": [ "_async_search", - "{indices}/_async_search" + "{index}/_async_search" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/async-search.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json b/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json index 6d84585d8ebf..7ffa11ff47fb 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/bulk.json @@ -22,7 +22,7 @@ ], "patterns": [ "_bulk", - "{indices}/_bulk" + "{index}/_bulk" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json index 4d77575f959b..c46c4022c087 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.allocation.json @@ -27,7 +27,7 @@ ], "patterns": [ "_cat/allocation", - "_cat/allocation/{nodes}" + "_cat/allocation/{node_id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.count.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.count.json index 20d36cc717ed..37b7601c8f28 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.count.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.count.json @@ -12,7 +12,7 @@ ], "patterns": [ "_cat/count", - "_cat/count/{indices}" + "_cat/count/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json index a0d405f60904..68050bf5843c 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.indices.json @@ -49,7 +49,7 @@ ], "patterns": [ "_cat/indices", - "_cat/indices/{indices}" + "_cat/indices/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.recovery.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.recovery.json index 8db8f0363ff3..400d3fc8c3f2 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.recovery.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.recovery.json @@ -37,7 +37,7 @@ ], "patterns": [ "_cat/recovery", - "_cat/recovery/{indices}" + "_cat/recovery/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-recovery.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.segments.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.segments.json index 39bd21f4272d..4c63b8d0680d 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.segments.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.segments.json @@ -25,7 +25,7 @@ ], "patterns": [ "_cat/segments", - "_cat/segments/{indices}" + "_cat/segments/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-segments.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json index 64a235eae67d..2f22028f1395 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.shards.json @@ -35,7 +35,7 @@ ], "patterns": [ "_cat/shards", - "_cat/shards/{indices}" + "_cat/shards/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cat-shards.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow.json index 6abfa03eefdd..6c81a0d94e6b 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow.json @@ -7,7 +7,7 @@ "PUT" ], "patterns": [ - "{indices}/_ccr/follow" + "{index}/_ccr/follow" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-follow.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_info.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_info.json index b61e47a6ea4b..ae59e677da8f 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_info.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_info.json @@ -4,7 +4,7 @@ "GET" ], "patterns": [ - "{indices}/_ccr/info" + "{index}/_ccr/info" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-info.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_stats.json index 6d72e12df17d..47553262c95d 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.follow_stats.json @@ -4,7 +4,7 @@ "GET" ], "patterns": [ - "{indices}/_ccr/stats" + "{index}/_ccr/stats" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-stats.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.forget_follower.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.forget_follower.json index f2aabe9ef425..1cc81cea8fe0 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.forget_follower.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.forget_follower.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "{indices}/_ccr/forget_follower" + "{index}/_ccr/forget_follower" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-forget-follower.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_follow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_follow.json index 72afa796e196..4dcb0fdaf9b8 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_follow.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.pause_follow.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "{indices}/_ccr/pause_follow" + "{index}/_ccr/pause_follow" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-pause-follow.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_follow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_follow.json index 3710cdb8cc57..00b889d0d5f9 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_follow.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.resume_follow.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "{indices}/_ccr/resume_follow" + "{index}/_ccr/resume_follow" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-resume-follow.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.unfollow.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.unfollow.json index 37530bf373c4..9d9d6868a2fc 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.unfollow.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ccr.unfollow.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "{indices}/_ccr/unfollow" + "{index}/_ccr/unfollow" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-unfollow.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json index 1758ea44d92c..ec9b23094a8c 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.health.json @@ -39,7 +39,7 @@ ], "patterns": [ "_cluster/health", - "_cluster/health/{indices}" + "_cluster/health/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-health.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json index fb4a02c60317..b0c32ba67c16 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.state.json @@ -21,11 +21,11 @@ ], "patterns": [ "_cluster/state", - "_cluster/state/{metrics}", - "_cluster/state/{metrics}/{indices}" + "_cluster/state/{metric}", + "_cluster/state/{metric}/{index}" ], "url_components": { - "metrics": [ + "metric": [ "_all", "blocks", "master_node", @@ -35,7 +35,7 @@ "routing_table", "version" ], - "indices": null + "index": null }, "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-state.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.stats.json index be7187ec85e4..be461378c43b 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/cluster.stats.json @@ -9,7 +9,7 @@ ], "patterns": [ "_cluster/stats", - "_cluster/stats/nodes/{nodes}" + "_cluster/stats/nodes/{node_id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-stats.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/count.json b/src/plugins/console/server/lib/spec_definitions/json/generated/count.json index 67386eb7c6f1..cabc6ae4a2aa 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/count.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/count.json @@ -31,7 +31,7 @@ ], "patterns": [ "_count", - "{indices}/_count" + "{index}/_count" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-count.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/create.json b/src/plugins/console/server/lib/spec_definitions/json/generated/create.json index 8bbee143c299..243072db15ac 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/create.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/create.json @@ -22,7 +22,7 @@ "POST" ], "patterns": [ - "{indices}/_create/{id}" + "{index}/_create/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json index a71a659618eb..0b904bea26ca 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/delete.json @@ -22,7 +22,7 @@ "DELETE" ], "patterns": [ - "{indices}/_doc/{id}" + "{index}/_doc/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json index b16d37701113..fc1daa2f588e 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/delete_by_query.json @@ -50,7 +50,7 @@ "POST" ], "patterns": [ - "{indices}/_delete_by_query" + "{index}/_delete_by_query" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete-by-query.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/eql.search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.search.json index 67e7a1729c29..784b690e4526 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/eql.search.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/eql.search.json @@ -10,7 +10,7 @@ "POST" ], "patterns": [ - "{indices}/_eql/search" + "{index}/_eql/search" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search-api.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json b/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json index 7d66dad050e5..462b6aa203df 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/exists.json @@ -20,7 +20,7 @@ "HEAD" ], "patterns": [ - "{indices}/_doc/{id}" + "{index}/_doc/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json b/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json index 6811940cb0f1..2a353a99a68a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/exists_source.json @@ -19,7 +19,7 @@ "HEAD" ], "patterns": [ - "{indices}/_source/{id}" + "{index}/_source/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/explain.json b/src/plugins/console/server/lib/spec_definitions/json/generated/explain.json index e4654a99a76e..6180e0dbdd53 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/explain.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/explain.json @@ -22,7 +22,7 @@ "POST" ], "patterns": [ - "{indices}/_explain/{id}" + "{index}/_explain/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-explain.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json b/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json index 9272c6e3bb26..6e47c24eda1c 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/field_caps.json @@ -21,7 +21,7 @@ ], "patterns": [ "_field_caps", - "{indices}/_field_caps" + "{index}/_field_caps" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-field-caps.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.global_checkpoints.json b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.global_checkpoints.json index 318f7eaf0060..11da79d9444b 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.global_checkpoints.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.global_checkpoints.json @@ -10,7 +10,7 @@ "GET" ], "patterns": [ - "{indices}/_fleet/global_checkpoints" + "{index}/_fleet/global_checkpoints" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-global-checkpoints.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.msearch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.msearch.json index 6d0a4aa22c0c..543ab32f6be3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.msearch.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.msearch.json @@ -6,7 +6,7 @@ ], "patterns": [ "_fleet/_fleet_msearch", - "{indices}/_fleet/_fleet_msearch" + "{index}/_fleet/_fleet_msearch" ] } } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.search.json index 2dceaba98e66..808a7d0dc3ab 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.search.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/fleet.search.json @@ -10,7 +10,7 @@ "POST" ], "patterns": [ - "{indices}/_fleet/_fleet_search" + "{index}/_fleet/_fleet_search" ] } } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/get.json index 8202ff4c7dae..fdc1f9e84062 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/get.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/get.json @@ -21,7 +21,7 @@ "GET" ], "patterns": [ - "{indices}/_doc/{id}" + "{index}/_doc/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json b/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json index de1b5b0f3de2..20e05e69cc1a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/get_source.json @@ -19,7 +19,7 @@ "GET" ], "patterns": [ - "{indices}/_source/{id}" + "{index}/_source/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/graph.explore.json b/src/plugins/console/server/lib/spec_definitions/json/generated/graph.explore.json index d4a81c03255f..98210205c739 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/graph.explore.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/graph.explore.json @@ -9,7 +9,7 @@ "POST" ], "patterns": [ - "{indices}/_graph/explore" + "{index}/_graph/explore" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/graph-explore-api.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json index 7c1c910906a6..9260157bfdba 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.explain_lifecycle.json @@ -8,7 +8,7 @@ "GET" ], "patterns": [ - "{indices}/_ilm/explain" + "{index}/_ilm/explain" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-explain-lifecycle.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.move_to_step.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.move_to_step.json index 84f7dad83be6..7c66a0cd5ebc 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.move_to_step.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.move_to_step.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "_ilm/move/{indices}" + "_ilm/move/{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-move-to-step.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.remove_policy.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.remove_policy.json index 5a3c760386f1..122da5af82b3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.remove_policy.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.remove_policy.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "{indices}/_ilm/remove" + "{index}/_ilm/remove" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-remove-policy.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.retry.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.retry.json index 07fc3a94bca0..b570a19ebb83 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.retry.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ilm.retry.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "{indices}/_ilm/retry" + "{index}/_ilm/retry" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ilm-retry-policy.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/index.json b/src/plugins/console/server/lib/spec_definitions/json/generated/index.json index c6b290a58812..87d559b06d5d 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/index.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/index.json @@ -29,8 +29,8 @@ "POST" ], "patterns": [ - "{indices}/_doc/{id}", - "{indices}/_doc" + "{index}/_doc/{id}", + "{index}/_doc" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.add_block.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.add_block.json index ff2623b100bd..65819d3fee25 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.add_block.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.add_block.json @@ -17,7 +17,7 @@ "PUT" ], "patterns": [ - "{indices}/_block/{block}" + "{index}/_block/{block}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/index-modules-blocks.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.analyze.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.analyze.json index 6b7c7187ab14..c24acdcd47ff 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.analyze.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.analyze.json @@ -9,7 +9,7 @@ ], "patterns": [ "_analyze", - "{indices}/_analyze" + "{index}/_analyze" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-analyze.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json index fc84d07df88a..e89318f984a8 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clear_cache.json @@ -21,7 +21,7 @@ ], "patterns": [ "_cache/clear", - "{indices}/_cache/clear" + "{index}/_cache/clear" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clearcache.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json index 8d5e76c0abcc..902ee8e16e0a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.clone.json @@ -10,7 +10,7 @@ "POST" ], "patterns": [ - "{indices}/_clone/{target}" + "{index}/_clone/{target}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-clone-index.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json index 1b58a27829bc..bd613aaf78b2 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.close.json @@ -18,7 +18,7 @@ "POST" ], "patterns": [ - "{indices}/_close" + "{index}/_close" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json index 8227e38d3c6d..196fd61c0a1f 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.create.json @@ -9,7 +9,7 @@ "PUT" ], "patterns": [ - "{indices}" + "{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-create-index.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json index 084828108123..9e15d27407bf 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete.json @@ -17,7 +17,7 @@ "DELETE" ], "patterns": [ - "{indices}" + "{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-delete-index.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json index d19ec2899393..b44beb8d373e 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_alias.json @@ -8,8 +8,8 @@ "DELETE" ], "patterns": [ - "{indices}/_alias/{name}", - "{indices}/_aliases/{name}" + "{index}/_alias/{name}", + "{index}/_aliases/{name}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_lifecycle.json index 974ad6ff5ced..f45b91d6ec73 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_lifecycle.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.delete_data_lifecycle.json @@ -17,6 +17,6 @@ "patterns": [ "_data_stream/{name}/_lifecycle" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/dlm-delete-lifecycle.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-delete-lifecycle.html" } } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.disk_usage.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.disk_usage.json index fe7d378b2b16..da01aca48b10 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.disk_usage.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.disk_usage.json @@ -17,7 +17,7 @@ "POST" ], "patterns": [ - "{indices}/_disk_usage" + "{index}/_disk_usage" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-disk-usage.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.downsample.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.downsample.json index a65a51836937..6c37d28a02f7 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.downsample.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.downsample.json @@ -4,7 +4,7 @@ "POST" ], "patterns": [ - "{indices}/_downsample/{target_index}" + "{index}/_downsample/{target_index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-rollup.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json index 09f6c7fd780f..a094654d0a18 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists.json @@ -18,7 +18,7 @@ "HEAD" ], "patterns": [ - "{indices}" + "{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-exists.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json index 4b93184ed52f..683647fc88bc 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.exists_alias.json @@ -17,7 +17,7 @@ ], "patterns": [ "_alias/{name}", - "{indices}/_alias/{name}" + "{index}/_alias/{name}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.explain_data_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.explain_data_lifecycle.json index cc54bc49b571..bf1be72a1501 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.explain_data_lifecycle.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.explain_data_lifecycle.json @@ -8,8 +8,8 @@ "GET" ], "patterns": [ - "{indices}/_lifecycle/explain" + "{index}/_lifecycle/explain" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/dlm-explain-lifecycle.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/data-streams-explain-lifecycle.html" } } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.field_usage_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.field_usage_stats.json index 4be1296e967f..38be17d9d7f1 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.field_usage_stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.field_usage_stats.json @@ -16,7 +16,7 @@ "GET" ], "patterns": [ - "{indices}/_field_usage_stats" + "{index}/_field_usage_stats" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/field-usage-stats.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json index 63c86d10a986..9871e2aab0e6 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.flush.json @@ -19,7 +19,7 @@ ], "patterns": [ "_flush", - "{indices}/_flush" + "{index}/_flush" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-flush.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json index fea4c30db887..d4134054f8bb 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.forcemerge.json @@ -20,7 +20,7 @@ ], "patterns": [ "_forcemerge", - "{indices}/_forcemerge" + "{index}/_forcemerge" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-forcemerge.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json index 1e1cc702c3ed..f8866762b7ab 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get.json @@ -24,7 +24,7 @@ "GET" ], "patterns": [ - "{indices}" + "{index}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-index.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json index 95bc74edc586..21c740676043 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_alias.json @@ -18,8 +18,8 @@ "patterns": [ "_alias", "_alias/{name}", - "{indices}/_alias/{name}", - "{indices}/_alias" + "{index}/_alias/{name}", + "{index}/_alias" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_lifecycle.json index 4ec665ef8297..756166be9c5c 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_lifecycle.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_data_lifecycle.json @@ -16,6 +16,6 @@ "patterns": [ "_data_stream/{name}/_lifecycle" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/dlm-get-lifecycle.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-get-lifecycle.html" } } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json index c50919af0a2f..d14659b48934 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_field_mapping.json @@ -18,7 +18,7 @@ ], "patterns": [ "_mapping/field/{fields}", - "{indices}/_mapping/field/{fields}" + "{index}/_mapping/field/{fields}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-field-mapping.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json index f484f0dca066..4c5b291167d3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_mapping.json @@ -18,7 +18,7 @@ ], "patterns": [ "_mapping", - "{indices}/_mapping" + "{index}/_mapping" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-mapping.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json index a6777f7a820a..f2e0e1d1b2a2 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.get_settings.json @@ -20,8 +20,8 @@ ], "patterns": [ "_settings", - "{indices}/_settings", - "{indices}/_settings/{name}", + "{index}/_settings", + "{index}/_settings/{name}", "_settings/{name}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-get-settings.html" diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json index 636923873920..54b2bbc9a284 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.open.json @@ -18,7 +18,7 @@ "POST" ], "patterns": [ - "{indices}/_open" + "{index}/_open" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-open-close.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json index a6e9091296b3..6661fe7c0435 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_alias.json @@ -9,8 +9,8 @@ "POST" ], "patterns": [ - "{indices}/_alias/{name}", - "{indices}/_aliases/{name}" + "{index}/_alias/{name}", + "{index}/_aliases/{name}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-aliases.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_data_lifecycle.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_data_lifecycle.json index f888d749fcb7..0d52c9907389 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_data_lifecycle.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_data_lifecycle.json @@ -17,6 +17,6 @@ "patterns": [ "_data_stream/{name}/_lifecycle" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/dlm-put-lifecycle.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/data-streams-put-lifecycle.html" } } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json index 5b8ce2b8b435..34c1aa091257 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_mapping.json @@ -19,7 +19,7 @@ "POST" ], "patterns": [ - "{indices}/_mapping" + "{index}/_mapping" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-put-mapping.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json index a2508cd0fc81..86b1c92c2d5e 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.put_settings.json @@ -20,7 +20,7 @@ ], "patterns": [ "_settings", - "{indices}/_settings" + "{index}/_settings" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-update-settings.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.recovery.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.recovery.json index fc3eadb23bba..4f3fc8f20b11 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.recovery.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.recovery.json @@ -9,7 +9,7 @@ ], "patterns": [ "_recovery", - "{indices}/_recovery" + "{index}/_recovery" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-recovery.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json index 2906349d3fda..09ab37200401 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.refresh.json @@ -17,7 +17,7 @@ ], "patterns": [ "_refresh", - "{indices}/_refresh" + "{index}/_refresh" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-refresh.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json index d4d1d8c52b34..94b60cdf9c44 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.reload_search_analyzers.json @@ -9,14 +9,15 @@ "hidden", "none", "all" - ] + ], + "resource": "" }, "methods": [ "GET", "POST" ], "patterns": [ - "{indices}/_reload_search_analyzers" + "{index}/_reload_search_analyzers" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-reload-analyzers.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json index b3c07150699a..c88f452620c7 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.segments.json @@ -17,7 +17,7 @@ ], "patterns": [ "_segments", - "{indices}/_segments" + "{index}/_segments" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-segments.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json index c50f4cf50169..02a7ffe18c7a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shard_stores.json @@ -17,7 +17,7 @@ ], "patterns": [ "_shard_stores", - "{indices}/_shard_stores" + "{index}/_shard_stores" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shards-stores.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json index 31acc86a2fa5..c3d002e5e17a 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.shrink.json @@ -10,7 +10,7 @@ "POST" ], "patterns": [ - "{indices}/_shrink/{target}" + "{index}/_shrink/{target}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-shrink-index.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json index 1bfbaa078b79..7cc1d4ccd955 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.split.json @@ -10,7 +10,7 @@ "POST" ], "patterns": [ - "{indices}/_split/{target}" + "{index}/_split/{target}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-split-index.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json index 000d731c4244..cdf5c6f7ffa3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.stats.json @@ -26,12 +26,12 @@ ], "patterns": [ "_stats", - "_stats/{metrics}", - "{indices}/_stats", - "{indices}/_stats/{metrics}" + "_stats/{metric}", + "{index}/_stats", + "{index}/_stats/{metric}" ], "url_components": { - "metrics": [ + "metric": [ "_all", "bulk", "completion", @@ -49,7 +49,7 @@ "store", "warmer" ], - "indices": null + "index": null }, "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-stats.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json index 315aa13d4b4e..67d59fabcdd3 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/indices.validate_query.json @@ -29,7 +29,7 @@ ], "patterns": [ "_validate/query", - "{indices}/_validate/query" + "{index}/_validate/query" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-validate.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/knn_search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/knn_search.json index 0e1303c66d10..ff402f6c6ce2 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/knn_search.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/knn_search.json @@ -8,7 +8,7 @@ "POST" ], "patterns": [ - "{indices}/_knn_search" + "{index}/_knn_search" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/mget.json b/src/plugins/console/server/lib/spec_definitions/json/generated/mget.json index 517e3fa4bab1..a9e4b9fe4e24 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/mget.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/mget.json @@ -17,7 +17,7 @@ ], "patterns": [ "_mget", - "{indices}/_mget" + "{index}/_mget" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-get.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/migration.deprecations.json b/src/plugins/console/server/lib/spec_definitions/json/generated/migration.deprecations.json index 597791a2439c..754e969b684d 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/migration.deprecations.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/migration.deprecations.json @@ -5,7 +5,7 @@ ], "patterns": [ "_migration/deprecations", - "{indices}/_migration/deprecations" + "{index}/_migration/deprecations" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/migration-api-deprecation.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_memory_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_memory_stats.json index 8ec5a7b8f5b3..6999d52a51df 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_memory_stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/ml.get_memory_stats.json @@ -9,7 +9,7 @@ ], "patterns": [ "_ml/memory/_stats", - "_ml/memory/{nodes}/_stats" + "_ml/memory/{node_id}/_stats" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-ml-memory.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json index d460bf2b1add..beb1ea05b561 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch.json @@ -18,7 +18,7 @@ ], "patterns": [ "_msearch", - "{indices}/_msearch" + "{index}/_msearch" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-multi-search.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json index cc7cfbd6e82b..d78dc2720522 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/msearch_template.json @@ -16,7 +16,7 @@ ], "patterns": [ "_msearch/template", - "{indices}/_msearch/template" + "{index}/_msearch/template" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-multi-search.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json b/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json index 20c3daca849c..b970626fee30 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/mtermvectors.json @@ -24,7 +24,7 @@ ], "patterns": [ "_mtermvectors", - "{indices}/_mtermvectors" + "{index}/_mtermvectors" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-multi-termvectors.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.clear_repositories_metering_archive.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.clear_repositories_metering_archive.json index ac16d8ff85b9..72e681a40346 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.clear_repositories_metering_archive.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.clear_repositories_metering_archive.json @@ -4,7 +4,7 @@ "DELETE" ], "patterns": [ - "_nodes/{nodes}/_repositories_metering/{max_archive_version}" + "_nodes/{node_id}/_repositories_metering/{max_archive_version}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/clear-repositories-metering-archive-api.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.get_repositories_metering_info.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.get_repositories_metering_info.json index 0a9f3d66d6c6..89024c3c9ad4 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.get_repositories_metering_info.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.get_repositories_metering_info.json @@ -4,7 +4,7 @@ "GET" ], "patterns": [ - "_nodes/{nodes}/_repositories_metering" + "_nodes/{node_id}/_repositories_metering" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/get-repositories-metering-api.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.hot_threads.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.hot_threads.json index 37fd696a4bd5..39d3cc933906 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.hot_threads.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.hot_threads.json @@ -22,7 +22,7 @@ ], "patterns": [ "_nodes/hot_threads", - "_nodes/{nodes}/hot_threads" + "_nodes/{node_id}/hot_threads" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-hot-threads.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.info.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.info.json index 6cc8cb62ed58..d77a769c289b 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.info.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.info.json @@ -9,13 +9,13 @@ ], "patterns": [ "_nodes", - "_nodes/{nodes}", - "_nodes/{metrics}", - "_nodes/{nodes}/{metrics}" + "_nodes/{node_id}", + "_nodes/{metric}", + "_nodes/{node_id}/{metric}" ], "url_components": { - "nodes": null, - "metrics": [ + "node_id": null, + "metric": [ "_all", "_none", "aggregations", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.reload_secure_settings.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.reload_secure_settings.json index ea3960ced4da..1d3ffc73fda4 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.reload_secure_settings.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.reload_secure_settings.json @@ -8,7 +8,7 @@ ], "patterns": [ "_nodes/reload_secure_settings", - "_nodes/{nodes}/reload_secure_settings" + "_nodes/{node_id}/reload_secure_settings" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/secure-settings.html#reloadable-secure-settings" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json index cff42a44080e..79273815e4f8 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.stats.json @@ -20,15 +20,15 @@ ], "patterns": [ "_nodes/stats", - "_nodes/{nodes}/stats", - "_nodes/stats/{metrics}", - "_nodes/{nodes}/stats/{metrics}", - "_nodes/stats/{metrics}/{index_metric}", - "_nodes/{nodes}/stats/{metrics}/{index_metric}" + "_nodes/{node_id}/stats", + "_nodes/stats/{metric}", + "_nodes/{node_id}/stats/{metric}", + "_nodes/stats/{metric}/{index_metric}", + "_nodes/{node_id}/stats/{metric}/{index_metric}" ], "url_components": { - "nodes": null, - "metrics": [ + "node_id": null, + "metric": [ "_all", "breaker", "discovery", diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.usage.json b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.usage.json index fbd55c82f68c..d23a786e0e06 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.usage.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/nodes.usage.json @@ -8,13 +8,13 @@ ], "patterns": [ "_nodes/usage", - "_nodes/{nodes}/usage", - "_nodes/usage/{metrics}", - "_nodes/{nodes}/usage/{metrics}" + "_nodes/{node_id}/usage", + "_nodes/usage/{metric}", + "_nodes/{node_id}/usage/{metric}" ], "url_components": { - "nodes": null, - "metrics": [ + "node_id": null, + "metric": [ "_all", "rest_actions" ] diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/open_point_in_time.json b/src/plugins/console/server/lib/spec_definitions/json/generated/open_point_in_time.json index d3d827d3a174..f5308c483646 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/open_point_in_time.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/open_point_in_time.json @@ -17,7 +17,7 @@ "POST" ], "patterns": [ - "{indices}/_pit" + "{index}/_pit" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/point-in-time-api.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json index 4d73e58bd4c0..a74ba2a792e6 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rank_eval.json @@ -21,7 +21,7 @@ ], "patterns": [ "_rank_eval", - "{indices}/_rank_eval" + "{index}/_rank_eval" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-rank-eval.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json index f7ae6d14f675..d21b233eceda 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.get_rollup_index_caps.json @@ -4,7 +4,7 @@ "GET" ], "patterns": [ - "{indices}/_rollup/data" + "{index}/_rollup/data" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-get-rollup-index-caps.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup_search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup_search.json index 431e5e532a32..ddb57be11cd5 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup_search.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/rollup.rollup_search.json @@ -9,7 +9,7 @@ "POST" ], "patterns": [ - "{indices}/_rollup_search" + "{index}/_rollup_search" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/rollup-search.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search.json index bf3af69c177e..fa8858a85f8b 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/search.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search.json @@ -69,7 +69,7 @@ ], "patterns": [ "_search", - "{indices}/_search" + "{index}/_search" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-search.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search_mvt.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search_mvt.json index eb88ce040505..e3c5df8e04bf 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/search_mvt.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search_mvt.json @@ -18,7 +18,7 @@ "GET" ], "patterns": [ - "{indices}/_mvt/{field}/{zoom}/{x}/{y}" + "{index}/_mvt/{field}/{zoom}/{x}/{y}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-vector-tile-api.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json index b0819f8e066c..917345b68e4f 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search_shards.json @@ -20,7 +20,7 @@ ], "patterns": [ "_search_shards", - "{indices}/_search_shards" + "{index}/_search_shards" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-shards.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json b/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json index 6d7b3aa34c10..7e23c4a10e31 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/search_template.json @@ -30,7 +30,7 @@ ], "patterns": [ "_search/template", - "{indices}/_search/template" + "{index}/_search/template" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.cache_stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.cache_stats.json index f30d8bca6005..51d9067b5ba4 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.cache_stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.cache_stats.json @@ -5,7 +5,7 @@ ], "patterns": [ "_searchable_snapshots/cache/stats", - "_searchable_snapshots/{nodes}/cache/stats" + "_searchable_snapshots/{node_id}/cache/stats" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.clear_cache.json b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.clear_cache.json index 428991f758cd..3eea01d03125 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.clear_cache.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.clear_cache.json @@ -16,7 +16,7 @@ ], "patterns": [ "_searchable_snapshots/cache/clear", - "{indices}/_searchable_snapshots/cache/clear" + "{index}/_searchable_snapshots/cache/clear" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.stats.json index ecbceeea572a..a05f3b9dbede 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/searchable_snapshots.stats.json @@ -12,7 +12,7 @@ ], "patterns": [ "_searchable_snapshots/stats", - "{indices}/_searchable_snapshots/stats" + "{index}/_searchable_snapshots/stats" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/searchable-snapshots-apis.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.delete_node.json b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.delete_node.json index 18605b2afc54..118bf5d9502e 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.delete_node.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.delete_node.json @@ -4,7 +4,7 @@ "DELETE" ], "patterns": [ - "_nodes/{nodes}/shutdown" + "_nodes/{node_id}/shutdown" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.get_node.json b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.get_node.json index 0b9c9139b57e..eed87b389813 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.get_node.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.get_node.json @@ -5,7 +5,7 @@ ], "patterns": [ "_nodes/shutdown", - "_nodes/{nodes}/shutdown" + "_nodes/{node_id}/shutdown" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.put_node.json b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.put_node.json index aee49831305f..25eeafce73e9 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.put_node.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/shutdown.put_node.json @@ -4,7 +4,7 @@ "PUT" ], "patterns": [ - "_nodes/{nodes}/shutdown" + "_nodes/{node_id}/shutdown" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/terms_enum.json b/src/plugins/console/server/lib/spec_definitions/json/generated/terms_enum.json index c1cb06b8a195..c65afcabab74 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/terms_enum.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/terms_enum.json @@ -5,7 +5,7 @@ "POST" ], "patterns": [ - "{indices}/_terms_enum" + "{index}/_terms_enum" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/search-terms-enum.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json b/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json index 53ea7a9d6cbf..aa48158a4e56 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/termvectors.json @@ -22,8 +22,8 @@ "POST" ], "patterns": [ - "{indices}/_termvectors/{id}", - "{indices}/_termvectors" + "{index}/_termvectors/{id}", + "{index}/_termvectors" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-termvectors.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/update.json b/src/plugins/console/server/lib/spec_definitions/json/generated/update.json index 4dd33978a77b..9786a5c1054c 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/update.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/update.json @@ -22,7 +22,7 @@ "POST" ], "patterns": [ - "{indices}/_update/{id}" + "{index}/_update/{id}" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json b/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json index 5054ba7f4f49..8fa414a1bd8c 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/update_by_query.json @@ -52,7 +52,7 @@ "POST" ], "patterns": [ - "{indices}/_update_by_query" + "{index}/_update_by_query" ], "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update-by-query.html" } diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stats.json b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stats.json index d19446e0f5bb..b196c59e1dfb 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stats.json +++ b/src/plugins/console/server/lib/spec_definitions/json/generated/watcher.stats.json @@ -9,10 +9,10 @@ ], "patterns": [ "_watcher/stats", - "_watcher/stats/{metrics}" + "_watcher/stats/{metric}" ], "url_components": { - "metrics": [ + "metric": [ "_all", "current_watches", "pending_watches", diff --git a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.reroute.json b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.reroute.json index 27a403970c51..da83fbe2195e 100644 --- a/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.reroute.json +++ b/src/plugins/console/server/lib/spec_definitions/json/overrides/cluster.reroute.json @@ -12,8 +12,8 @@ }, "index": "{index}", "shard": 0, - "from_node": "{node}", - "to_node": "{node}" + "from_node": "", + "to_node": "" }, "cancel": { "__template": { @@ -23,7 +23,7 @@ }, "index": "{index}", "shard": 0, - "node": "{node}", + "node": "", "allow_primary": { "__one_of": [true, false] } }, "allocate": { @@ -34,7 +34,7 @@ }, "index": "{index}", "shard": 0, - "node": "{node}", + "node": "", "allow_primary": { "__one_of": [true, false] } } } diff --git a/src/plugins/console/server/services/spec_definitions_service.ts b/src/plugins/console/server/services/spec_definitions_service.ts index 7ce647152d64..2e93c2f7a0a3 100644 --- a/src/plugins/console/server/services/spec_definitions_service.ts +++ b/src/plugins/console/server/services/spec_definitions_service.ts @@ -55,7 +55,7 @@ export class SpecDefinitionsService { | undefined; _.each(description.patterns || [], function (p) { - if (p.indexOf('{indices}') >= 0) { + if (p.indexOf('{index}') >= 0) { urlParamsDef = urlParamsDef || {}; urlParamsDef.ignore_unavailable = '__flag__'; urlParamsDef.allow_no_indices = '__flag__';