Merge branch 'master' of github.com:elastic/kibana into index-managem…

…ent/add-support-in-url-for-hidden-toggle * 'master' of github.com:elastic/kibana: (49 commits) [Uptime] Improve responsiveness details page (elastic#67034) skip flaky suite (elastic#66669) Revert "Integration of a static filesystem for the node_modules (elastic#47998)" (elastic#67124) Support api_integration/kibana/stats against remote hosts (elastic#53000) chore(NA): add module name mapper for src plugins on x-pack (elastic#67103) Change the error message on TSVB in order to be more user friendly (elastic#67090) [kbn/optimizer] poll parent process to avoid zombie processes (elastic#67059) [Visualize] Lazy load default editor, fix duplicated styles (elastic#66732) Bump styled-component dependencies (elastic#66611) Bump react-markdown dependencies (elastic#66615) Fix Core docs links (elastic#66977) Timelion graph is not refreshing content after searching or filtering (elastic#67023) Remove `--xpack.endpoint.enabled=true` from README.md file (elastic#67053) Move apm tutorial from apm plugin into apm_oss plugin (elastic#66432) [Logs UI] Restore call to `UsageCollector.countLogs` (elastic#67051) Remove unused license check result from LP Security plugin (elastic#66966) [Saved Objects] adds support for including hidden types in saved objects client (elastic#66879) [Discover] Deangularize timechart header (elastic#66532) [Discover] Improve and unskip a11y context view test (elastic#66959) [SIEM] Refactor Timeline.timelineType draft to Timeline.status draft (elastic#66864) ... # Conflicts: # x-pack/plugins/index_management/__jest__/client_integration/helpers/home.helpers.ts
jloleysens · May 20, 2020 · d6da4bd · d6da4bd
2 parents a837f96 + 6d5e538
commit d6da4bd
Show file tree

Hide file tree

Showing 609 changed files with 9,302 additions and 33,965 deletions.
diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
@@ -10,6 +10,9 @@
     - "src/plugins/bfetch/**/*.*"
   - "Team:apm":
     - "x-pack/plugins/apm/**/*.*"
-    - "x-pack/plugins/apm/**/*.*"
+  - "Team:Ingest Management":
+    - "x-pack/plugins/ingest_manager/**/*.*"
+    - "x-pack/test/api_integration/apis/fleet/**/*.*"
+    - "x-pack/test/epm_api_integration/**/*.*"
   - "Team:uptime":
     - "x-pack/plugins/uptime/**/*.*"
diff --git a/.i18nrc.json b/.i18nrc.json
@@ -56,7 +56,8 @@
     "visTypeVislib": "src/plugins/vis_type_vislib",
     "visTypeXy": "src/plugins/vis_type_xy",
     "visualizations": "src/plugins/visualizations",
-    "visualize": "src/plugins/visualize"
+    "visualize": "src/plugins/visualize",
+    "apmOss": "src/plugins/apm_oss"
   },
   "exclude": [
     "src/legacy/ui/ui_render/ui_render_mixin.js"

diff --git a/.../development/core/server/kibana-plugin-core-server.savedobjectsclientfactory.md b/.../development/core/server/kibana-plugin-core-server.savedobjectsclientfactory.md
@@ -9,7 +9,8 @@ Describes the factory used to create instances of the Saved Objects Client.
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectsClientFactory = ({ request, }: {
+export declare type SavedObjectsClientFactory = ({ request, includedHiddenTypes, }: {
     request: KibanaRequest;
+    includedHiddenTypes?: string[];
 }) => SavedObjectsClientContract;
 ```
diff --git a/...ana-plugin-core-server.savedobjectsclientprovideroptions.includedhiddentypes.md b/...ana-plugin-core-server.savedobjectsclientprovideroptions.includedhiddentypes.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsClientProviderOptions](./kibana-plugin-core-server.savedobjectsclientprovideroptions.md) &gt; [includedHiddenTypes](./kibana-plugin-core-server.savedobjectsclientprovideroptions.includedhiddentypes.md)
+
+## SavedObjectsClientProviderOptions.includedHiddenTypes property
+
+<b>Signature:</b>
+
+```typescript
+includedHiddenTypes?: string[];
+```
diff --git a/...ment/core/server/kibana-plugin-core-server.savedobjectsclientprovideroptions.md b/...ment/core/server/kibana-plugin-core-server.savedobjectsclientprovideroptions.md
@@ -17,4 +17,5 @@ export interface SavedObjectsClientProviderOptions
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [excludedWrappers](./kibana-plugin-core-server.savedobjectsclientprovideroptions.excludedwrappers.md) | <code>string[]</code> |  |
+|  [includedHiddenTypes](./kibana-plugin-core-server.savedobjectsclientprovideroptions.includedhiddentypes.md) | <code>string[]</code> |  |
 
diff --git a/...na-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md b/...na-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md
@@ -9,5 +9,5 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
+createInternalRepository: (includedHiddenTypes?: string[]) => ISavedObjectsRepository;
 ```
diff --git a/...bana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md b/...bana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md
@@ -9,5 +9,5 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
+createScopedRepository: (req: KibanaRequest, includedHiddenTypes?: string[]) => ISavedObjectsRepository;
 ```
diff --git a/...elopment/core/server/kibana-plugin-core-server.savedobjectsrepositoryfactory.md b/...elopment/core/server/kibana-plugin-core-server.savedobjectsrepositoryfactory.md
@@ -16,6 +16,6 @@ export interface SavedObjectsRepositoryFactory
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md) | <code>(extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
-|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md) | <code>(req: KibanaRequest, extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
+|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createinternalrepository.md) | <code>(includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
+|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsrepositoryfactory.createscopedrepository.md) | <code>(req: KibanaRequest, includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
 
diff --git a/.../kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md b/.../kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md
@@ -9,5 +9,5 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createInternalRepository: (extraTypes?: string[]) => ISavedObjectsRepository;
+createInternalRepository: (includedHiddenTypes?: string[]) => ISavedObjectsRepository;
 ```
diff --git a/...er/kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md b/...er/kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md
@@ -9,7 +9,7 @@ Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsre
 <b>Signature:</b>
 
 ```typescript
-createScopedRepository: (req: KibanaRequest, extraTypes?: string[]) => ISavedObjectsRepository;
+createScopedRepository: (req: KibanaRequest, includedHiddenTypes?: string[]) => ISavedObjectsRepository;
 ```
 
 ## Remarks

diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicestart.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsservicestart.md
@@ -16,8 +16,8 @@ export interface SavedObjectsServiceStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md) | <code>(extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
-|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md) | <code>(req: KibanaRequest, extraTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
+|  [createInternalRepository](./kibana-plugin-core-server.savedobjectsservicestart.createinternalrepository.md) | <code>(includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the internal Kibana user for authenticating with Elasticsearch. |
+|  [createScopedRepository](./kibana-plugin-core-server.savedobjectsservicestart.createscopedrepository.md) | <code>(req: KibanaRequest, includedHiddenTypes?: string[]) =&gt; ISavedObjectsRepository</code> | Creates a [Saved Objects repository](./kibana-plugin-core-server.isavedobjectsrepository.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. |
 |  [createSerializer](./kibana-plugin-core-server.savedobjectsservicestart.createserializer.md) | <code>() =&gt; SavedObjectsSerializer</code> | Creates a [serializer](./kibana-plugin-core-server.savedobjectsserializer.md) that is aware of all registered types. |
 |  [getScopedClient](./kibana-plugin-core-server.savedobjectsservicestart.getscopedclient.md) | <code>(req: KibanaRequest, options?: SavedObjectsClientProviderOptions) =&gt; SavedObjectsClientContract</code> | Creates a [Saved Objects client](./kibana-plugin-core-server.savedobjectsclientcontract.md) that uses the credentials from the passed in request to authenticate with Elasticsearch. If other plugins have registered Saved Objects client wrappers, these will be applied to extend the functionality of the client.<!-- -->A client that is already scoped to the incoming request is also exposed from the route handler context see [RequestHandlerContext](./kibana-plugin-core-server.requesthandlercontext.md)<!-- -->. |
 |  [getTypeRegistry](./kibana-plugin-core-server.savedobjectsservicestart.gettyperegistry.md) | <code>() =&gt; ISavedObjectTypeRegistry</code> | Returns the [registry](./kibana-plugin-core-server.isavedobjecttyperegistry.md) containing all registered [saved object types](./kibana-plugin-core-server.savedobjectstype.md) |

diff --git a/examples/alerting_example/kibana.json b/examples/alerting_example/kibana.json
@@ -2,7 +2,6 @@
   "id": "alertingExample",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["alerting_example"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["triggers_actions_ui", "charts", "data", "alerting", "actions"],

diff --git a/examples/bfetch_explorer/kibana.json b/examples/bfetch_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "bfetchExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["bfetch_explorer"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["bfetch"],

diff --git a/examples/demo_search/kibana.json b/examples/demo_search/kibana.json
@@ -2,7 +2,6 @@
   "id": "demoSearch",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["demoSearch"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["data"],

diff --git a/examples/embeddable_examples/kibana.json b/examples/embeddable_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "embeddableExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["embeddable_examples"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["embeddable"],

diff --git a/examples/embeddable_explorer/kibana.json b/examples/embeddable_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "embeddableExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["embeddable_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["uiActions", "inspector", "embeddable", "embeddableExamples"],

diff --git a/examples/search_explorer/kibana.json b/examples/search_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "searchExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["search_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["data", "demoSearch"],

diff --git a/examples/state_containers_examples/kibana.json b/examples/state_containers_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "stateContainersExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["state_containers_examples"],
   "server": true,
   "ui": true,
   "requiredPlugins": ["navigation", "data"],

diff --git a/examples/ui_action_examples/kibana.json b/examples/ui_action_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "uiActionsExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["ui_actions_examples"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["uiActions"],

diff --git a/examples/ui_actions_explorer/kibana.json b/examples/ui_actions_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "uiActionsExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["ui_actions_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["uiActions", "uiActionsExamples"],

diff --git a/examples/url_generators_examples/kibana.json b/examples/url_generators_examples/kibana.json
@@ -2,7 +2,6 @@
   "id": "urlGeneratorsExamples",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["url_generators_examples"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["share"],

diff --git a/examples/url_generators_explorer/kibana.json b/examples/url_generators_explorer/kibana.json
@@ -2,7 +2,6 @@
   "id": "urlGeneratorsExplorer",
   "version": "0.0.1",
   "kibanaVersion": "kibana",
-  "configPath": ["url_generators_explorer"],
   "server": false,
   "ui": true,
   "requiredPlugins": ["share", "urlGeneratorsExamples"],

diff --git a/package.json b/package.json
@@ -240,7 +240,7 @@
     "react-dom": "^16.12.0",
     "react-grid-layout": "^0.16.2",
     "react-input-range": "^1.3.0",
-    "react-markdown": "^3.4.1",
+    "react-markdown": "^4.3.1",
     "react-monaco-editor": "~0.27.0",
     "react-redux": "^7.1.3",
     "react-resize-detector": "^4.2.0",
@@ -298,7 +298,6 @@
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
     "@elastic/makelogs": "^5.0.1",
-    "@elastic/static-fs": "1.0.2",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/eslint-import-resolver-kibana": "2.0.0",
@@ -387,7 +386,7 @@
     "@types/semver": "^5.5.0",
     "@types/sinon": "^7.0.13",
     "@types/strip-ansi": "^3.0.0",
-    "@types/styled-components": "^4.4.2",
+    "@types/styled-components": "^5.1.0",
     "@types/supertest": "^2.0.5",
     "@types/supertest-as-promised": "^2.0.38",
     "@types/testing-library__react": "^9.1.2",

diff --git a/packages/kbn-babel-preset/package.json b/packages/kbn-babel-preset/package.json
@@ -14,7 +14,7 @@
     "@babel/preset-typescript": "^7.9.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-filter-imports": "^3.0.0",
-    "babel-plugin-styled-components": "^1.10.6",
+    "babel-plugin-styled-components": "^1.10.7",
     "babel-plugin-transform-define": "^1.3.1",
     "babel-plugin-transform-imports": "^2.0.0"
   }

diff --git a/packages/kbn-optimizer/src/common/index.ts b/packages/kbn-optimizer/src/common/index.ts
@@ -21,6 +21,7 @@ export * from './bundle';
 export * from './bundle_cache';
 export * from './worker_config';
 export * from './worker_messages';
+export * from './parent_messages';
 export * from './compiler_messages';
 export * from './ts_helpers';
 export * from './rxjs_helpers';

diff --git a/packages/kbn-optimizer/src/common/parent_messages.ts b/packages/kbn-optimizer/src/common/parent_messages.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export interface ParentPongMsg {
+  type: 'pong';
+}
+
+export const isParentPong = (value: any): value is ParentPongMsg =>
+  typeof value === 'object' && value && value.type === 'pong';
+
+export class ParentMsgs {
+  pong(): ParentPongMsg {
+    return {
+      type: 'pong',
+    };
+  }
+}
diff --git a/packages/kbn-optimizer/src/common/worker_messages.ts b/packages/kbn-optimizer/src/common/worker_messages.ts
@@ -24,13 +24,17 @@ import {
   CompilerErrorMsg,
 } from './compiler_messages';
 
-export type WorkerMsg =
+export type InternalWorkerMsg =
+  | WorkerPingMsg
   | CompilerRunningMsg
   | CompilerIssueMsg
   | CompilerSuccessMsg
   | CompilerErrorMsg
   | WorkerErrorMsg;
 
+// ping messages are internal, they don't apper in public message streams
+export type WorkerMsg = Exclude<InternalWorkerMsg, WorkerPingMsg>;
+
 /**
  * Message sent when the worker encounters an error that it can't
  * recover from, no more messages will be sent and the worker
@@ -42,6 +46,10 @@ export interface WorkerErrorMsg {
   errorStack?: string;
 }
 
+export interface WorkerPingMsg {
+  type: 'ping';
+}
+
 const WORKER_STATE_TYPES: ReadonlyArray<WorkerMsg['type']> = [
   'running',
   'compiler issue',
@@ -50,10 +58,19 @@ const WORKER_STATE_TYPES: ReadonlyArray<WorkerMsg['type']> = [
   'worker error',
 ];
 
+export const isWorkerPing = (value: any): value is WorkerPingMsg =>
+  typeof value === 'object' && value && value.type === 'ping';
+
 export const isWorkerMsg = (value: any): value is WorkerMsg =>
   typeof value === 'object' && value && WORKER_STATE_TYPES.includes(value.type);
 
 export class WorkerMsgs {
+  ping(): WorkerPingMsg {
+    return {
+      type: 'ping',
+    };
+  }
+
   error(error: Error): WorkerErrorMsg {
     return {
       type: 'worker error',

diff --git a/packages/kbn-optimizer/src/optimizer/observe_worker.ts b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
@@ -22,12 +22,14 @@ import { Readable } from 'stream';
 import { inspect } from 'util';
 
 import * as Rx from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { map, filter, takeUntil } from 'rxjs/operators';
 
-import { isWorkerMsg, WorkerConfig, WorkerMsg, Bundle } from '../common';
+import { isWorkerMsg, isWorkerPing, WorkerConfig, WorkerMsg, Bundle, ParentMsgs } from '../common';
 
 import { OptimizerConfig } from './optimizer_config';
 
+const parentMsgs = new ParentMsgs();
+
 export interface WorkerStdio {
   type: 'worker stdio';
   stream: 'stdout' | 'stderr';
@@ -146,6 +148,16 @@ export function observeWorker(
       observeStdio$(proc.stderr, 'stderr'),
       Rx.fromEvent<[unknown]>(proc, 'message')
         .pipe(
+          // filter out ping messages so they don't end up in the general message stream
+          filter(([msg]) => {
+            if (!isWorkerPing(msg)) {
+              return true;
+            }
+
+            proc.send(parentMsgs.pong());
+            return false;
+          }),
+
           // validate the messages from the process
           map(([msg]) => {
             if (!isWorkerMsg(msg)) {