Skip to content

Commit 9f46566

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.9' into backport/7.9/pr-71952
2 parents 60894ea + 43c9d0f commit 9f46566

93 files changed

Lines changed: 3581 additions & 941 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/visualize/images/vega_lite_tutorial_1.png‎

264 KB
Loading

‎docs/visualize/images/vega_lite_tutorial_2.png‎

68.2 KB
Loading

‎docs/visualize/images/vega_tutorial_3.png‎

82.1 KB
Loading

‎docs/visualize/images/vega_tutorial_4.png‎

125 KB
Loading

‎docs/visualize/vega.asciidoc‎

Lines changed: 1353 additions & 81 deletions
Large diffs are not rendered by default.

‎src/core/public/doc_links/doc_links_service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ export class DocLinksService {
111111
},
112112
kibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index.html`,
113113
siem: {
114-
guide: `${ELASTIC_WEBSITE_URL}guide/en/siem/guide/${DOC_LINK_VERSION}/index.html`,
115-
gettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/siem/guide/${DOC_LINK_VERSION}/install-siem.html`,
114+
guide: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/index.html`,
115+
gettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/install-siem.html`,
116116
},
117117
query: {
118118
luceneQuerySyntax: `${ELASTICSEARCH_DOCS}query-dsl-query-string-query.html#query-string-syntax`,

‎src/es_archiver/lib/indices/create_index_stream.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919

2020
import { Transform, Readable } from 'stream';
21+
import { inspect } from 'util';
22+
2123
import { get, once } from 'lodash';
2224
import { Client } from 'elasticsearch';
2325
import { ToolingLog } from '@kbn/dev-utils';
@@ -88,6 +90,18 @@ export function createCreateIndexStream({
8890

8991
stats.createdIndex(index, { settings });
9092
} catch (err) {
93+
if (
94+
err?.body?.error?.reason?.includes('index exists with the same name as the alias') &&
95+
attemptNumber < 3
96+
) {
97+
const aliasStr = inspect(aliases);
98+
log.info(
99+
`failed to create aliases [${aliasStr}] because ES indicated an index/alias already exists, trying again`
100+
);
101+
await attemptToCreate(attemptNumber + 1);
102+
return;
103+
}
104+
91105
if (
92106
get(err, 'body.error.type') !== 'resource_already_exists_exception' ||
93107
attemptNumber >= 3

‎src/plugins/dev_tools/public/plugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup, void> {
6161
}),
6262
updater$: this.appStateUpdater,
6363
euiIconType: 'devToolsApp',
64-
order: 9001,
64+
order: 9010,
6565
category: DEFAULT_APP_CATEGORIES.management,
6666
mount: async (params: AppMountParameters) => {
6767
const { element, history } = params;

‎src/plugins/management/public/plugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart
6565
title: i18n.translate('management.stackManagement.title', {
6666
defaultMessage: 'Stack Management',
6767
}),
68-
order: 9003,
68+
order: 9040,
6969
euiIconType: 'managementApp',
7070
category: DEFAULT_APP_CATEGORIES.management,
7171
async mount(params: AppMountParameters) {

‎src/plugins/vis_type_vega/public/vega_view/vega_base_view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export class VegaBaseView {
147147
defaultMessage:
148148
'External URLs are not enabled. Add {enableExternalUrls} to {kibanaConfigFileName}',
149149
values: {
150-
enableExternalUrls: 'vega.enableExternalUrls: true',
150+
enableExternalUrls: 'vis_type_vega.enableExternalUrls: true',
151151
kibanaConfigFileName: 'kibana.yml',
152152
},
153153
})

0 commit comments

Comments
 (0)