Merge branch 'master' into fix-date-histogram

src/legacy/core_plugins/kibana/public/.eslintrc.js

@@ -77,7 +77,7 @@ module.exports = {
       {
         basePath: path.resolve(__dirname, '../../../../../'),
         zones: topLevelRestricedZones.concat(
-          buildRestrictedPaths(['visualize', 'discover', 'dashboard', 'devTools', 'home'])
+          buildRestrictedPaths(['visualize', 'discover', 'dashboard', 'devTools'])
         ),
       },
     ],

src/legacy/core_plugins/kibana/public/index.scss

@@ -13,15 +13,15 @@
 // Discover styles
 @import 'discover/index';
 
-// Home styles
-@import './home/index';
-
 // Visualize styles
 @import './visualize/index';
 // Has to come after visualize because of some
 // bad cascading in the Editor layout
 @import 'src/legacy/ui/public/vis/index';
 
+// Home styles
+@import '../../../../plugins/home/public/application/index';
+
 // Management styles
 @import './management/index';
 

src/legacy/core_plugins/kibana/public/kibana.js

@@ -42,7 +42,6 @@ import 'uiExports/shareContextMenuExtensions';
 import 'uiExports/interpreter';
 
 import 'ui/autoload/all';
-import './home';
 import './discover/legacy';
 import './visualize/legacy';
 import './dashboard/legacy';

src/legacy/core_plugins/kibana_react/index.ts

@@ -25,7 +25,6 @@ export default function DataPlugin(kibana: any) {
   const config: Legacy.PluginSpecOptions = {
     id: 'kibana_react',
     require: [],
-    publicDir: resolve(__dirname, 'public'),
     config: (Joi: any) => {
       return Joi.object({
         enabled: Joi.boolean().default(true),

src/legacy/core_plugins/kibana_react/public/index.ts

@@ -17,10 +17,4 @@
  * under the License.
  */
 
-// TODO these are imports from the old plugin world.
-// Once the new platform is ready, they can get removed
-// and handled by the platform itself in the setup method
-// of the ExpressionExectorService
-
-/** @public types */
-export { Markdown, MarkdownSimple } from './markdown';
+export { Markdown, MarkdownSimple } from '../../../../plugins/kibana_react/public';

src/legacy/ui/public/new_platform/new_platform.karma_mock.js

@@ -213,6 +213,9 @@ export const npSetup = {
       config: {
         disableWelcomeScreen: false,
       },
+      tutorials: {
+        setVariable: sinon.fake(),
+      },
     },
     charts: {
       theme: {
@@ -381,18 +384,6 @@ export const npStart = {
       getTriggerActions: sinon.fake(),
       getTriggerCompatibleActions: sinon.fake(),
     },
-    home: {
-      featureCatalogue: {
-        get: sinon.fake(),
-        register: sinon.fake(),
-      },
-      environment: {
-        get: sinon.fake(),
-      },
-      config: {
-        disableWelcomeScreen: false,
-      },
-    },
     navigation: {
       ui: {
         TopNavMenu: mockComponent,

src/legacy/ui/public/new_platform/new_platform.ts

@@ -37,7 +37,7 @@ import {
 import { ChartsPluginSetup, ChartsPluginStart } from '../../../../plugins/charts/public';
 import { DevToolsSetup, DevToolsStart } from '../../../../plugins/dev_tools/public';
 import { KibanaLegacySetup, KibanaLegacyStart } from '../../../../plugins/kibana_legacy/public';
-import { HomePublicPluginSetup, HomePublicPluginStart } from '../../../../plugins/home/public';
+import { HomePublicPluginSetup } from '../../../../plugins/home/public';
 import { SharePluginSetup, SharePluginStart } from '../../../../plugins/share/public';
 import {
   AdvancedSettingsSetup,
@@ -79,7 +79,6 @@ export interface PluginsStart {
   data: ReturnType<DataPlugin['start']>;
   embeddable: IEmbeddableStart;
   expressions: ReturnType<ExpressionsPlugin['start']>;
-  home: HomePublicPluginStart;
   inspector: InspectorStart;
   uiActions: UiActionsStart;
   navigation: NavigationPublicPluginStart;

src/legacy/ui/public/url/redirect_when_missing.js

@@ -19,7 +19,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { MarkdownSimple } from '../../../core_plugins/kibana_react/public/markdown';
+import { MarkdownSimple } from '../../../../plugins/kibana_react/public';
 import { toastNotifications } from 'ui/notify';
 import { SavedObjectNotFound } from '../../../../plugins/kibana_utils/public';
 import { uiModules } from '../modules';

src/plugins/console/server/lib/proxy_request.test.ts

@@ -30,11 +30,6 @@ describe(`Console's send request`, () => {
   beforeEach(() => {
     sandbox = sinon.createSandbox();
     stub = sandbox.stub(http, 'request').callsFake(() => {
-      fakeRequest = {
-        abort: sinon.stub(),
-        on() {},
-        once() {},
-      } as any;
       return fakeRequest;
     });
   });
@@ -45,6 +40,11 @@ describe(`Console's send request`, () => {
   });
 
   it('correctly implements timeout and abort mechanism', async () => {
+    fakeRequest = {
+      abort: sinon.stub(),
+      on() {},
+      once() {},
+    } as any;
     try {
       await proxyRequest({
         agent: null as any,
@@ -60,4 +60,55 @@ describe(`Console's send request`, () => {
       expect((fakeRequest.abort as sinon.SinonStub).calledOnce).toBe(true);
     }
   });
+
+  it('correctly sets the "host" header entry', async () => {
+    fakeRequest = {
+      abort: sinon.stub(),
+      on() {},
+      once(event: string, fn: any) {
+        if (event === 'response') {
+          return fn('done');
+        }
+      },
+    } as any;
+
+    // Don't set a host header this time
+    const result1 = await proxyRequest({
+      agent: null as any,
+      headers: {},
+      method: 'get',
+      payload: null as any,
+      timeout: 30000,
+      uri: new URL('http://noone.nowhere.none'),
+    });
+
+    expect(result1).toEqual('done');
+
+    const [httpRequestOptions1] = stub.firstCall.args;
+
+    expect((httpRequestOptions1 as any).headers).toEqual({
+      'content-type': 'application/json',
+      host: 'noone.nowhere.none', // Defaults to the provided host name
+      'transfer-encoding': 'chunked',
+    });
+
+    // Set a host header
+    const result2 = await proxyRequest({
+      agent: null as any,
+      headers: { Host: 'myhost' },
+      method: 'get',
+      payload: null as any,
+      timeout: 30000,
+      uri: new URL('http://noone.nowhere.none'),
+    });
+
+    expect(result2).toEqual('done');
+
+    const [httpRequestOptions2] = stub.secondCall.args;
+    expect((httpRequestOptions2 as any).headers).toEqual({
+      'content-type': 'application/json',
+      Host: 'myhost', // Uses provided host name
+      'transfer-encoding': 'chunked',
+    });
+  });
 });

src/plugins/console/server/lib/proxy_request.ts

@@ -57,19 +57,24 @@ export const proxyRequest = ({
     reject = rej;
   });
 
+  const finalUserHeaders = { ...headers };
+  const hasHostHeader = Object.keys(finalUserHeaders).some(key => key.toLowerCase() === 'host');
+  if (!hasHostHeader) {
+    finalUserHeaders.host = hostname;
+  }
+
   const req = client.request({
     method: method.toUpperCase(),
     // We support overriding this on a per request basis to support legacy proxy config. See ./proxy_config.
     rejectUnauthorized: typeof rejectUnauthorized === 'boolean' ? rejectUnauthorized : undefined,
     host: hostname,
-    port: port === '' ? undefined : Number(port),
+    port: port === '' ? undefined : parseInt(port, 10),
     protocol,
     path: `${pathname}${search || ''}`,
     headers: {
-      ...headers,
+      ...finalUserHeaders,
       'content-type': 'application/json',
       'transfer-encoding': 'chunked',
-      host: hostname,
     },
     agent,
   });

src/plugins/home/kibana.json

@@ -3,5 +3,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "optionalPlugins": ["usage_collection"]
+  "requiredPlugins": ["data", "kibanaLegacy"],
+  "optionalPlugins": ["usage_collection", "telemetry"]
 }

src/plugins/home/public/application/_index.scss

@@ -0,0 +1 @@
+@import 'components/index';

src/legacy/core_plugins/kibana/public/home/np_ready/application.tsx → src/plugins/home/public/application/application.tsx

@@ -22,10 +22,10 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
 import { HomeApp } from './components/home_app';
-import { getServices } from '../kibana_services';
+import { getServices } from './kibana_services';
 
 export const renderApp = async (element: HTMLElement) => {
-  const homeTitle = i18n.translate('kbn.home.breadcrumbs.homeTitle', { defaultMessage: 'Home' });
+  const homeTitle = i18n.translate('home.breadcrumbs.homeTitle', { defaultMessage: 'Home' });
   const { featureCatalogue, chrome } = getServices();
 
   // all the directories could be get in "start" phase of plugin after all of the legacy plugins will be moved to a NP