Merge branch 'master' of github.com:elastic/kibana into fix/explicit-…

…requirement-for-ngSanitize

docs/management/advanced-options.asciidoc

@@ -142,7 +142,14 @@ This setting does not have an effect when loading a saved search.
 Highlighting slows requests when
 working on big documents.
 
+[float]
+[[kibana-ml-settings]]
+==== Machine learning
 
+[horizontal]
+`ml:fileDataVisualizerMaxFileSize`:: Sets the file size limit when importing
+data in the {data-viz}. The default value is `100MB`. The highest supported
+value for this setting is `1GB`.
 
 
 [float]

docs/settings/ml-settings.asciidoc

@@ -19,10 +19,4 @@ instance. If `xpack.ml.enabled` is set to `true` in `elasticsearch.yml`, however
 you can still use the {ml} APIs. To disable {ml} entirely, see the
 {ref}/ml-settings.html[{es} {ml} settings].
 
-[[data-visualizer-settings]]
-==== {data-viz} settings
-
-`xpack.ml.file_data_visualizer.max_file_size`::
-Sets the file size limit when importing data in the {data-viz}. The default
-value is `100MB`. The highest supported value for this setting is `1GB`.
 

docs/user/ml/index.asciidoc

@@ -20,7 +20,7 @@ image::user/ml/images/ml-data-visualizer-sample.jpg[{data-viz} for sample flight
 experimental[] You can also upload a CSV, NDJSON, or log file. The *{data-viz}*
 identifies the file format and field mappings. You can then optionally import
 that data into an {es} index. To change the default file size limit, see
-<<data-visualizer-settings>>.
+<<kibana-ml-settings>>.
 
 You need the following permissions to use the {data-viz} with file upload:
 

src/core/server/mocks.ts

@@ -18,7 +18,7 @@
  */
 import { of } from 'rxjs';
 import { duration } from 'moment';
-import { PluginInitializerContext, CoreSetup, CoreStart } from '.';
+import { PluginInitializerContext, CoreSetup, CoreStart, StartServicesAccessor } from '.';
 import { CspConfig } from './csp';
 import { loggingServiceMock } from './logging/logging_service.mock';
 import { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.mock';
@@ -100,7 +100,9 @@ function pluginInitializerContextMock<T>(config: T = {} as T) {
   return mock;
 }
 
-type CoreSetupMockType = MockedKeys<CoreSetup> & jest.Mocked<Pick<CoreSetup, 'getStartServices'>>;
+type CoreSetupMockType = MockedKeys<CoreSetup> & {
+  getStartServices: jest.MockedFunction<StartServicesAccessor<any, any>>;
+};
 
 function createCoreSetupMock({
   pluginStartDeps = {},

x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts

@@ -60,7 +60,10 @@ const style: cytoscape.Stylesheet[] = [
           ? theme.euiColorPrimary
           : theme.euiColorMediumShade,
       'border-width': 2,
-      color: theme.textColors.text,
+      color: (el: cytoscape.NodeSingular) =>
+        el.hasClass('primary') || el.selected()
+          ? theme.euiColorPrimaryText
+          : theme.textColors.text,
       // theme.euiFontFamily doesn't work here for some reason, so we're just
       // specifying a subset of the fonts for the label text.
       'font-family': 'Inter UI, Segoe UI, Helvetica, Arial, sans-serif',
@@ -78,8 +81,9 @@ const style: cytoscape.Stylesheet[] = [
       'overlay-opacity': 0,
       shape: (el: cytoscape.NodeSingular) =>
         isService(el) ? (isIE11 ? 'rectangle' : 'ellipse') : 'diamond',
-      'text-background-color': theme.euiColorLightestShade,
-      'text-background-opacity': 0,
+      'text-background-color': theme.euiColorPrimary,
+      'text-background-opacity': (el: cytoscape.NodeSingular) =>
+        el.hasClass('primary') || el.selected() ? 0.1 : 0,
       'text-background-padding': theme.paddingSizes.xs,
       'text-background-shape': 'roundrectangle',
       'text-margin-y': parseInt(theme.paddingSizes.s, 10),

x-pack/plugins/actions/server/lib/action_executor.ts

@@ -140,13 +140,18 @@ export class ActionExecutor {
       status: 'ok',
     };
 
+    event.event = event.event || {};
+
     if (result.status === 'ok') {
+      event.event.outcome = 'success';
       event.message = `action executed: ${actionLabel}`;
     } else if (result.status === 'error') {
+      event.event.outcome = 'failure';
       event.message = `action execution failure: ${actionLabel}`;
       event.error = event.error || {};
       event.error.message = actionErrorToMessage(result);
     } else {
+      event.event.outcome = 'failure';
       event.message = `action execution returned unexpected result: ${actionLabel}`;
       event.error = event.error || {};
       event.error.message = 'action execution returned unexpected result';

x-pack/plugins/alerting/server/task_runner/task_runner.test.ts

@@ -165,6 +165,7 @@ describe('Task Runner', () => {
       Object {
         "event": Object {
           "action": "execute",
+          "outcome": "success",
         },
         "kibana": Object {
           "saved_objects": Array [
@@ -226,6 +227,7 @@ describe('Task Runner', () => {
           Object {
             "event": Object {
               "action": "execute",
+              "outcome": "success",
             },
             "kibana": Object {
               "saved_objects": Array [
@@ -342,6 +344,7 @@ describe('Task Runner', () => {
           Object {
             "event": Object {
               "action": "execute",
+              "outcome": "success",
             },
             "kibana": Object {
               "saved_objects": Array [
@@ -558,6 +561,7 @@ describe('Task Runner', () => {
             },
             "event": Object {
               "action": "execute",
+              "outcome": "failure",
             },
             "kibana": Object {
               "saved_objects": Array [

x-pack/plugins/alerting/server/task_runner/task_runner.ts

@@ -202,12 +202,16 @@ export class TaskRunner {
       event.message = `alert execution failure: ${alertLabel}`;
       event.error = event.error || {};
       event.error.message = err.message;
+      event.event = event.event || {};
+      event.event.outcome = 'failure';
       eventLogger.logEvent(event);
       throw err;
     }
 
     eventLogger.stopTiming(event);
     event.message = `alert executed: ${alertLabel}`;
+    event.event = event.event || {};
+    event.event.outcome = 'success';
     eventLogger.logEvent(event);
 
     // Cleanup alert instances that are no longer scheduling actions to avoid over populating the alertInstances object

x-pack/plugins/event_log/generated/mappings.json

@@ -41,6 +41,10 @@
                 },
                 "end": {
                     "type": "date"
+                },
+                "outcome": {
+                    "ignore_above": 1024,
+                    "type": "keyword"
                 }
             }
         },

x-pack/plugins/event_log/generated/schemas.ts

@@ -41,6 +41,7 @@ export const EventSchema = schema.maybe(
         start: ecsDate(),
         duration: ecsNumber(),
         end: ecsDate(),
+        outcome: ecsString(),
       })
     ),
     error: schema.maybe(

x-pack/plugins/event_log/scripts/mappings.js

@@ -53,6 +53,7 @@ exports.EcsEventLogProperties = [
   'event.start',
   'event.duration',
   'event.end',
+  'event.outcome', // optional, but one of failure, success, unknown
   'error.message',
   'user.name',
   'kibana.server_uuid',

x-pack/plugins/infra/common/http_api/log_sources/get_log_source_configuration.ts

@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { badRequestErrorRT, forbiddenErrorRT, routeTimingMetadataRT } from '../shared';
+import { logSourceConfigurationRT } from './log_source_configuration';
+
+/**
+ * request
+ */
+
+export const getLogSourceConfigurationRequestParamsRT = rt.type({
+  // the id of the source configuration
+  sourceId: rt.string,
+});
+
+export type GetLogSourceConfigurationRequestParams = rt.TypeOf<
+  typeof getLogSourceConfigurationRequestParamsRT
+>;
+
+/**
+ * response
+ */
+
+export const getLogSourceConfigurationSuccessResponsePayloadRT = rt.intersection([
+  rt.type({
+    data: logSourceConfigurationRT,
+  }),
+  rt.partial({
+    timing: routeTimingMetadataRT,
+  }),
+]);
+
+export type GetLogSourceConfigurationSuccessResponsePayload = rt.TypeOf<
+  typeof getLogSourceConfigurationSuccessResponsePayloadRT
+>;
+
+export const getLogSourceConfigurationErrorResponsePayloadRT = rt.union([
+  badRequestErrorRT,
+  forbiddenErrorRT,
+]);
+
+export type GetLogSourceConfigurationErrorReponsePayload = rt.TypeOf<
+  typeof getLogSourceConfigurationErrorResponsePayloadRT
+>;
+
+export const getLogSourceConfigurationResponsePayloadRT = rt.union([
+  getLogSourceConfigurationSuccessResponsePayloadRT,
+  getLogSourceConfigurationErrorResponsePayloadRT,
+]);
+
+export type GetLogSourceConfigurationReponsePayload = rt.TypeOf<
+  typeof getLogSourceConfigurationResponsePayloadRT
+>;

x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts

@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { routeTimingMetadataRT } from '../shared';
+import {
+  getLogSourceConfigurationPath,
+  LOG_SOURCE_CONFIGURATION_PATH,
+} from './log_source_configuration';
+
+export const LOG_SOURCE_STATUS_PATH_SUFFIX = 'status';
+export const LOG_SOURCE_STATUS_PATH = `${LOG_SOURCE_CONFIGURATION_PATH}/${LOG_SOURCE_STATUS_PATH_SUFFIX}`;
+export const getLogSourceStatusPath = (sourceId: string) =>
+  `${getLogSourceConfigurationPath(sourceId)}/${LOG_SOURCE_STATUS_PATH_SUFFIX}`;
+
+/**
+ * request
+ */
+
+export const getLogSourceStatusRequestParamsRT = rt.type({
+  // the id of the source configuration
+  sourceId: rt.string,
+});
+
+export type GetLogSourceStatusRequestParams = rt.TypeOf<typeof getLogSourceStatusRequestParamsRT>;
+
+/**
+ * response
+ */
+
+const logIndexFieldRT = rt.strict({
+  name: rt.string,
+  type: rt.string,
+  searchable: rt.boolean,
+  aggregatable: rt.boolean,
+});
+
+export type LogIndexField = rt.TypeOf<typeof logIndexFieldRT>;
+
+const logSourceStatusRT = rt.strict({
+  logIndexFields: rt.array(logIndexFieldRT),
+  logIndexNames: rt.array(rt.string),
+});
+
+export type LogSourceStatus = rt.TypeOf<typeof logSourceStatusRT>;
+
+export const getLogSourceStatusSuccessResponsePayloadRT = rt.intersection([
+  rt.type({
+    data: logSourceStatusRT,
+  }),
+  rt.partial({
+    timing: routeTimingMetadataRT,
+  }),
+]);
+
+export type GetLogSourceStatusSuccessResponsePayload = rt.TypeOf<
+  typeof getLogSourceStatusSuccessResponsePayloadRT
+>;

x-pack/plugins/infra/common/http_api/log_sources/index.ts

@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './get_log_source_configuration';
+export * from './get_log_source_status';
+export * from './log_source_configuration';
+export * from './patch_log_source_configuration';

x-pack/plugins/infra/common/http_api/log_sources/log_source_configuration.ts

@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const LOG_SOURCE_CONFIGURATION_PATH_PREFIX = '/api/infra/log_source_configurations';
+export const LOG_SOURCE_CONFIGURATION_PATH = `${LOG_SOURCE_CONFIGURATION_PATH_PREFIX}/{sourceId}`;
+export const getLogSourceConfigurationPath = (sourceId: string) =>
+  `${LOG_SOURCE_CONFIGURATION_PATH_PREFIX}/${sourceId}`;
+
+export const logSourceConfigurationOriginRT = rt.keyof({
+  fallback: null,
+  internal: null,
+  stored: null,
+});
+
+export type LogSourceConfigurationOrigin = rt.TypeOf<typeof logSourceConfigurationOriginRT>;
+
+const logSourceFieldsConfigurationRT = rt.strict({
+  timestamp: rt.string,
+  tiebreaker: rt.string,
+});
+
+const logSourceCommonColumnConfigurationRT = rt.strict({
+  id: rt.string,
+});
+
+const logSourceTimestampColumnConfigurationRT = rt.strict({
+  timestampColumn: logSourceCommonColumnConfigurationRT,
+});
+
+const logSourceMessageColumnConfigurationRT = rt.strict({
+  messageColumn: logSourceCommonColumnConfigurationRT,
+});
+
+const logSourceFieldColumnConfigurationRT = rt.strict({
+  fieldColumn: rt.intersection([
+    logSourceCommonColumnConfigurationRT,
+    rt.strict({
+      field: rt.string,
+    }),
+  ]),
+});
+
+const logSourceColumnConfigurationRT = rt.union([
+  logSourceTimestampColumnConfigurationRT,
+  logSourceMessageColumnConfigurationRT,
+  logSourceFieldColumnConfigurationRT,
+]);
+
+export const logSourceConfigurationPropertiesRT = rt.strict({
+  name: rt.string,
+  description: rt.string,
+  logAlias: rt.string,
+  fields: logSourceFieldsConfigurationRT,
+  logColumns: rt.array(logSourceColumnConfigurationRT),
+});
+
+export type LogSourceConfigurationProperties = rt.TypeOf<typeof logSourceConfigurationPropertiesRT>;
+
+export const logSourceConfigurationRT = rt.exact(
+  rt.intersection([
+    rt.type({
+      id: rt.string,
+      origin: logSourceConfigurationOriginRT,
+      configuration: logSourceConfigurationPropertiesRT,
+    }),
+    rt.partial({
+      updatedAt: rt.number,
+      version: rt.string,
+    }),
+  ])
+);
+
+export type LogSourceConfiguration = rt.TypeOf<typeof logSourceConfigurationRT>;