Merge branch 'master' into fix/aggs-remove-deps

docs/apm/api.asciidoc

@@ -355,6 +355,7 @@ allowing you to easily see how these events are impacting the performance of you
 
 By default, annotations are stored in a newly created `observability-annotations` index.
 The name of this index can be changed in your `config.yml` by editing `xpack.observability.annotations.index`.
+If you change the default index name, you'll also need to <<apm-app-annotation-user-create,update your user privileges>> accordingly.
 
 The following APIs are available:
 

docs/apm/apm-app-users.asciidoc

@@ -4,7 +4,7 @@
 
 :beat_default_index_prefix: apm
 :beat_kib_app: APM app
-:annotation_index: `observability-annotations`
+:annotation_index: observability-annotations
 
 ++++
 <titleabbrev>Users and privileges</titleabbrev>
@@ -102,6 +102,54 @@ Here are two examples:
 ***********************************  ***********************************
 ////
 
+[role="xpack"]
+[[apm-app-annotation-user-create]]
+=== APM app annotation user
+
+++++
+<titleabbrev>Create an annotation user</titleabbrev>
+++++
+
+NOTE: By default, the `apm_user` built-in role provides access to Observability annotations.
+You only need to create an annotation user if the default annotation index
+defined in <<apm-settings-kb,`xpack.observability.annotations.index`>> has been customized.
+
+[[apm-app-annotation-user]]
+==== Annotation user
+
+View deployment annotations in the APM app.
+
+. Create a new role, named something like `annotation_user`,
+and assign the following privileges:
++
+[options="header"]
+|====
+|Type | Privilege | Purpose
+
+|Index
+|`read` on +\{ANNOTATION_INDEX\}+^1^
+|Read-only access to the observability annotation index
+
+|Index
+|`view_index_metadata` on +\{ANNOTATION_INDEX\}+^1^
+|Read-only access to observability annotation index metadata
+|====
++
+^1^ +\{ANNOTATION_INDEX\}+ should be the index name you've defined in
+<<apm-settings-kb,`xpack.observability.annotations.index`>>.
+
+. Assign the `annotation_user` created previously, and the built-in roles necessary to create
+a <<apm-app-reader-full,full>> or <<apm-app-reader-partial,partial>> APM reader to any users that need to view annotations in the APM app
+
+[[apm-app-annotation-api]]
+==== Annotation API
+
+See <<apm-app-api-user>>.
+
+////
+***********************************  ***********************************
+////
+
 [role="xpack"]
 [[apm-app-central-config-user]]
 === APM app central config user

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

@@ -28,12 +28,12 @@ two out-of-the box connectors: <<slack-action-type, Slack>> and <<webhook-action
     my-slack1:                  <1>
       actionTypeId: .slack      <2>
       name: 'Slack #xyz'        <3>
-      secrets:                   <4>
+      secrets:
         webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz'
     webhook-service:
       actionTypeId: .webhook
       name: 'Email service'
-      config:
+      config:                   <4>
         url: 'https://email-alert-service.elastic.co'
         method: post
         headers:

package.json

@@ -455,9 +455,10 @@
     "is-path-inside": "^2.1.0",
     "istanbul-instrumenter-loader": "3.0.1",
     "jest": "^25.5.4",
-    "jest-environment-jsdom-thirteen": "^1.0.1",
+    "jest-canvas-mock": "^2.2.0",
     "jest-circus": "^25.5.4",
     "jest-cli": "^25.5.4",
+    "jest-environment-jsdom-thirteen": "^1.0.1",
     "jest-raw-loader": "^1.0.1",
     "jimp": "^0.9.6",
     "json5": "^1.0.1",

packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts

@@ -24,7 +24,7 @@ import { inspect } from 'util';
 
 import cpy from 'cpy';
 import del from 'del';
-import { toArray, tap } from 'rxjs/operators';
+import { toArray, tap, filter } from 'rxjs/operators';
 import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { runOptimizer, OptimizerConfig, OptimizerUpdate, logOptimizerState } from '@kbn/optimizer';
 
@@ -63,8 +63,7 @@ afterAll(async () => {
   await del(TMP_DIR);
 });
 
-// FLAKY: https://github.com/elastic/kibana/issues/70762
-it.skip('builds expected bundles, saves bundle counts to metadata', async () => {
+it('builds expected bundles, saves bundle counts to metadata', async () => {
   const config = OptimizerConfig.create({
     repoRoot: MOCK_REPO_DIR,
     pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
@@ -75,7 +74,11 @@ it.skip('builds expected bundles, saves bundle counts to metadata', async () =>
   expect(config).toMatchSnapshot('OptimizerConfig');
 
   const msgs = await runOptimizer(config)
-    .pipe(logOptimizerState(log, config), toArray())
+    .pipe(
+      logOptimizerState(log, config),
+      filter((x) => x.event?.type !== 'worker stdio'),
+      toArray()
+    )
     .toPromise();
 
   const assert = (statement: string, truth: boolean, altStates?: OptimizerUpdate[]) => {
@@ -168,8 +171,7 @@ it.skip('builds expected bundles, saves bundle counts to metadata', async () =>
   `);
 });
 
-// FLAKY: https://github.com/elastic/kibana/issues/70764
-it.skip('uses cache on second run and exist cleanly', async () => {
+it('uses cache on second run and exist cleanly', async () => {
   const config = OptimizerConfig.create({
     repoRoot: MOCK_REPO_DIR,
     pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],

src/plugins/data/public/ui/query_string_input/no_data_popover.tsx

@@ -56,7 +56,7 @@ export function NoDataPopover({
           <p style={{ maxWidth: 300 }}>
             {i18n.translate('data.noDataPopover.content', {
               defaultMessage:
-                "This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts",
+                "This time range doesn't contain any data. Increase or adjust the time range to see more fields and create charts.",
             })}
           </p>
         </EuiText>
@@ -66,11 +66,13 @@ export function NoDataPopover({
       step={1}
       stepsTotal={1}
       isStepOpen={noDataPopoverVisible}
-      subtitle={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Tip' })}
-      title=""
+      subtitle={i18n.translate('data.noDataPopover.subtitle', { defaultMessage: 'Tip' })}
+      title={i18n.translate('data.noDataPopover.title', { defaultMessage: 'Empty dataset' })}
       footerAction={
         <EuiButtonEmpty
-          size="s"
+          size="xs"
+          flush="right"
+          color="text"
           data-test-subj="noDataPopoverDismissButton"
           onClick={() => {
             storage.set(NO_DATA_POPOVER_STORAGE_KEY, true);