Merge branch 'master' into capabilities

.eslintrc.js

@@ -739,6 +739,19 @@ module.exports = {
  },
  },
 
+ /**
+ * Alerting Services overrides
+ */
+ {
+ // typescript only for front and back end
+ files: [
+ 'x-pack/{,legacy/}plugins/{alerting,alerting_builtins,actions,task_manager,event_log}/**/*.{ts,tsx}',
+ ],
+ rules: {
+ '@typescript-eslint/no-explicit-any': 'error',
+ },
+ },
+
  /**
  * Lens overrides
  */

.i18nrc.json

@@ -51,7 +51,7 @@
  "visTypeTable": "src/plugins/vis_type_table",
  "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
  "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
- "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
+ "visTypeVega": "src/plugins/vis_type_vega",
  "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
  "visTypeXy": "src/legacy/core_plugins/vis_type_xy",
  "visualizations": "src/plugins/visualizations",

.sass-lint.yml

@@ -4,7 +4,6 @@ files:
  - 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
  - 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
  - 'src/legacy/core_plugins/vis_type_xy/**/*.s+(a|c)ss'
- - 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
  - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
  - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
  - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'

Jenkinsfile

@@ -11,7 +11,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
  'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
  'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
  'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
- // 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
+ 'oss-firefoxSmoke': kibanaPipeline.functionalTestProcess('kibana-firefoxSmoke', './test/scripts/jenkins_firefox_smoke.sh'),
  'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
  'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
  'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
@@ -28,7 +28,7 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
  // 'oss-visualRegression': kibanaPipeline.functionalTestProcess('visualRegression', './test/scripts/jenkins_visual_regression.sh'),
  ]),
  'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
- // 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
+ 'xpack-firefoxSmoke': kibanaPipeline.functionalTestProcess('xpack-firefoxSmoke', './test/scripts/jenkins_xpack_firefox_smoke.sh'),
  'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
  'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
  'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),

docs/developer/core/development-functional-tests.asciidoc

@@ -154,16 +154,16 @@ A test suite is a collection of tests defined by calling `describe()`, and then
 Use tags in `describe()` function to group functional tests. Tags include:
 * `ciGroup{id}` - Assigns test suite to a specific CI worker
 * `skipCloud` and `skipFirefox` - Excludes test suite from running on Cloud or Firefox
-* `smoke` - Groups tests that run on Chrome and Firefox
+* `includeFirefox` - Groups tests that run on Chrome and Firefox
 
 **Cross-browser testing**:::
-On CI, all the functional tests are executed in Chrome by default. To also run a suite against Firefox, assign the `smoke` tag:
+On CI, all the functional tests are executed in Chrome by default. To also run a suite against Firefox, assign the `includeFirefox` tag:
 
 ["source","js"]
 -----------
 // on CI test suite will be run twice: in Chrome and Firefox
 describe('My Cross-browser Test Suite', function () {
- this.tags('smoke');
+ this.tags('includeFirefox');
 
  it('My First Test');
 }

docs/logs/using.asciidoc

@@ -69,12 +69,19 @@ To highlight a word or phrase in the logs stream, click *Highlights* and enter y
 [float]
 [[logs-event-inspector]]
 === Inspect a log event
-To inspect a log event, hover over it, then click the *View details* icon image:logs/images/logs-view-event.png[View event icon] beside the event.
-This opens the *Log event document details* fly-out that shows the fields associated with the log event.
+To inspect a log event, hover over it, then click the *View actions for line* icon image:logs/images/logs-action-menu.png[View actions for line icon]. On the menu that opens, select *View details*. This opens the *Log event document details* fly-out that shows the fields associated with the log event.
 
 To quickly filter the logs stream by one of the field values, in the log event details, click the *View event with filter* icon image:logs/images/logs-view-event-with-filter.png[View event icon] beside the field.
 This automatically adds a search filter to the logs stream to filter the entries by this field and value.
 
+[float]
+[[log-view-in-context]]
+=== View log line in context
+To view a certain line in its context (for example, with other log lines from the same file, or the same cloud container), hover over it, then click the *View actions for line* image:logs/images/logs-action-menu.png[View actions for line icon]. On the menu that opens, select *View in context*. This opens the *View log in context* modal, that shows the log line in its context.
+
+[role="screenshot"]
+image::logs/images/logs-view-in-context.png[View a log line in context]
+
 [float]
 [[view-log-anomalies]]
 === View log anomalies

docs/user/alerting/action-types.asciidoc

@@ -41,16 +41,19 @@ see https://www.elastic.co/subscriptions[the subscription page].
 
 [float]
 [[create-connectors]]
-=== Connectors
+=== Preconfigured connectors and action types
 
 You can create connectors for actions in <<managing-alerts-and-actions, Alerts and Actions>> or via the action API.
 For out-of-the-box and standardized connectors, you can <<pre-configured-connectors, preconfigure connectors>>
 before {kib} starts.
 
+Action type with only preconfigured connectors could be specified as a <<pre-configured-action-types, preconfigured action type>>.
+
 include::action-types/email.asciidoc[]
 include::action-types/index.asciidoc[]
 include::action-types/pagerduty.asciidoc[]
 include::action-types/server-log.asciidoc[]
 include::action-types/slack.asciidoc[]
 include::action-types/webhook.asciidoc[]
 include::pre-configured-connectors.asciidoc[]
+include::pre-configured-action-types.asciidoc[]

docs/user/alerting/pre-configured-action-types.asciidoc

@@ -0,0 +1,61 @@
+[role="xpack"]
+[[pre-configured-action-types]]
+
+== Preconfigured action types
+
+A preconfigure an action type has all the information it needs prior to startup.
+A preconfigured action type offers the following capabilities:
+
+- Requires no setup. Configuration and credentials needed to execute an
+action are predefined.
+- Has only <<pre-configured-connectors, preconfigured connectors>>.
+- Connectors of the preconfigured action type cannot be edited or deleted.
+
+[float]
+[[preconfigured-action-type-example]]
+=== Creating a preconfigured action
+
+In the `kibana.yml` file:
+
+. Exclude the action type from `xpack.actions.enabledActionTypes`.
+. Add all its connectors.
+
+The following example shows a valid configuration of preconfigured action type with one out-of-the box connector.
+
+```js
+ xpack.actions.enabledActionTypes: ['.slack', '.email', '.index'] <1>
+ xpack.actions.preconfigured: <2>
+ - id: 'my-server-log'
+ actionTypeId: .server-log
+ name: 'Server log #xyz'
+```
+
+<1> `enabledActionTypes` should exclude preconfigured action type to prevent creating and deleting connectors.
+<2> `preconfigured` is the setting for defining the list of available connectors for the preconfigured action type.
+
+[float]
+[[pre-configured-action-type-alert-form]]
+=== Attaching a preconfigured action to an alert
+
+To attach an action to an alert,
+select from a list of available action types, and
+then select the *Server log* type. This action type was configured previously.
+
+[role="screenshot"]
+image::images/pre-configured-action-type-alert-form.png[Create alert with selected Server log action type]
+
+[float]
+[[managing-pre-configured-action-types]]
+=== Managing preconfigured actions
+
+Connectors with preconfigured actions appear in the connector list, regardless of which space the user is in.
+They are tagged as “preconfigured” and cannot be deleted.
+
+[role="screenshot"]
+image::images/pre-configured-action-type-managing.png[Connectors managing tab with pre-cofigured]
+
+Clicking *Create connector* shows the list of available action types.
+Preconfigured action types are not included because you can't create a connector with a preconfigured action type.
+
+[role="screenshot"]
+image::images/pre-configured-action-type-select-type.png[Pre-configured connector create menu]

package.json

@@ -120,7 +120,7 @@
  "@babel/core": "^7.9.0",
  "@babel/register": "^7.9.0",
  "@elastic/apm-rum": "^5.1.1",
- "@elastic/charts": "18.4.1",
+ "@elastic/charts": "18.4.2",
  "@elastic/datemath": "5.0.3",
  "@elastic/ems-client": "7.8.0",
  "@elastic/eui": "22.3.0",
@@ -185,7 +185,7 @@
  "glob-all": "^3.2.1",
  "globby": "^8.0.1",
  "h2o2": "^8.1.2",
- "handlebars": "4.5.3",
+ "handlebars": "4.7.6",
  "hapi": "^17.5.3",
  "hapi-auth-cookie": "^9.0.0",
  "history": "^4.9.0",

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -138,9 +138,12 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
 
  module: {
  // no parse rules for a few known large packages which have no require() statements
+ // or which have require() statements that should be ignored because the file is
+ // already bundled with all its necessary depedencies
  noParse: [
  /[\///]node_modules[\///]elasticsearch-browser[\///]/,
- /[\///]node_modules[\///]lodash[\///]index\.js/,
+ /[\///]node_modules[\///]lodash[\///]index\.js$/,
+ /[\///]node_modules[\///]vega-lib[\///]build[\///]vega\.js$/,
  ],
 
  rules: [

packages/kbn-ui-shared-deps/package.json

@@ -9,7 +9,7 @@
  "kbn:watch": "node scripts/build --watch"
  },
  "dependencies": {
- "@elastic/charts": "18.4.1",
+ "@elastic/charts": "18.4.2",
  "@elastic/eui": "22.3.0",
  "@kbn/i18n": "1.0.0",
  "abortcontroller-polyfill": "^1.4.0",

src/dev/precommit_hook/casing_check_config.js

@@ -159,8 +159,6 @@ export const TEMPORARILY_IGNORED_PATHS = [
  'webpackShims/elasticsearch-browser.js',
  'webpackShims/moment-timezone.js',
  'webpackShims/ui-bootstrap.js',
- 'x-pack/legacy/plugins/graph/public/graphClientWorkspace.js',
- 'x-pack/legacy/plugins/graph/public/angular-venn-simple.js',
  'x-pack/legacy/plugins/index_management/public/lib/editSettings.js',
  'x-pack/legacy/plugins/license_management/public/store/reducers/licenseManagement.js',
  'x-pack/legacy/plugins/monitoring/public/components/sparkline/__mocks__/plugins/xpack_main/jquery_flot.js',

src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js → src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js

@@ -21,7 +21,9 @@ import Bluebird from 'bluebird';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import $ from 'jquery';
-import { createVegaVisualization } from '../vega_visualization';
+// Will be replaced with new path when tests are moved
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createVegaVisualization } from '../../../../../../plugins/vis_type_vega/public/vega_visualization';
 import { ImageComparator } from 'test_utils/image_comparator';
 
 import vegaliteGraph from '!!raw-loader!./vegalite_graph.hjson';
@@ -35,24 +37,34 @@ import vegaTooltipGraph from '!!raw-loader!./vega_tooltip_test.hjson';
 
 import vegaMapGraph from '!!raw-loader!./vega_map_test.hjson';
 import vegaMapImage256 from './vega_map_image_256.png';
+// Will be replaced with new path when tests are moved
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { VegaParser } from '../../../../../../plugins/vis_type_vega/public/data_model/vega_parser';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { SearchCache } from '../../../../../../plugins/vis_type_vega/public/data_model/search_cache';
 
-import { VegaParser } from '../data_model/vega_parser';
-import { SearchCache } from '../data_model/search_cache';
-
-import { createVegaTypeDefinition } from '../vega_type';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createVegaTypeDefinition } from '../../../../../../plugins/vis_type_vega/public/vega_type';
 // TODO This is an integration test and thus requires a running platform. When moving to the new platform,
 // this test has to be migrated to the newly created integration test environment.
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { npStart } from 'ui/new_platform';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { BaseVisType } from '../../../../../plugins/visualizations/public/vis_types/base_vis_type';
+import { BaseVisType } from '../../../../../../plugins/visualizations/public/vis_types/base_vis_type';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExprVis } from '../../../../../plugins/visualizations/public/expressions/vis';
-import { setInjectedVars } from '../services';
+import { ExprVis } from '../../../../../../plugins/visualizations/public/expressions/vis';
+
+import {
+ setInjectedVars,
+ setData,
+ setSavedObjects,
+ setNotifications,
+ // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../plugins/vis_type_vega/public/services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
+import { setInjectedVarFunc } from '../../../../../../plugins/maps_legacy/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
+import { ServiceSettings } from '../../../../../../plugins/maps_legacy/public/map/service_settings';
 
 const THRESHOLD = 0.1;
 const PIXEL_DIFF = 30;
@@ -70,6 +82,9 @@ describe('VegaVisualizations', () => {
  enableExternalUrls: true,
  esShardTimeout: 10000,
  });
+ setData(npStart.plugins.data);
+ setSavedObjects(npStart.core.savedObjects);
+ setNotifications(npStart.core.notifications);
 
  beforeEach(ngMock.module('kibana'));
  beforeEach(
@@ -111,9 +126,6 @@ describe('VegaVisualizations', () => {
  timefilter: {},
  },
  },
- __LEGACY: {
- esClient: npStart.plugins.data.search.__LEGACY.esClient,
- },
  },
  },
  };

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -59,11 +59,7 @@ export const [getUrlTracker, setUrlTracker] = createGetterSetter<{
 export const getHistory = _.once(() => createHashHistory());
 
 export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
-export {
- unhashUrl,
- redirectWhenMissing,
- ensureDefaultIndexPattern,
-} from '../../../../../plugins/kibana_utils/public';
+export { unhashUrl, redirectWhenMissing } from '../../../../../plugins/kibana_utils/public';
 export {
  formatMsg,
  formatStack,

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js

@@ -49,7 +49,6 @@ import {
  subscribeWithScope,
  tabifyAggResponse,
  getAngularModule,
- ensureDefaultIndexPattern,
  redirectWhenMissing,
 } from '../../kibana_services';
 
@@ -118,7 +117,7 @@ app.config($routeProvider => {
  savedObjects: function($route, Promise) {
  const history = getHistory();
  const savedSearchId = $route.current.params.id;
- return ensureDefaultIndexPattern(core, data, history).then(() => {
+ return data.indexPatterns.ensureDefaultIndexPattern(history).then(() => {
  const { appStateContainer } = getState({ history });
  const { index } = appStateContainer.getState();
  return Promise.props({