elastic · weltenwort · Jul 23, 2018 · Jul 17, 2018 · Jul 17, 2018 · Jul 17, 2018
diff --git a/docs/plugins/known-plugins.asciidoc b/docs/plugins/known-plugins.asciidoc
@@ -63,5 +63,6 @@ Use it to create, edit and embed visualizations, and also to search inside an em
 
 * https://github.com/sw-jung/kibana_markdown_doc_view[Markdown Doc View] (sw-jung) - A plugin for custom doc view using markdown+handlebars template.
 * https://github.com/datasweet-fr/kibana-datasweet-formula[Datasweet Formula] (datasweet) - enables calculated metric on any standard Kibana visualization.
+* https://github.com/pjhampton/kibana-prometheus-exporter[Prometheus Exporter] - exports the Kibana metrics in the prometheus format
 
 NOTE: If you want your plugin to be added to this page, open a {repo}tree/{branch}/docs/plugins/known-plugins.asciidoc[pull request].
diff --git a/docs/visualize/regionmap.asciidoc b/docs/visualize/regionmap.asciidoc
@@ -34,7 +34,7 @@ Configure a _Terms_ aggregation. The term is the _key_ that is used to join the
 ===== Layer Settings
 - *Vector map*: select from a list of vector maps. This list includes the maps that are hosted by the © https://www.elastic.co/elastic-maps-service[Elastic Maps Service],
 as well as your self-hosted layers that are configured in the *config/kibana.yml* file. To learn more about how to configure Kibana
-to make self-hosted layers available, see the <<regionmap-settings,regionmap settings>> documentation.
+to make self-hosted layers available, see the <<regionmap-settings,regionmap settings>> documentation. You can also explore and preview vector layers available in Elastic Maps Service at https://maps.elastic.co[https://maps.elastic.co].
 - *Join field*: this is the property from the selected vector map that will be used to join on the terms in your terms-aggregation. 
 When terms cannot be joined to any of the shapes in the vector layer because there is no exact match in the vector layer, Kibana will display a warning.
 To turn of these warnings, go to *Management/Kibana/Advanced Settings* and set `visualization:regionmap:showWarnings` to `false`.

diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
     "url": "https://github.com/elastic/kibana.git"
   },
   "dependencies": {
-    "@elastic/eui": "1.1.0",
+    "@elastic/eui": "3.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/numeral": "2.3.2",
     "@elastic/ui-ace": "0.2.3",
@@ -116,6 +116,7 @@
     "custom-event-polyfill": "^0.3.0",
     "d3": "3.5.6",
     "d3-cloud": "1.2.1",
+    "del": "^3.0.0",
     "dragula": "3.7.0",
     "elasticsearch": "^14.2.1",
     "elasticsearch-browser": "^14.2.1",
@@ -224,6 +225,8 @@
     "yauzl": "2.7.0"
   },
   "devDependencies": {
+    "@babel/parser": "7.0.0-beta.52",
+    "@babel/types": "7.0.0-beta.31",
     "@elastic/eslint-config-kibana": "link:packages/eslint-config-kibana",
     "@elastic/eslint-plugin-kibana-custom": "link:packages/eslint-plugin-kibana-custom",
     "@kbn/es": "link:packages/kbn-es",
@@ -238,6 +241,7 @@
     "@types/classnames": "^2.2.3",
     "@types/eslint": "^4.16.2",
     "@types/execa": "^0.9.0",
+    "@types/fetch-mock": "^5.12.2",
     "@types/getopts": "^2.0.0",
     "@types/glob": "^5.0.35",
     "@types/hapi-latest": "npm:@types/[email protected]",
@@ -270,7 +274,6 @@
     "chromedriver": "2.36",
     "classnames": "2.2.5",
     "dedent": "^0.7.0",
-    "del": "^3.0.0",
     "enzyme": "3.2.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "3.3.1",
@@ -307,6 +310,7 @@
     "jest-raw-loader": "^1.0.1",
     "jimp": "0.2.28",
     "jsdom": "9.9.1",
+    "json5": "^1.0.1",
     "karma": "1.7.0",
     "karma-chrome-launcher": "2.1.1",
     "karma-coverage": "1.1.1",

diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.js b/packages/kbn-dev-utils/src/proc_runner/proc.js
@@ -119,11 +119,12 @@ export function createProc(name, { cmd, args, cwd, env, stdin, log }) {
       await withTimeout(
         async () => {
           await treeKillAsync(childProcess.pid, signal);
+          await this.getOutcomePromise();
         },
         STOP_TIMEOUT,
         async () => {
           log.warning(
-            `Proc "${name}" was sent "${signal}" and didn't exit after ${STOP_TIMEOUT} ms, sending SIGKILL`
+            `Proc "${name}" was sent "${signal}" didn't emit the "exit" or "error" events after ${STOP_TIMEOUT} ms, sending SIGKILL`
           );
           await treeKillAsync(childProcess.pid, 'SIGKILL');
         }

diff --git a/packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js b/packages/kbn-eslint-import-resolver-kibana/lib/get_webpack_config.js
@@ -28,7 +28,6 @@ exports.getWebpackConfig = function(kibanaPath, projectRoot, config) {
   const alias = {
     // Kibana defaults https://github.com/elastic/kibana/blob/6998f074542e8c7b32955db159d15661aca253d7/src/ui/ui_bundler_env.js#L30-L36
     ui: fromKibana('src/ui/public'),
-    ui_framework: fromKibana('ui_framework'),
     test_harness: fromKibana('src/test_harness/public'),
     querystring: 'querystring-browser',
     moment$: fromKibana('webpackShims/moment'),

diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@kbn/i18n",
-  "browser": "./target/web",
-  "main": "./target/node",
+  "browser": "./target/web/browser.js",
+  "main": "./target/node/index.js",
   "module": "./src/index.js",
   "version": "1.0.0",
   "license": "Apache-2.0",

diff --git a/src/ui/public/courier/fetch/notifier.js → packages/kbn-i18n/src/browser.js b/src/ui/public/courier/fetch/notifier.js → packages/kbn-i18n/src/browser.js
@@ -17,10 +17,6 @@
  * under the License.
  */
 
-import { Notifier } from '../../notify';
+import * as i18nCore from './core';
 
-export const location = 'Courier fetch';
-
-export const courierNotifier = new Notifier({
-  location,
-});
+export const i18n = i18nCore;
diff --git a/packages/kbn-plugin-generator/sao_template/sao.js b/packages/kbn-plugin-generator/sao_template/sao.js
@@ -19,7 +19,6 @@
 
 const { resolve, relative, dirname } = require('path');
 
-const kebabCase = require('lodash.kebabcase');
 const startCase = require('lodash.startcase');
 const camelCase = require('lodash.camelcase');
 const snakeCase = require('lodash.snakecase');
@@ -86,9 +85,9 @@ module.exports = function({ name }) {
       Object.assign(
         {
           templateVersion: pkg.version,
-          kebabCase,
           startCase,
           camelCase,
+          snakeCase,
           name,
         },
         answers

diff --git a/packages/kbn-plugin-generator/sao_template/sao.test.js b/packages/kbn-plugin-generator/sao_template/sao.test.js
@@ -128,8 +128,8 @@ describe('plugin generator sao integration', () => {
     const nameLine = indexContents.match('name: (.*)')[1];
     const mainLine = indexContents.match('main: (.*)')[1];
 
-    expect(nameLine).toContain('some-fancy-plugin');
-    expect(mainLine).toContain('plugins/some-fancy-plugin/app');
+    expect(nameLine).toContain('some_fancy_plugin');
+    expect(mainLine).toContain('plugins/some_fancy_plugin/app');
   });
 
   it('plugin package has correct name', async () => {
@@ -142,7 +142,7 @@ describe('plugin generator sao integration', () => {
     const packageContents = getFileContents(res.files['package.json']);
     const pkg = JSON.parse(packageContents);
 
-    expect(pkg.name).toBe('some-fancy-plugin');
+    expect(pkg.name).toBe('some_fancy_plugin');
   });
 
   it('package has version "kibana" with master', async () => {

diff --git a/packages/kbn-plugin-generator/sao_template/template/eslintrc b/packages/kbn-plugin-generator/sao_template/template/eslintrc
@@ -4,4 +4,4 @@ extends: "@elastic/kibana"
 settings:
   import/resolver:
     '@elastic/eslint-import-resolver-kibana':
-      rootPackageName: '<%= kebabCase(name) %>'
+      rootPackageName: '<%= snakeCase(name) %>'
diff --git a/packages/kbn-plugin-generator/sao_template/template/index.js b/packages/kbn-plugin-generator/sao_template/template/index.js
@@ -5,21 +5,21 @@ import exampleRoute from './server/routes/example';
 export default function (kibana) {
   return new kibana.Plugin({
     require: ['elasticsearch'],
-    name: '<%= kebabCase(name) %>',
+    name: '<%= snakeCase(name) %>',
     uiExports: {
       <%_ if (generateApp) { -%>
       app: {
         title: '<%= startCase(name) %>',
         description: '<%= description %>',
-        main: 'plugins/<%= kebabCase(name) %>/app',
+        main: 'plugins/<%= snakeCase(name) %>/app',
         <%_ if (generateScss) { -%>
         styleSheetPath: require('path').resolve(__dirname, 'public/app.scss'),
         <%_ } -%>
       },
       <%_ } -%>
       <%_ if (generateHack) { -%>
       hacks: [
-        'plugins/<%= kebabCase(name) %>/hack'
+        'plugins/<%= snakeCase(name) %>/hack'
       ]
       <%_ } -%>
     },

diff --git a/packages/kbn-plugin-generator/sao_template/template/package.json b/packages/kbn-plugin-generator/sao_template/template/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "<%= kebabCase(name) %>",
+  "name": "<%= snakeCase(name) %>",
   "version": "0.0.0",
   "description": "<%= description %>",
   "main": "index.js",

diff --git a/packages/kbn-plugin-generator/sao_template/template/public/components/main/main.js b/packages/kbn-plugin-generator/sao_template/template/public/components/main/main.js
@@ -30,12 +30,12 @@ export class Main extends React.Component {
     const { title } = this.props;
     return (
       <EuiPage>
-        <EuiPageHeader>
-          <EuiTitle size="l">
-            <h1>{title} Hello World!</h1>
-          </EuiTitle>
-        </EuiPageHeader>
         <EuiPageBody>
+          <EuiPageHeader>
+            <EuiTitle size="l">
+              <h1>{title} Hello World!</h1>
+            </EuiTitle>
+          </EuiPageHeader>
           <EuiPageContent>
             <EuiPageContentHeader>
               <EuiTitle>