Merge branch '7.x' into backport/7.x/pr-56140

src/core/server/config/deprecation/core_deprecations.ts

@@ -119,56 +119,6 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   renameFromRoot('xpack.telemetry.config', 'telemetry.config'),
   renameFromRoot('xpack.telemetry.banner', 'telemetry.banner'),
   renameFromRoot('xpack.telemetry.url', 'telemetry.url'),
-  // Monitoring renames
-  // TODO: Remove these from here once the monitoring plugin is migrated to NP
-  renameFromRoot('xpack.monitoring.enabled', 'monitoring.enabled'),
-  renameFromRoot('xpack.monitoring.ui.enabled', 'monitoring.ui.enabled'),
-  renameFromRoot(
-    'xpack.monitoring.kibana.collection.enabled',
-    'monitoring.kibana.collection.enabled'
-  ),
-  renameFromRoot('xpack.monitoring.max_bucket_size', 'monitoring.ui.max_bucket_size'),
-  renameFromRoot('xpack.monitoring.min_interval_seconds', 'monitoring.ui.min_interval_seconds'),
-  renameFromRoot(
-    'xpack.monitoring.show_license_expiration',
-    'monitoring.ui.show_license_expiration'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.ui.container.elasticsearch.enabled',
-    'monitoring.ui.container.elasticsearch.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.ui.container.logstash.enabled',
-    'monitoring.ui.container.logstash.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.tests.cloud_detector.enabled',
-    'monitoring.tests.cloud_detector.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.kibana.collection.interval',
-    'monitoring.kibana.collection.interval'
-  ),
-  renameFromRoot('xpack.monitoring.elasticsearch.hosts', 'monitoring.ui.elasticsearch.hosts'),
-  renameFromRoot('xpack.monitoring.elasticsearch.username', 'monitoring.ui.elasticsearch.username'),
-  renameFromRoot('xpack.monitoring.elasticsearch.password', 'monitoring.ui.elasticsearch.password'),
-  renameFromRoot(
-    'xpack.monitoring.xpack_api_polling_frequency_millis',
-    'monitoring.xpack_api_polling_frequency_millis'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.cluster_alerts.email_notifications.enabled',
-    'monitoring.cluster_alerts.email_notifications.enabled'
-  ),
-  renameFromRoot(
-    'xpack.monitoring.cluster_alerts.email_notifications.email_address',
-    'monitoring.cluster_alerts.email_notifications.email_address'
-  ),
-  renameFromRoot('xpack.monitoring.ccs.enabled', 'monitoring.ui.ccs.enabled'),
-  renameFromRoot(
-    'xpack.monitoring.elasticsearch.logFetchCount',
-    'monitoring.ui.elasticsearch.logFetchCount'
-  ),
   configPathDeprecation,
   dataPathDeprecation,
   rewriteBasePathDeprecation,

x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js

@@ -50,14 +50,6 @@ jest.mock('@elastic/eui/packages/react-datepicker', () => {
 
 jest.mock('plugins/interpreter/registries', () => ({}));
 
-// Disabling this test due to https://github.com/elastic/eui/issues/2242
-jest.mock(
-  '../public/components/workpad_header/workpad_export/__examples__/disabled_panel.stories',
-  () => {
-    return 'Disabled Panel';
-  }
-);
-
 // Disabling this test due to https://github.com/elastic/eui/issues/2242
 jest.mock(
   '../public/components/workpad_header/workpad_export/flyout/__examples__/share_website_flyout.stories',

x-pack/legacy/plugins/canvas/i18n/angular.ts → x-pack/legacy/plugins/canvas/i18n/capabilities.ts

@@ -7,13 +7,13 @@
 import { i18n } from '@kbn/i18n';
 import { CANVAS as canvas } from './constants';
 
-export const AngularStrings = {
-  CanvasRootController: {
-    getReadOnlyBadgeText: () =>
+export const CapabilitiesStrings = {
+  ReadOnlyBadge: {
+    getText: () =>
       i18n.translate('xpack.canvas.badge.readOnly.text', {
         defaultMessage: 'Read only',
       }),
-    getReadOnlyBadgeTooltip: () =>
+    getTooltip: () =>
       i18n.translate('xpack.canvas.badge.readOnly.tooltip', {
         defaultMessage: 'Unable to save {canvas} workpads',
         values: {

x-pack/legacy/plugins/canvas/i18n/index.ts

@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-export * from './angular';
+export * from './capabilities';
 export * from './components';
 export * from './constants';
 export * from './errors';

x-pack/legacy/plugins/canvas/public/application.tsx

@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { Store } from 'redux';
+import ReactDOM from 'react-dom';
+import { I18nProvider } from '@kbn/i18n/react';
+import { Provider } from 'react-redux';
+
+import { AppMountParameters, CoreStart } from 'kibana/public';
+
+// @ts-ignore Untyped local
+import { App } from './components/app';
+import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+
+export const renderApp = (
+  coreStart: CoreStart,
+  plugins: object,
+  { element }: AppMountParameters,
+  canvasStore: Store
+) => {
+  ReactDOM.render(
+    <KibanaContextProvider services={{ ...coreStart, ...plugins }}>
+      <I18nProvider>
+        <Provider store={canvasStore}>
+          <App />
+        </Provider>
+      </I18nProvider>
+    </KibanaContextProvider>,
+    element
+  );
+  return () => ReactDOM.unmountComponentAtNode(element);
+};