Merge branch 'master' of github.com:elastic/kibana into implement/ftr…

…-docker-servers

src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx

@@ -21,7 +21,7 @@ import moment from 'moment';
 import { Subscription } from 'rxjs';
 import { History } from 'history';
 
-import { ViewMode } from '../../../../embeddable_api/public/np_ready/public';
+import { ViewMode } from '../../../../../../plugins/embeddable/public';
 import { SavedObjectDashboard } from '../../../../../../plugins/dashboard/public';
 import { DashboardAppState, SavedDashboardPanel } from './types';
 import {

src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx

@@ -58,7 +58,7 @@ import {
   isErrorEmbeddable,
   openAddPanelFlyout,
   ViewMode,
-} from '../../../../embeddable_api/public/np_ready/public';
+} from '../../../../../../plugins/embeddable/public';
 import { NavAction, SavedDashboardPanel } from './types';
 
 import { showOptionsPopover } from './top_nav/show_options_popover';

src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts

@@ -24,7 +24,7 @@ import {
 } from './embeddable_saved_object_converters';
 import { SavedDashboardPanel } from '../types';
 import { DashboardPanelState } from 'src/plugins/dashboard/public';
-import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public';
+import { EmbeddableInput } from 'src/plugins/embeddable/public';
 
 interface CustomInput extends EmbeddableInput {
   something: string;