Skip to content

Commit a63d634

Browse files
FrankHassanabadFrankHassanabad
committed
Merge branch 'master' into follow-ups
2 parents 4953082 + 08ca314 commit a63d634

69 files changed

Lines changed: 1088 additions & 736 deletions

File tree

Some content is hidden

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

‎docs/settings/ingest-manager-settings.asciidoc‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
[role="xpack"]
2+
[[ingest-manager-settings-kb]]
3+
=== {ingest-manager} settings in {kib}
4+
++++
5+
<titleabbrev>{ingest-manager} settings</titleabbrev>
6+
++++
7+
8+
You can configure `xpack.ingestManager` settings in your `kibana.yml`.
9+
By default, {ingest-manager} is not enabled. You need to enable it. To use {fleet}, you also need to configure {kib} and {es} hosts.
10+
11+
[[general-ingest-manager-settings-kb]]
12+
==== General {ingest-manager} settings
13+
14+
[cols="2*<"]
15+
|===
16+
| `xpack.ingestManager.enabled` {ess-icon}
17+
| Set to `true` to enable {ingest-manager}.
18+
|===
19+
20+
[cols="2*<"]
21+
|===
22+
| `xpack.ingestManager.epm.enabled` {ess-icon}
23+
| Set to `true` (default) to enable {package-manager}.
24+
|===
25+
26+
[cols="2*<"]
27+
|===
28+
| `xpack.ingestManager.fleet.enabled` {ess-icon}
29+
| Set to `true` (default) to enable {fleet}.
30+
|===
31+
32+
[[ingest-manager-data-visualizer-settings]]
33+
34+
==== {package-manager} settings
35+
36+
[cols="2*<"]
37+
|===
38+
| `xpack.ingestManager.epm.registryUrl`
39+
| The address to use to reach {package-manager} registry.
40+
|===
41+
42+
==== {fleet} settings
43+
44+
[cols="2*<"]
45+
|===
46+
| `xpack.ingestManager.fleet.kibana.host`
47+
| The hostname used by {agent} for accessing {kib}.
48+
|===
49+
50+
[cols="2*<"]
51+
|===
52+
| `xpack.ingestManager.fleet.elasticsearch.host`
53+
| The hostname used by {agent} for accessing {es}.
54+
|===
55+
56+
[cols="2*<"]
57+
|===
58+
| `xpack.ingestManager.fleet.tlsCheckDisabled`
59+
| Set to `true` to allow {fleet} to run on a {kib} instance without TLS enabled.
60+
|===
61+
62+
[NOTE]
63+
====
64+
In {ecloud}, {fleet} flags are already configured.
65+
====

‎docs/settings/settings-xkb.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ include::ml-settings.asciidoc[]
2020
include::reporting-settings.asciidoc[]
2121
include::spaces-settings.asciidoc[]
2222
include::i18n-settings.asciidoc[]
23+
include::ingest-manager-settings.asciidoc[]

‎docs/setup/settings.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,3 +643,4 @@ include::secure-settings.asciidoc[]
643643
include::{kib-repo-dir}/settings/security-settings.asciidoc[]
644644
include::{kib-repo-dir}/settings/spaces-settings.asciidoc[]
645645
include::{kib-repo-dir}/settings/telemetry-settings.asciidoc[]
646+
include::{docdir}/settings/ingest-manager-settings.asciidoc[]

‎src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap‎

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

‎src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ describe('SavedObjectsTable', () => {
395395
component.instance().showImportFlyout();
396396
component.update();
397397

398-
expect(component.find(Flyout)).toMatchSnapshot();
398+
expect(component.find(Flyout).length).toBe(1);
399399
});
400400

401401
it('should hide the flyout', async () => {
@@ -450,7 +450,7 @@ describe('SavedObjectsTable', () => {
450450
} as SavedObjectWithMetadata);
451451
component.update();
452452

453-
expect(component.find(Relationships)).toMatchSnapshot();
453+
expect(component.find(Relationships).length).toBe(1);
454454
expect(component.state('relationshipObject')).toEqual({
455455
id: '2',
456456
type: 'search',

‎x-pack/plugins/apm/common/ml_job_constants.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ export enum severity {
1111
warning = 'warning',
1212
}
1313

14+
export const APM_ML_JOB_GROUP_NAME = 'apm';
15+
1416
export function getMlPrefix(serviceName: string, transactionType?: string) {
1517
const maybeTransactionType = transactionType ? `${transactionType}-` : '';
1618
return encodeForMlApi(`${serviceName}-${maybeTransactionType}`);

‎x-pack/plugins/apm/common/service_map.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ export interface Connection {
3434
destination: ConnectionNode;
3535
}
3636

37+
export interface ServiceAnomaly {
38+
anomaly_score: number;
39+
anomaly_severity: string;
40+
actual_value: number;
41+
typical_value: number;
42+
ml_job_id: string;
43+
}
44+
45+
export type ServiceNode = ConnectionNode & Partial<ServiceAnomaly>;
46+
3747
export interface ServiceNodeMetrics {
3848
avgMemoryUsage: number | null;
3949
avgCpuUsage: number | null;

‎x-pack/plugins/apm/common/utils/left_join.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License;
4+
* you may not use this file except in compliance with the Elastic License.
5+
*/
6+
import { Assign, Omit } from 'utility-types';
7+
8+
export function leftJoin<
9+
TL extends object,
10+
K extends keyof TL,
11+
TR extends Pick<TL, K>
12+
>(leftRecords: TL[], matchKey: K, rightRecords: TR[]) {
13+
const rightLookup = new Map(
14+
rightRecords.map((record) => [record[matchKey], record])
15+
);
16+
return leftRecords.map((record) => {
17+
const matchProp = (record[matchKey] as unknown) as TR[K];
18+
const matchingRightRecord = rightLookup.get(matchProp);
19+
return { ...record, ...matchingRightRecord };
20+
}) as Array<Assign<TL, Partial<Omit<TR, K>>>>;
21+
}

‎x-pack/plugins/apm/kibana.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"actions",
1818
"alerts",
1919
"observability",
20-
"security"
20+
"security",
21+
"ml"
2122
],
2223
"server": true,
2324
"ui": true,

0 commit comments

Comments
 (0)