Skip to content

Commit 61626a0

Browse files
committed
Merge branch 'master' into actions/feature
* master: (46 commits) [Composable template] Details panel + delete functionality (elastic#70814) [Uptime] Ping list body scroll (elastic#70781) moving indexPattern.delete() to indexPatterns.delete(indexPattern) (elastic#70430) Adapt expected response of advanced settings feature control for cloud tests (elastic#70793) skip flaky suite (elastic#70885) skip flaky suite (elastic#67814) skip flaky suite (elastic#70906) Revert "reenable regression and classification functional tests (elastic#70661)" (elastic#70908) Added UI validation when creating a Webhook connector with invalid URL (elastic#70025) [Security Solution] Change default index pattern (elastic#70797) ServiceNow push to Incident generic implementation (supporting both Case specific and generic Alerts) (elastic#68464) add button link to ingest (elastic#70142) reenable regression and classification functional tests (elastic#70661) [Component templates] Form wizard (elastic#69732) [Ingest Manager] Copy changes (elastic#70828) Adding test user to maps functional tests - PR 1 (elastic#70649) [Ingest Manager] Support limiting integrations on an agent config (elastic#70542) skip flaky suite (elastic#70880) [Metrics UI] Fix a bug in Metric Threshold query filter construction (elastic#70672) upgrade caniuse-lite database (elastic#70833) ...
2 parents da1f944 + 053b922 commit 61626a0

File tree

389 files changed

+16915
-5789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+16915
-5789
lines changed

docs/apm/api.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ allowing you to easily see how these events are impacting the performance of you
355355

356356
By default, annotations are stored in a newly created `observability-annotations` index.
357357
The name of this index can be changed in your `config.yml` by editing `xpack.observability.annotations.index`.
358+
If you change the default index name, you'll also need to <<apm-app-annotation-user-create,update your user privileges>> accordingly.
358359

359360
The following APIs are available:
360361

docs/apm/apm-app-users.asciidoc

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
:beat_default_index_prefix: apm
66
:beat_kib_app: APM app
7-
:annotation_index: `observability-annotations`
7+
:annotation_index: observability-annotations
88

99
++++
1010
<titleabbrev>Users and privileges</titleabbrev>
@@ -102,6 +102,54 @@ Here are two examples:
102102
*********************************** ***********************************
103103
////
104104

105+
[role="xpack"]
106+
[[apm-app-annotation-user-create]]
107+
=== APM app annotation user
108+
109+
++++
110+
<titleabbrev>Create an annotation user</titleabbrev>
111+
++++
112+
113+
NOTE: By default, the `apm_user` built-in role provides access to Observability annotations.
114+
You only need to create an annotation user if the default annotation index
115+
defined in <<apm-settings-kb,`xpack.observability.annotations.index`>> has been customized.
116+
117+
[[apm-app-annotation-user]]
118+
==== Annotation user
119+
120+
View deployment annotations in the APM app.
121+
122+
. Create a new role, named something like `annotation_user`,
123+
and assign the following privileges:
124+
+
125+
[options="header"]
126+
|====
127+
|Type | Privilege | Purpose
128+
129+
|Index
130+
|`read` on +\{ANNOTATION_INDEX\}+^1^
131+
|Read-only access to the observability annotation index
132+
133+
|Index
134+
|`view_index_metadata` on +\{ANNOTATION_INDEX\}+^1^
135+
|Read-only access to observability annotation index metadata
136+
|====
137+
+
138+
^1^ +\{ANNOTATION_INDEX\}+ should be the index name you've defined in
139+
<<apm-settings-kb,`xpack.observability.annotations.index`>>.
140+
141+
. Assign the `annotation_user` created previously, and the built-in roles necessary to create
142+
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
143+
144+
[[apm-app-annotation-api]]
145+
==== Annotation API
146+
147+
See <<apm-app-api-user>>.
148+
149+
////
150+
*********************************** ***********************************
151+
////
152+
105153
[role="xpack"]
106154
[[apm-app-central-config-user]]
107155
=== APM app central config user

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.destroy.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export declare class IndexPattern implements IIndexPattern
3939
| [\_fetchFields()](./kibana-plugin-plugins-data-public.indexpattern._fetchfields.md) | | |
4040
| [addScriptedField(name, script, fieldType, lang)](./kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md) | | |
4141
| [create(allowOverride)](./kibana-plugin-plugins-data-public.indexpattern.create.md) | | |
42-
| [destroy()](./kibana-plugin-plugins-data-public.indexpattern.destroy.md) | | |
4342
| [getAggregationRestrictions()](./kibana-plugin-plugins-data-public.indexpattern.getaggregationrestrictions.md) | | |
4443
| [getComputedFields()](./kibana-plugin-plugins-data-public.indexpattern.getcomputedfields.md) | | |
4544
| [getFieldByName(name)](./kibana-plugin-plugins-data-public.indexpattern.getfieldbyname.md) | | |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ two out-of-the box connectors: <<slack-action-type, Slack>> and <<webhook-action
2828
my-slack1: <1>
2929
actionTypeId: .slack <2>
3030
name: 'Slack #xyz' <3>
31-
secrets: <4>
31+
secrets:
3232
webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz'
3333
webhook-service:
3434
actionTypeId: .webhook
3535
name: 'Email service'
36-
config:
36+
config: <4>
3737
url: 'https://email-alert-service.elastic.co'
3838
method: post
3939
headers:

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,10 @@
455455
"is-path-inside": "^2.1.0",
456456
"istanbul-instrumenter-loader": "3.0.1",
457457
"jest": "^25.5.4",
458-
"jest-environment-jsdom-thirteen": "^1.0.1",
458+
"jest-canvas-mock": "^2.2.0",
459459
"jest-circus": "^25.5.4",
460460
"jest-cli": "^25.5.4",
461+
"jest-environment-jsdom-thirteen": "^1.0.1",
461462
"jest-raw-loader": "^1.0.1",
462463
"jimp": "^0.9.6",
463464
"json5": "^1.0.1",

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

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { inspect } from 'util';
2424

2525
import cpy from 'cpy';
2626
import del from 'del';
27-
import { toArray, tap } from 'rxjs/operators';
27+
import { toArray, tap, filter } from 'rxjs/operators';
2828
import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
2929
import { runOptimizer, OptimizerConfig, OptimizerUpdate, logOptimizerState } from '@kbn/optimizer';
3030

@@ -63,8 +63,7 @@ afterAll(async () => {
6363
await del(TMP_DIR);
6464
});
6565

66-
// FLAKY: https://github.com/elastic/kibana/issues/70762
67-
it.skip('builds expected bundles, saves bundle counts to metadata', async () => {
66+
it('builds expected bundles, saves bundle counts to metadata', async () => {
6867
const config = OptimizerConfig.create({
6968
repoRoot: MOCK_REPO_DIR,
7069
pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
@@ -75,7 +74,11 @@ it.skip('builds expected bundles, saves bundle counts to metadata', async () =>
7574
expect(config).toMatchSnapshot('OptimizerConfig');
7675

7776
const msgs = await runOptimizer(config)
78-
.pipe(logOptimizerState(log, config), toArray())
77+
.pipe(
78+
logOptimizerState(log, config),
79+
filter((x) => x.event?.type !== 'worker stdio'),
80+
toArray()
81+
)
7982
.toPromise();
8083

8184
const assert = (statement: string, truth: boolean, altStates?: OptimizerUpdate[]) => {
@@ -168,8 +171,7 @@ it.skip('builds expected bundles, saves bundle counts to metadata', async () =>
168171
`);
169172
});
170173

171-
// FLAKY: https://github.com/elastic/kibana/issues/70764
172-
it.skip('uses cache on second run and exist cleanly', async () => {
174+
it('uses cache on second run and exist cleanly', async () => {
173175
const config = OptimizerConfig.create({
174176
repoRoot: MOCK_REPO_DIR,
175177
pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)