Merge branch 'master' into lens/pie

.backportrc.json

@@ -1,5 +1,30 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "7.x", "checked": true }, "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8", "6.7", "6.6", "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
-  "labels": ["backport"]
+  "targetBranchChoices": [
+    { "name": "master", "checked": true },
+    { "name": "7.x", "checked": true },
+    "7.7",
+    "7.6",
+    "7.5",
+    "7.4",
+    "7.3",
+    "7.2",
+    "7.1",
+    "7.0",
+    "6.8",
+    "6.7",
+    "6.6",
+    "6.5",
+    "6.4",
+    "6.3",
+    "6.2",
+    "6.1",
+    "6.0",
+    "5.6"
+  ],
+  "targetPRLabels": ["backport"],
+  "branchLabelMapping": {
+    "^v7.8.0$": "7.x",
+    "^v(\\d+).(\\d+).\\d+$": "$1.$2"
+  }
 }

.github/CODEOWNERS

@@ -11,18 +11,21 @@
 /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
-/src/plugins/vis_type_vislib/ @elastic/kibana-app
-/src/plugins/vis_type_xy/ @elastic/kibana-app
-/src/plugins/vis_type_table/ @elastic/kibana-app
-/src/plugins/kibana_legacy/ @elastic/kibana-app
-/src/plugins/vis_type_timelion/ @elastic/kibana-app
 /src/plugins/dashboard/ @elastic/kibana-app
 /src/plugins/discover/ @elastic/kibana-app
 /src/plugins/input_control_vis/ @elastic/kibana-app
-/src/plugins/visualize/ @elastic/kibana-app
-/src/plugins/vis_type_timeseries/ @elastic/kibana-app
-/src/plugins/vis_type_metric/ @elastic/kibana-app
+/src/plugins/kibana_legacy/ @elastic/kibana-app
+/src/plugins/vis_default_editor/ @elastic/kibana-app
 /src/plugins/vis_type_markdown/ @elastic/kibana-app
+/src/plugins/vis_type_metric/ @elastic/kibana-app
+/src/plugins/vis_type_table/ @elastic/kibana-app
+/src/plugins/vis_type_tagcloud/ @elastic/kibana-app
+/src/plugins/vis_type_timelion/ @elastic/kibana-app
+/src/plugins/vis_type_timeseries/ @elastic/kibana-app
+/src/plugins/vis_type_vega/ @elastic/kibana-app
+/src/plugins/vis_type_vislib/ @elastic/kibana-app
+/src/plugins/vis_type_xy/ @elastic/kibana-app
+/src/plugins/visualize/ @elastic/kibana-app
 
 # Core UI
 # Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon

docs/logs/index.asciidoc

@@ -17,6 +17,7 @@ In this case, you will only see the logs for the selected component.
 * <<xpack-logs-using>>
 * <<xpack-logs-configuring>>
 * <<xpack-logs-analysis>>
+* <<xpack-logs-alerting>>
 
 [role="screenshot"]
 image::logs/images/logs-console.png[Log Console in Kibana]
@@ -30,3 +31,5 @@ include::using.asciidoc[]
 include::configuring.asciidoc[]
 
 include::log-rate.asciidoc[]
+
+include::logs-alerting.asciidoc[]

docs/logs/logs-alerting.asciidoc

@@ -0,0 +1,27 @@
+[role="xpack"]
+[[xpack-logs-alerting]]
+== Logs alerting
+
+[float]
+=== Overview
+
+To use the alerting functionality you need to {kibana-ref}/alerting-getting-started.html#alerting-setup-prerequisites[set up alerting].
+
+You can then select the *Create alert* option, from the *Alerts* actions dropdown.
+
+[role="screenshot"]
+image::logs/images/alert-actions-menu.png[Screenshot showing alerts menu]
+
+Within the alert flyout you can configure your logs alert:
+
+[role="screenshot"]
+image::logs/images/alert-flyout.png[Screenshot showing alerts flyout]
+
+[float]
+=== Fields and comparators
+
+The comparators available for conditions depend on the chosen field. The combinations available are:
+
+- Numeric fields: *more than*, *more than or equals*, *less than*, *less than or equals*, *equals*, and *does not equal*.
+- Aggregatable fields: *is* and *is not*.
+- Non-aggregatable fields: *matches*, *does not match*, *matches phrase*, *does not match phrase*. 

docs/user/alerting/action-types/pagerduty.asciidoc

@@ -92,7 +92,7 @@ section of the alert configuration and selecting *Add new*.
 * Alternatively, create a connector by navigating to *Management* from the {kib} navbar and selecting
 *Alerts and Actions*. Then, select the *Connectors* tab, click the *Create connector* button, and select the PagerDuty option.
 
-. Configure the connector by giving it a name and optionally entering the API URL and Routing Key, or using the defaults.
+. Configure the connector by giving it a name and entering the Integration Key, optionally entering a custom API URL.
 +
 See <<pagerduty-in-pagerduty, In PagerDuty>> for how to obtain the endpoint and key information from PagerDuty and
 <<pagerduty-connector-configuration, Connector configuration>> for more details.
@@ -133,7 +133,7 @@ PagerDuty connectors have the following configuration properties:
 
 Name::      The name of the connector. The name is used to identify a  connector in the management UI connector listing, or in the connector list when configuring an action.
 API URL::   An optional PagerDuty event URL. Defaults to `https://events.pagerduty.com/v2/enqueue`. If you are using the <<action-settings, `xpack.actions.whitelistedHosts`>> setting, make sure the hostname is whitelisted.
-Routing Key::   A 32 character PagerDuty Integration Key for an integration on a service or on a global ruleset.
+Integration Key::   A 32 character PagerDuty Integration Key for an integration on a service, also referred to as the routing key.
 
 [float]
 [[pagerduty-action-configuration]]

package.json

@@ -400,7 +400,7 @@
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "babel-plugin-istanbul": "^6.0.0",
-    "backport": "5.1.3",
+    "backport": "5.4.1",
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",

src/plugins/home/server/tutorials/activemq_logs/index.ts

@@ -48,7 +48,7 @@ export function activemqLogsSpecProvider(context: TutorialContext): TutorialSche
         learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-activemq.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/activemq.svg',
+    euiIconType: '/plugins/home/assets/logos/activemq.svg',
     artifacts: {
       dashboards: [
         {
@@ -64,7 +64,7 @@ export function activemqLogsSpecProvider(context: TutorialContext): TutorialSche
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/activemq_logs/screenshot.png',
+    previewImagePath: '/plugins/home/assets/activemq_logs/screenshot.png',
     onPrem: onPremInstructions(moduleName, platforms, context),
     elasticCloud: cloudInstructions(moduleName, platforms),
     onPremElasticCloud: onPremCloudInstructions(moduleName, platforms),

src/plugins/home/server/tutorials/activemq_metrics/index.ts

@@ -48,7 +48,7 @@ export function activemqMetricsSpecProvider(context: TutorialContext): TutorialS
         learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-activemq.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/activemq.svg',
+    euiIconType: '/plugins/home/assets/logos/activemq.svg',
     isBeta: true,
     artifacts: {
       application: {

src/plugins/home/server/tutorials/apache_logs/index.ts

@@ -65,7 +65,7 @@ export function apacheLogsSpecProvider(context: TutorialContext): TutorialSchema
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/apache_logs/screenshot.png',
+    previewImagePath: '/plugins/home/assets/apache_logs/screenshot.png',
     onPrem: onPremInstructions(moduleName, platforms, context),
     elasticCloud: cloudInstructions(moduleName, platforms),
     onPremElasticCloud: onPremCloudInstructions(moduleName, platforms),

src/plugins/home/server/tutorials/apache_metrics/index.ts

@@ -64,7 +64,7 @@ export function apacheMetricsSpecProvider(context: TutorialContext): TutorialSch
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/apache_metrics/screenshot.png',
+    previewImagePath: '/plugins/home/assets/apache_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/auditbeat/index.ts

@@ -63,7 +63,7 @@ processes, users, logins, sockets information, file accesses, and more. \
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/auditbeat/screenshot.png',
+    previewImagePath: '/plugins/home/assets/auditbeat/screenshot.png',
     onPrem: onPremInstructions(platforms, context),
     elasticCloud: cloudInstructions(platforms),
     onPremElasticCloud: onPremCloudInstructions(platforms),

src/plugins/home/server/tutorials/aws_logs/index.ts

@@ -65,7 +65,7 @@ export function awsLogsSpecProvider(context: TutorialContext): TutorialSchema {
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/aws_logs/screenshot.png',
+    previewImagePath: '/plugins/home/assets/aws_logs/screenshot.png',
     onPrem: onPremInstructions(moduleName, platforms, context),
     elasticCloud: cloudInstructions(moduleName, platforms),
     onPremElasticCloud: onPremCloudInstructions(moduleName, platforms),

src/plugins/home/server/tutorials/aws_metrics/index.ts

@@ -66,7 +66,7 @@ export function awsMetricsSpecProvider(context: TutorialContext): TutorialSchema
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/aws_metrics/screenshot.png',
+    previewImagePath: '/plugins/home/assets/aws_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/cisco_logs/index.ts

@@ -50,7 +50,7 @@ supports the "asa" fileset for Cisco ASA firewall logs received over syslog or r
         learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-cisco.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/cisco.svg',
+    euiIconType: '/plugins/home/assets/logos/cisco.svg',
     artifacts: {
       dashboards: [],
       application: {
@@ -64,7 +64,7 @@ supports the "asa" fileset for Cisco ASA firewall logs received over syslog or r
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/cisco_logs/screenshot.png',
+    previewImagePath: '/plugins/home/assets/cisco_logs/screenshot.png',
     onPrem: onPremInstructions(moduleName, platforms, context),
     elasticCloud: cloudInstructions(moduleName, platforms),
     onPremElasticCloud: onPremCloudInstructions(moduleName, platforms),

src/plugins/home/server/tutorials/cloudwatch_logs/index.ts

@@ -58,7 +58,6 @@ export function cloudwatchLogsSpecProvider(context: TutorialContext): TutorialSc
       },
     },
     completionTimeMinutes: 10,
-    // previewImagePath: '/plugins/kibana/home/tutorial_resources/uptime_monitors/screenshot.png',
     onPrem: onPremInstructions([], context),
     elasticCloud: cloudInstructions(),
     onPremElasticCloud: onPremCloudInstructions(),

src/plugins/home/server/tutorials/cockroachdb_metrics/index.ts

@@ -48,7 +48,7 @@ export function cockroachdbMetricsSpecProvider(context: TutorialContext): Tutori
         learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-cockroachdb.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/cockroachdb.svg',
+    euiIconType: '/plugins/home/assets/logos/cockroachdb.svg',
     artifacts: {
       dashboards: [
         {
@@ -67,7 +67,7 @@ export function cockroachdbMetricsSpecProvider(context: TutorialContext): Tutori
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/cockroachdb_metrics/screenshot.png',
+    previewImagePath: '/plugins/home/assets/cockroachdb_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/consul_metrics/index.ts

@@ -48,7 +48,7 @@ export function consulMetricsSpecProvider(context: TutorialContext): TutorialSch
         learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-consul.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/consul.svg',
+    euiIconType: '/plugins/home/assets/logos/consul.svg',
     artifacts: {
       dashboards: [
         {
@@ -64,7 +64,7 @@ export function consulMetricsSpecProvider(context: TutorialContext): TutorialSch
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/consul_metrics/screenshot.png',
+    previewImagePath: '/plugins/home/assets/consul_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/coredns_logs/index.ts

@@ -50,7 +50,7 @@ export function corednsLogsSpecProvider(context: TutorialContext): TutorialSchem
         learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-coredns.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/coredns.svg',
+    euiIconType: '/plugins/home/assets/logos/coredns.svg',
     artifacts: {
       dashboards: [
         {
@@ -66,7 +66,7 @@ export function corednsLogsSpecProvider(context: TutorialContext): TutorialSchem
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/coredns_logs/screenshot.jpg',
+    previewImagePath: '/plugins/home/assets/coredns_logs/screenshot.jpg',
     onPrem: onPremInstructions(moduleName, platforms, context),
     elasticCloud: cloudInstructions(moduleName, platforms),
     onPremElasticCloud: onPremCloudInstructions(moduleName, platforms),

src/plugins/home/server/tutorials/coredns_metrics/index.ts

@@ -48,7 +48,7 @@ export function corednsMetricsSpecProvider(context: TutorialContext): TutorialSc
         learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-coredns.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/coredns.svg',
+    euiIconType: '/plugins/home/assets/logos/coredns.svg',
     artifacts: {
       application: {
         label: i18n.translate('home.tutorials.corednsMetrics.artifacts.application.label', {
@@ -62,7 +62,7 @@ export function corednsMetricsSpecProvider(context: TutorialContext): TutorialSc
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/coredns_metrics/screenshot.png',
+    previewImagePath: '/plugins/home/assets/coredns_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/couchdb_metrics/index.ts

@@ -48,7 +48,7 @@ export function couchdbMetricsSpecProvider(context: TutorialContext): TutorialSc
         learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-couchdb.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/couchdb.svg',
+    euiIconType: '/plugins/home/assets/logos/couchdb.svg',
     artifacts: {
       dashboards: [
         {
@@ -67,7 +67,7 @@ export function couchdbMetricsSpecProvider(context: TutorialContext): TutorialSc
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/couchdb_metrics/screenshot.png',
+    previewImagePath: '/plugins/home/assets/couchdb_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/docker_metrics/index.ts

@@ -64,7 +64,7 @@ export function dockerMetricsSpecProvider(context: TutorialContext): TutorialSch
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/docker_metrics/screenshot.png',
+    previewImagePath: '/plugins/home/assets/docker_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/envoyproxy_logs/index.ts

@@ -50,7 +50,7 @@ It supports both standalone deployment and Envoy proxy deployment in Kubernetes.
         learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-envoyproxy.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/envoyproxy.svg',
+    euiIconType: '/plugins/home/assets/logos/envoyproxy.svg',
     artifacts: {
       dashboards: [],
       application: {
@@ -64,7 +64,7 @@ It supports both standalone deployment and Envoy proxy deployment in Kubernetes.
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/envoyproxy_logs/screenshot.png',
+    previewImagePath: '/plugins/home/assets/envoyproxy_logs/screenshot.png',
     onPrem: onPremInstructions(moduleName, platforms, context),
     elasticCloud: cloudInstructions(moduleName, platforms),
     onPremElasticCloud: onPremCloudInstructions(moduleName, platforms),

src/plugins/home/server/tutorials/envoyproxy_metrics/index.ts

@@ -48,15 +48,14 @@ export function envoyproxyMetricsSpecProvider(context: TutorialContext): Tutoria
         learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-envoyproxy.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/envoyproxy.svg',
+    euiIconType: '/plugins/home/assets/logos/envoyproxy.svg',
     artifacts: {
       dashboards: [],
       exportedFields: {
         documentationUrl: '{config.docs.beats.metricbeat}/exported-fields-envoyproxy.html',
       },
     },
     completionTimeMinutes: 10,
-    // previewImagePath: '/plugins/kibana/home/tutorial_resources/envoyproxy_metrics/screenshot.png',
     onPrem: onPremInstructions(moduleName, context),
     elasticCloud: cloudInstructions(moduleName),
     onPremElasticCloud: onPremCloudInstructions(moduleName),

src/plugins/home/server/tutorials/ibmmq_logs/index.ts

@@ -48,7 +48,7 @@ export function ibmmqLogsSpecProvider(context: TutorialContext): TutorialSchema
         learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-ibmmq.html',
       },
     }),
-    euiIconType: '/plugins/kibana/home/tutorial_resources/logos/ibmmq.svg',
+    euiIconType: '/plugins/home/assets/logos/ibmmq.svg',
     artifacts: {
       dashboards: [
         {
@@ -64,7 +64,7 @@ export function ibmmqLogsSpecProvider(context: TutorialContext): TutorialSchema
       },
     },
     completionTimeMinutes: 10,
-    previewImagePath: '/plugins/kibana/home/tutorial_resources/ibmmq_logs/screenshot.png',
+    previewImagePath: '/plugins/home/assets/ibmmq_logs/screenshot.png',
     onPrem: onPremInstructions(moduleName, platforms, context),
     elasticCloud: cloudInstructions(moduleName, platforms),
     onPremElasticCloud: onPremCloudInstructions(moduleName, platforms),