Merge branch 'master' into task-manager/fix-flaky-test

* master: (39 commits) [Canvas][tech-debt] Rename __examples__ to __stories__ (elastic#73853) [Canvas] Storybook Redux Addon (elastic#73227) Use "Apply_filter_trigger" in "explore underlying data" action (elastic#71445) [maps] convert top nav config to TS (elastic#73851) [maps] fix fit to bounds for ES document layers with joins (elastic#73985) [Canvas][tech-debt] Refactor Toolbar (completes Kill Recompose.pure) (elastic#73309) [CI] In-progress Slack notifications (elastic#74012) [SIEM][Detection Engine] Fixes tags to accept characters such as AND, OR, (, ), ", * (elastic#74003) [SECURITY_SOLUTION][ENDPOINT] Fix host list Configuration Status cell link loosing list page/size state (elastic#73989) Tweak injected metadata (elastic#73990) Closes elastic#73998 by using `canAccessML` in the ML capabilities API to (elastic#73999) [SIEM] Fixes toaster errors when siemDefault index is an empty or empty spaces (elastic#73991) [Security Solution] Fix timeline pin event callback (elastic#73981) [Security Solution] Fix unexpected redirect (elastic#73969) [Metrics UI] Fix Metrics Explorer TSVB link to use workaround pattern (elastic#73986) [APM] docs: Update machine learning integration (elastic#73597) [Ingest Manager] Fix limited concurrency helper (elastic#73976) [build/sysv] fix missing env variable rename (elastic#73977) Fix a typo. (elastic#73948) [Ingest Manager] Revert fleet config concurrency rollout to rate limit (elastic#73940) ...
gmmorris · Aug 2, 2020 · dffcdf9 · dffcdf9
2 parents 9be0b3e + 2d2e959
commit dffcdf9
Show file tree

Hide file tree

Showing 438 changed files with 6,753 additions and 4,606 deletions.
diff --git a/.ci/pipeline-library/src/test/slackNotifications.groovy b/.ci/pipeline-library/src/test/slackNotifications.groovy
@@ -9,6 +9,7 @@ class SlackNotificationsTest extends KibanaBasePipelineTest {
     super.setUp()
 
     helper.registerAllowedMethod('slackSend', [Map.class], null)
+    prop('buildState', loadScript("vars/buildState.groovy"))
     slackNotifications = loadScript('vars/slackNotifications.groovy')
   }
 
@@ -25,13 +26,49 @@ class SlackNotificationsTest extends KibanaBasePipelineTest {
   }
 
   @Test
-  void 'sendFailedBuild() should call slackSend() with message'() {
+  void 'sendFailedBuild() should call slackSend() with an in-progress message'() {
     mockFailureBuild()
 
     slackNotifications.sendFailedBuild()
 
     def args = fnMock('slackSend').args[0]
 
+    def expected = [
+      channel: '#kibana-operations-alerts',
+      username: 'Kibana Operations',
+      iconEmoji: ':jenkins:',
+      color: 'danger',
+      message: ':hourglass_flowing_sand: elastic / kibana # master #1',
+    ]
+
+    expected.each {
+      assertEquals(it.value.toString(), args[it.key].toString())
+    }
+
+    assertEquals(
+      ":hourglass_flowing_sand: *<http://jenkins.localhost:8080/job/elastic+kibana+master/1/|elastic / kibana # master #1>*",
+      args.blocks[0].text.text.toString()
+    )
+
+    assertEquals(
+      "*Failed Steps*\n• <http://jenkins.localhost:8080|Execute test task>",
+      args.blocks[1].text.text.toString()
+    )
+
+    assertEquals(
+      "*Test Failures*\n• <https://localhost/|x-pack/test/functional/apps/fake/test·ts.Fake test &lt;Component&gt; should &amp; pass &amp;>",
+      args.blocks[2].text.text.toString()
+    )
+  }
+
+  @Test
+  void 'sendFailedBuild() should call slackSend() with message'() {
+    mockFailureBuild()
+
+    slackNotifications.sendFailedBuild(isFinal: true)
+
+    def args = fnMock('slackSend').args[0]
+
     def expected = [
       channel: '#kibana-operations-alerts',
       username: 'Kibana Operations',
@@ -65,7 +102,7 @@ class SlackNotificationsTest extends KibanaBasePipelineTest {
     mockFailureBuild()
     def counter = 0
     helper.registerAllowedMethod('slackSend', [Map.class], { ++counter > 1 })
-    slackNotifications.sendFailedBuild()
+    slackNotifications.sendFailedBuild(isFinal: true)
 
     def args = fnMocks('slackSend')[1].args[0]
 
@@ -88,6 +125,29 @@ class SlackNotificationsTest extends KibanaBasePipelineTest {
     )
   }
 
+  @Test
+  void 'sendFailedBuild() should call slackSend() with a channel id and timestamp on second call'() {
+    mockFailureBuild()
+    helper.registerAllowedMethod('slackSend', [Map.class], { [ channelId: 'CHANNEL_ID', ts: 'TIMESTAMP' ] })
+    slackNotifications.sendFailedBuild(isFinal: false)
+    slackNotifications.sendFailedBuild(isFinal: true)
+
+    def args = fnMocks('slackSend')[1].args[0]
+
+    def expected = [
+      channel: 'CHANNEL_ID',
+      timestamp: 'TIMESTAMP',
+      username: 'Kibana Operations',
+      iconEmoji: ':jenkins:',
+      color: 'danger',
+      message: ':broken_heart: elastic / kibana # master #1',
+    ]
+
+    expected.each {
+      assertEquals(it.value.toString(), args[it.key].toString())
+    }
+  }
+
   @Test
   void 'getTestFailures() should truncate list of failures to 10'() {
     prop('testUtils', [

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,59 +4,60 @@ library 'kibana-pipeline-library'
 kibanaLibrary.load()
 
 kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
-  githubPr.withDefaultPrComments {
-    ciStats.trackBuild {
-      catchError {
-        retryable.enable()
-        parallel([
-          '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-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
-            'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
-            'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
-            'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
-            'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
-            'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
-            'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
-            'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
-            'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
-            'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
-            'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
-            'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
-            'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
-            // '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-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
-            'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
-            'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
-            'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
-            'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
-            'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
-            'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
-            'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
-            'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
-            'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
-            'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
-            'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
-            'xpack-securitySolutionCypress': { processNumber ->
-              whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/', 'x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/', 'x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx']) {
-                kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
-              }
-            },
+  slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
+    githubPr.withDefaultPrComments {
+      ciStats.trackBuild {
+        catchError {
+          retryable.enable()
+          parallel([
+            '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-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
+              'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
+              'oss-ciGroup3': kibanaPipeline.ossCiGroupProcess(3),
+              'oss-ciGroup4': kibanaPipeline.ossCiGroupProcess(4),
+              'oss-ciGroup5': kibanaPipeline.ossCiGroupProcess(5),
+              'oss-ciGroup6': kibanaPipeline.ossCiGroupProcess(6),
+              'oss-ciGroup7': kibanaPipeline.ossCiGroupProcess(7),
+              'oss-ciGroup8': kibanaPipeline.ossCiGroupProcess(8),
+              'oss-ciGroup9': kibanaPipeline.ossCiGroupProcess(9),
+              'oss-ciGroup10': kibanaPipeline.ossCiGroupProcess(10),
+              'oss-ciGroup11': kibanaPipeline.ossCiGroupProcess(11),
+              'oss-ciGroup12': kibanaPipeline.ossCiGroupProcess(12),
+              'oss-accessibility': kibanaPipeline.functionalTestProcess('kibana-accessibility', './test/scripts/jenkins_accessibility.sh'),
+              // '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-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
+              'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
+              'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
+              'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
+              'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
+              'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
+              'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
+              'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
+              'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
+              'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
+              'xpack-accessibility': kibanaPipeline.functionalTestProcess('xpack-accessibility', './test/scripts/jenkins_xpack_accessibility.sh'),
+              'xpack-savedObjectsFieldMetrics': kibanaPipeline.functionalTestProcess('xpack-savedObjectsFieldMetrics', './test/scripts/jenkins_xpack_saved_objects_field_metrics.sh'),
+              'xpack-securitySolutionCypress': { processNumber ->
+                whenChanged(['x-pack/plugins/security_solution/', 'x-pack/test/security_solution_cypress/', 'x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/', 'x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx']) {
+                  kibanaPipeline.functionalTestProcess('xpack-securitySolutionCypress', './test/scripts/jenkins_security_solution_cypress.sh')(processNumber)
+                }
+              },
 
-            // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
-          ]),
-        ])
+              // 'xpack-visualRegression': kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh'),
+            ]),
+          ])
+        }
       }
     }
   }
 
   if (params.NOTIFY_ON_FAILURE) {
-    slackNotifications.onFailure()
     kibanaPipeline.sendMail()
   }
 }
diff --git a/docs/apm/images/apm-anomaly-alert.png b/docs/apm/images/apm-anomaly-alert.png
diff --git a/docs/apm/machine-learning.asciidoc b/docs/apm/machine-learning.asciidoc
@@ -1,36 +1,61 @@
 [role="xpack"]
 [[machine-learning-integration]]
-===  integration
+=== Machine learning integration
 
 ++++
 <titleabbrev>Integrate with machine learning</titleabbrev>
 ++++
 
-The Machine Learning integration initiates a new job predefined to calculate anomaly scores on APM transaction durations.
-Jobs can be created per transaction type, and are based on the service's average response time.
+The Machine learning integration initiates a new job predefined to calculate anomaly scores on APM transaction durations.
+With this integration, you can quickly pinpoint anomalous transactions and see the health of
+any upstream and downstream services.
 
-After a machine learning job is created, results are shown in two places:
+Machine learning jobs are created per environment, and are based on a service's average response time.
+Because jobs are created at the environment level,
+you can add new services to your existing environments without the need for additional machine learning jobs.
 
-The transaction duration graph will show the expected bounds and add an annotation when the anomaly score is 75 or above.
+After a machine learning job is created, results are shown in two places:
 
+* The transaction duration chart will show the expected bounds and add an annotation when the anomaly score is 75 or above.
++
 [role="screenshot"]
 image::apm/images/apm-ml-integration.png[Example view of anomaly scores on response times in the APM app]
 
-Service maps will display a color-coded anomaly indicator based on the detected anomaly score.
-
+* Service maps will display a color-coded anomaly indicator based on the detected anomaly score.
++
 [role="screenshot"]
 image::apm/images/apm-service-map-anomaly.png[Example view of anomaly scores on service maps in the APM app]
 
 [float]
 [[create-ml-integration]]
-=== Create a new machine learning job
+=== Enable anomaly detection
+
+To enable machine learning anomaly detection:
+
+. From the Services overview, Traces overview, or Service Map tab,
+select **Anomaly detection**.
+
+. Click **Create ML Job**.
 
-To enable machine learning anomaly detection, first choose a service to monitor.
-Then, select **Integrations** > **Enable ML anomaly detection** and click **Create job**.
+. Machine learning jobs are created at the environment level.
+Select all of the service environments that you want to enable anomaly detection in.
+Anomalies will surface for all services and transaction types within the selected environments.
+
+. Click **Create Jobs**.
 
 That's it! After a few minutes, the job will begin calculating results;
-it might take additional time for results to appear on your graph.
-Jobs can be managed in *Machine Learning jobs management*.
+it might take additional time for results to appear on your service maps.
+Existing jobs can be managed in *Machine Learning jobs management*.
 
 APM specific anomaly detection wizards are also available for certain Agents.
 See the machine learning {ml-docs}/ootb-ml-jobs-apm.html[APM anomaly detection configurations] for more information.
+
+[float]
+[[warning-ml-integration]]
+=== Anomaly detection warning
+
+To make machine learning as easy as possible to set up,
+the APM app will warn you when filtered to an environment without a machine learning job.
+
+[role="screenshot"]
+image::apm/images/apm-anomaly-alert.png[Example view of anomaly alert in the APM app]
diff --git a/...lopment/core/server/kibana-plugin-core-server.kibanarequestevents.completed_.md b/...lopment/core/server/kibana-plugin-core-server.kibanarequestevents.completed_.md
@@ -0,0 +1,18 @@
+<!-- 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; [KibanaRequestEvents](./kibana-plugin-core-server.kibanarequestevents.md) &gt; [completed$](./kibana-plugin-core-server.kibanarequestevents.completed_.md)
+
+## KibanaRequestEvents.completed$ property
+
+Observable that emits once if and when the request has been completely handled.
+
+<b>Signature:</b>
+
+```typescript
+completed$: Observable<void>;
+```
+
+## Remarks
+
+The request may be considered completed if: - A response has been sent to the client; or - The request was aborted.
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.kibanarequestevents.md b/docs/development/core/server/kibana-plugin-core-server.kibanarequestevents.md
@@ -17,4 +17,5 @@ export interface KibanaRequestEvents
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [aborted$](./kibana-plugin-core-server.kibanarequestevents.aborted_.md) | <code>Observable&lt;void&gt;</code> | Observable that emits once if and when the request has been aborted. |
+|  [completed$](./kibana-plugin-core-server.kibanarequestevents.completed_.md) | <code>Observable&lt;void&gt;</code> | Observable that emits once if and when the request has been completely handled. |