Merge branch 'master' of github.com:elastic/kibana into alerting/rena…

…me-some-alert-types

examples/alerting_example/tsconfig.json

@@ -1,9 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "./target",
-    "skipLibCheck": true,
-    "resolveJsonModule": true
+    "outDir": "./target"
   },
   "include": [
     "index.ts",

typings/index.d.ts

@@ -23,6 +23,27 @@ declare module '*.html' {
   export default template;
 }
 
+declare module '*.png' {
+  const content: string;
+  // eslint-disable-next-line import/no-default-export
+  export default content;
+}
+
+declare module '*.svg' {
+  const content: string;
+  // eslint-disable-next-line import/no-default-export
+  export default content;
+}
+
+// allow JSON files to be imported directly without lint errors
+// see: https://github.com/palantir/tslint/issues/1264#issuecomment-228433367
+// and: https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#arbitrary-expressions-are-forbidden-in-export-assignments-in-ambient-contexts
+declare module '*.json' {
+  const json: any;
+  // eslint-disable-next-line import/no-default-export
+  export default json;
+}
+
 type MethodKeysOf<T> = {
   [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
 }[keyof T];
@@ -37,3 +58,7 @@ type DeeplyMockedKeys<T> = {
     : DeeplyMockedKeys<T[P]>;
 } &
   T;
+
+type Writable<T> = {
+  -readonly [K in keyof T]: T[K];
+};

x-pack/.i18nrc.json

@@ -16,7 +16,7 @@
     "xpack.features": "plugins/features",
     "xpack.fileUpload": "plugins/file_upload",
     "xpack.graph": ["legacy/plugins/graph", "plugins/graph"],
-    "xpack.grokDebugger": "legacy/plugins/grokdebugger",
+    "xpack.grokDebugger": "plugins/grokdebugger",
     "xpack.idxMgmt": "plugins/index_management",
     "xpack.indexLifecycleMgmt": "legacy/plugins/index_lifecycle_management",
     "xpack.infra": "plugins/infra",

x-pack/index.js

@@ -10,7 +10,6 @@ import { monitoring } from './legacy/plugins/monitoring';
 import { reporting } from './legacy/plugins/reporting';
 import { security } from './legacy/plugins/security';
 import { tilemap } from './legacy/plugins/tilemap';
-import { grokdebugger } from './legacy/plugins/grokdebugger';
 import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { logstash } from './legacy/plugins/logstash';
 import { beats } from './legacy/plugins/beats_management';
@@ -44,7 +43,6 @@ module.exports = function(kibana) {
     spaces(kibana),
     security(kibana),
     tilemap(kibana),
-    grokdebugger(kibana),
     dashboardMode(kibana),
     logstash(kibana),
     beats(kibana),