Skip to content

Commit 4ddf9c8

Browse files
ppisljartimroes
authored andcommitted
Move timeout to _msearch body in TSVB requests (#26510)
* fixing broken tsvb * removing `ignore: [404]`
1 parent a015f03 commit 4ddf9c8

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

src/core_plugins/metrics/server/lib/vis_data/get_annotations.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,12 @@ export default async (req, panel) => {
3939

4040
bodies.push({
4141
index: indexPattern,
42-
ignore: [404],
43-
timeout: '90s',
44-
requestTimeout: 90000,
4542
ignoreUnavailable: true,
4643
});
4744

48-
bodies.push(buildAnnotationRequest(req, panel, annotation));
45+
const body = buildAnnotationRequest(req, panel, annotation);
46+
body.timeout = '90s';
47+
bodies.push(body);
4948
return bodies;
5049
});
5150

src/core_plugins/metrics/server/lib/vis_data/series/get_request_params.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ export default (req, panel, series) => {
2525

2626
bodies.push({
2727
index: indexPattern,
28-
ignore: [404],
29-
timeout: '90s',
30-
requestTimeout: 90000,
3128
ignoreUnavailable: true,
3229
});
3330

34-
bodies.push(buildRequestBody(req, panel, series));
31+
const body = buildRequestBody(req, panel, series);
32+
body.timeout = '90s';
33+
bodies.push(body);
3534
return bodies;
3635
};

src/core_plugins/metrics/server/lib/vis_data/table/get_request_params.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ export default (req, panel, entities) => {
2323
entities.forEach(entity => {
2424
bodies.push({
2525
index: panel.index_pattern,
26-
ignore: [404],
27-
timeout: '90s',
28-
requestTimeout: 90000,
2926
ignoreUnavailable: true,
3027
});
31-
bodies.push(buildRequestBody(req, panel, entity));
28+
const body = buildRequestBody(req, panel, entity);
29+
body.timeout = '90s';
30+
bodies.push(body);
3231
});
3332
return bodies;
3433
};

0 commit comments

Comments
 (0)