Skip to content

Commit 4a3380b

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into logs-alerting
2 parents 7942328 + 46901f5 commit 4a3380b

23 files changed

Lines changed: 232 additions & 157 deletions

File tree

‎docs/visualize/color-picker.asciidoc‎

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

‎docs/visualize/lens.asciidoc‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,6 @@ beta[]
1414

1515
* Save your visualization for use in a dashboard.
1616

17-
[float]
18-
[[lens-aggregation]]
19-
=== Supported aggregations
20-
21-
Lens supports the following aggregations:
22-
23-
* <<visualize-metric-aggregations,Metric>>
24-
25-
* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
26-
27-
* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
28-
29-
* <<visualize-bucket-aggregations,Bucket>>
30-
3117
[float]
3218
[[drag-drop]]
3319
=== Drag and drop

‎docs/visualize/most-frequent.asciidoc‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,6 @@ The most frequently used visualizations include:
1313

1414
[[metric-chart]]
1515

16-
[float]
17-
[[frequently-used-viz-aggregation]]
18-
=== Supported aggregations
19-
20-
The most frequently used visualizations support the following aggregations:
21-
22-
* <<visualize-metric-aggregations,Metric>>
23-
24-
* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
25-
26-
* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
27-
28-
* <<visualize-bucket-aggregations,Bucket>>
29-
3016
[float]
3117
=== Configure your visualization
3218

‎docs/visualize/tilemap.asciidoc‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,6 @@ Display graphical representations of data where the individual values are repres
66
[role="screenshot"]
77
image::images/visualize_heat_map_example.png[]
88

9-
[float]
10-
[[build-heat-map]]
11-
=== Build a heat map
12-
13-
To display your data on the heat map, use the supported aggregations.
14-
15-
Heat maps support the following aggregations:
16-
17-
* <<visualize-metric-aggregations,Metric>>
18-
* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
19-
* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
20-
* <<visualize-bucket-aggregations,Bucket>>
21-
229
[float]
2310
[[navigate-heatmap]]
2411
=== Change the color ranges

‎docs/visualize/tsvb.asciidoc‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,6 @@ Table:: Display data from multiple time series by defining the field group to sh
4343
[role="screenshot"]
4444
image:images/tsvb-table.png["Table visualization"]
4545

46-
[float]
47-
[[tsvb-aggregation]]
48-
=== Supported aggregations
49-
50-
TSVB supports the following aggregations:
51-
52-
* <<visualize-metric-aggregations,Metric>>
53-
54-
* <<visualize-parent-pipeline-aggregations,Parent pipeline>>
55-
56-
* <<visualize-sibling-pipeline-aggregations,Sibling pipeline>>
57-
5846
[float]
5947
[[create-tsvb-visualization]]
6048
=== Create TSVB visualizations

‎docs/visualize/visualize_rollup_data.asciidoc‎

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

‎packages/kbn-optimizer/src/worker/webpack.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
289289

290290
resolve: {
291291
extensions: ['.js', '.ts', '.tsx', '.json'],
292+
mainFields: ['browser', 'main'],
292293
alias: {
293294
tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
294295
},

‎x-pack/plugins/apm/server/routes/settings/agent_configuration.ts‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,15 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
143143
params: {
144144
body: t.intersection([
145145
t.type({ service: serviceRt }),
146-
t.partial({ etag: t.string })
146+
t.partial({ etag: t.string, mark_as_applied_by_agent: t.boolean })
147147
])
148148
},
149149
handler: async ({ context, request }) => {
150-
const { service, etag } = context.params.body;
150+
const {
151+
service,
152+
etag,
153+
mark_as_applied_by_agent: markAsAppliedByAgent
154+
} = context.params.body;
151155

152156
const setup = await setupRequest(context, request);
153157
const config = await searchConfigurations({
@@ -166,9 +170,14 @@ export const agentConfigurationSearchRoute = createRoute(core => ({
166170
`Config was found for ${service.name}/${service.environment}`
167171
);
168172

169-
// update `applied_by_agent` field if etags match
173+
// update `applied_by_agent` field
174+
// when `markAsAppliedByAgent` is true (Jaeger agent doesn't have etags)
175+
// or if etags match.
170176
// this happens in the background and doesn't block the response
171-
if (etag === config._source.etag && !config._source.applied_by_agent) {
177+
if (
178+
(markAsAppliedByAgent || etag === config._source.etag) &&
179+
!config._source.applied_by_agent
180+
) {
172181
markAppliedByAgent({ id: config._id, body: config._source, setup });
173182
}
174183

‎x-pack/plugins/ingest_manager/common/constants/output.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ export const DEFAULT_OUTPUT = {
1212
is_default: true,
1313
type: OutputType.Elasticsearch,
1414
hosts: [''],
15-
api_key: '',
1615
};

‎x-pack/plugins/ingest_manager/common/types/models/agent.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ export interface NewAgentAction {
2020
sent_at?: string;
2121
}
2222

23-
export type AgentAction = NewAgentAction & {
23+
export interface AgentAction extends NewAgentAction {
2424
id: string;
2525
agent_id: string;
2626
created_at: string;
27-
} & SavedObjectAttributes;
27+
}
2828

29-
export interface AgentActionSOAttributes extends NewAgentAction, SavedObjectAttributes {
29+
export interface AgentActionSOAttributes extends SavedObjectAttributes {
30+
type: 'CONFIG_CHANGE' | 'DATA_DUMP' | 'RESUME' | 'PAUSE';
31+
sent_at?: string;
3032
created_at: string;
3133
agent_id: string;
34+
data?: string;
3235
}
3336

3437
export interface AgentEvent {
@@ -64,6 +67,7 @@ interface AgentBase {
6467
shared_id?: string;
6568
access_api_key_id?: string;
6669
default_api_key?: string;
70+
default_api_key_id?: string;
6771
config_id?: string;
6872
config_revision?: number | null;
6973
config_newest_revision?: number;

0 commit comments

Comments
 (0)