Merge branch '7.9' into backport/7.9/pr-71969

docs/CHANGELOG.asciidoc

@@ -42,20 +42,9 @@ This section summarizes the changes in each release.
 [[release-notes-7.8.1]]
 == {kib} 7.8.1
 
-See also <<breaking-changes-7.8,breaking changes in 7.8>>.
+coming::[7.8.1]
 
-[float]
-[[security-update-7.8.1]]
-=== Security updates
-* In {kib} 7.8.1 and earlier, there is a denial of service (DoS) flaw in Timelion. Attackers can construct a URL that when viewed
-by a {kib} user, the {kib} process consumes large amounts of CPU and becomes unresponsive, CVE-2020-7016.
-+
-You must upgrade to 7.8.1. If you are unable to upgrade, set `timelion.enabled` to `false` in your kibana.yml file to disable Timelion.
-
-* In all {kib} versions, region map visualizations contain a stored XSS flaw. Attackers that can edit or create region map visualizations can obtain sensitive information 
-or perform destructive actions on behalf of {kib} users who view the region map visualization, CVE-2020-7017.
-+
-You must upgrade to 7.8.1. If you are unable to upgrade, set `xpack.maps.enabled`, `region_map.enabled`, and `tile_map.enabled` to `false` in kibana.yml to disable map visualizations.
+See also <<breaking-changes-7.8,breaking changes in 7.8>>.
 
 [float]
 [[bug-v7.8.1]]

src/core/public/doc_links/doc_links_service.ts

@@ -111,8 +111,8 @@ export class DocLinksService {
         },
         kibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index.html`,
         siem: {
-          guide: `${ELASTIC_WEBSITE_URL}guide/en/siem/guide/${DOC_LINK_VERSION}/index.html`,
-          gettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/siem/guide/${DOC_LINK_VERSION}/install-siem.html`,
+          guide: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/index.html`,
+          gettingStarted: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/install-siem.html`,
         },
         query: {
           luceneQuerySyntax: `${ELASTICSEARCH_DOCS}query-dsl-query-string-query.html#query-string-syntax`,

src/es_archiver/lib/indices/create_index_stream.ts

@@ -18,6 +18,8 @@
  */
 
 import { Transform, Readable } from 'stream';
+import { inspect } from 'util';
+
 import { get, once } from 'lodash';
 import { Client } from 'elasticsearch';
 import { ToolingLog } from '@kbn/dev-utils';
@@ -88,6 +90,18 @@ export function createCreateIndexStream({
 
         stats.createdIndex(index, { settings });
       } catch (err) {
+        if (
+          err?.body?.error?.reason?.includes('index exists with the same name as the alias') &&
+          attemptNumber < 3
+        ) {
+          const aliasStr = inspect(aliases);
+          log.info(
+            `failed to create aliases [${aliasStr}] because ES indicated an index/alias already exists, trying again`
+          );
+          await attemptToCreate(attemptNumber + 1);
+          return;
+        }
+
         if (
           get(err, 'body.error.type') !== 'resource_already_exists_exception' ||
           attemptNumber >= 3

src/plugins/dev_tools/public/plugin.ts

@@ -61,7 +61,7 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup, void> {
       }),
       updater$: this.appStateUpdater,
       euiIconType: 'devToolsApp',
-      order: 9001,
+      order: 9010,
       category: DEFAULT_APP_CATEGORIES.management,
       mount: async (params: AppMountParameters) => {
         const { element, history } = params;

src/plugins/management/public/plugin.ts

@@ -65,7 +65,7 @@ export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart
       title: i18n.translate('management.stackManagement.title', {
         defaultMessage: 'Stack Management',
       }),
-      order: 9003,
+      order: 9040,
       euiIconType: 'managementApp',
       category: DEFAULT_APP_CATEGORIES.management,
       async mount(params: AppMountParameters) {

test/functional/apps/dashboard/dashboard_filter_bar.js

@@ -30,7 +30,8 @@ export default function ({ getService, getPageObjects }) {
   const browser = getService('browser');
   const PageObjects = getPageObjects(['common', 'dashboard', 'header', 'visualize', 'timePicker']);
 
-  describe('dashboard filter bar', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/71987
+  describe.skip('dashboard filter bar', () => {
     before(async () => {
       await esArchiver.load('dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({

test/functional/apps/management/_create_index_pattern_wizard.js

@@ -51,42 +51,6 @@ export default function ({ getService, getPageObjects }) {
       });
     });
 
-    describe('data streams', () => {
-      it('can be an index pattern', async () => {
-        await es.transport.request({
-          path: '/_index_template/generic-logs',
-          method: 'PUT',
-          body: {
-            index_patterns: ['logs-*', 'test_data_stream'],
-            template: {
-              mappings: {
-                properties: {
-                  '@timestamp': {
-                    type: 'date',
-                  },
-                },
-              },
-            },
-            data_stream: {
-              timestamp_field: '@timestamp',
-            },
-          },
-        });
-
-        await es.transport.request({
-          path: '/_data_stream/test_data_stream',
-          method: 'PUT',
-        });
-
-        await PageObjects.settings.createIndexPattern('test_data_stream', false);
-
-        await es.transport.request({
-          path: '/_data_stream/test_data_stream',
-          method: 'DELETE',
-        });
-      });
-    });
-
     describe('index alias', () => {
       it('can be an index pattern', async () => {
         await es.transport.request({

x-pack/plugins/apm/public/application/index.tsx

@@ -26,7 +26,6 @@ import {
 } from '../../../../../src/plugins/kibana_react/public';
 import { px, units } from '../style/variables';
 import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
-import { APMIndicesPermission } from '../components/app/APMIndicesPermission';
 import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
 import { routes } from '../components/app/Main/route_config';
 import { history, resetHistory } from '../utils/history';
@@ -52,13 +51,11 @@ const App = () => {
       <MainContainer data-test-subj="apmMainContainer" role="main">
         <UpdateBreadcrumbs routes={routes} />
         <Route component={ScrollToTopOnPathChange} />
-        <APMIndicesPermission>
-          <Switch>
-            {routes.map((route, i) => (
-              <ApmRoute key={i} {...route} />
-            ))}
-          </Switch>
-        </APMIndicesPermission>
+        <Switch>
+          {routes.map((route, i) => (
+            <ApmRoute key={i} {...route} />
+          ))}
+        </Switch>
       </MainContainer>
     </ThemeProvider>
   );