Merge branch 'master' into task/ingest-68914-datasource-api-hooks

Author: elasticmachine

x-pack/.i18nrc.json

@@ -11,7 +11,7 @@
     "xpack.dashboard": "plugins/dashboard_enhanced",
     "xpack.discover": "plugins/discover_enhanced",
     "xpack.crossClusterReplication": "plugins/cross_cluster_replication",
-    "xpack.dashboardMode": "legacy/plugins/dashboard_mode",
+    "xpack.dashboardMode": "plugins/dashboard_mode",
     "xpack.data": "plugins/data_enhanced",
     "xpack.embeddableEnhanced": "plugins/embeddable_enhanced",
     "xpack.endpoint": "plugins/endpoint",

x-pack/index.js

@@ -7,7 +7,6 @@
 import { xpackMain } from './legacy/plugins/xpack_main';
 import { monitoring } from './legacy/plugins/monitoring';
 import { security } from './legacy/plugins/security';
-import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
 import { spaces } from './legacy/plugins/spaces';
 import { ingestManager } from './legacy/plugins/ingest_manager';
@@ -18,8 +17,7 @@ module.exports = function (kibana) {
     monitoring(kibana),
     spaces(kibana),
     security(kibana),
-    dashboardMode(kibana),
-    beats(kibana),
     ingestManager(kibana),
+    beats(kibana),
   ];
 };

x-pack/legacy/plugins/dashboard_mode/index.js

@@ -8,6 +8,7 @@ import { resolve } from 'path';
 export function ingestManager(kibana: any) {
   return new kibana.Plugin({
     id: 'ingestManager',
+    require: ['kibana', 'elasticsearch', 'xpack_main'],
     publicDir: resolve(__dirname, '../../../plugins/ingest_manager/public'),
   });
 }

x-pack/legacy/plugins/dashboard_mode/server/__tests__/dashboard_mode_request_interceptor.js

@@ -4,4 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { createDashboardModeRequestInterceptor } from './dashboard_mode_request_interceptor';
+export const UI_SETTINGS = {
+  CONFIG_DASHBOARD_ONLY_MODE_ROLES: 'xpackDashboardMode:roles',
+};

x-pack/legacy/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js

@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './constants';
+export { UI_SETTINGS } from './constants';

x-pack/legacy/plugins/ingest_manager/index.ts

@@ -3,10 +3,13 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": [
-    "xpack", "dashboard_mode"
+    "xpack",
+    "dashboard_mode"
   ],
+  "optionalPlugins": ["security"],
   "requiredPlugins": [
-    "kibanaLegacy", "dashboard"
+    "kibanaLegacy",
+    "dashboard"
   ],
   "server": true,
   "ui": true

x-pack/legacy/plugins/dashboard_mode/server/index.js renamed to x-pack/plugins/dashboard_mode/common/constants.ts

@@ -4,17 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PluginConfigDescriptor } from 'kibana/server';
-
+import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 
+import { DashboardModeServerPlugin } from './plugin';
+
 export const config: PluginConfigDescriptor = {
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
   }),
 };
 
-export const plugin = () => ({
-  setup() {},
-  start() {},
-});
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new DashboardModeServerPlugin(initializerContext);
+}
+
+export { DashboardModeServerPlugin as Plugin };