Move timeout to _msearch body in TSVB requests (#26510)

* fixing broken tsvb * removing `ignore: [404]`
elastic · Dec 3, 2018 · 4ddf9c8 · 4ddf9c8
1 parent a015f03
commit 4ddf9c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/core_plugins/metrics/server/lib/vis_data/get_annotations.js b/src/core_plugins/metrics/server/lib/vis_data/get_annotations.js
@@ -39,13 +39,12 @@ export default async (req, panel) => {
 
       bodies.push({
         index: indexPattern,
-        ignore: [404],
-        timeout: '90s',
-        requestTimeout: 90000,
         ignoreUnavailable: true,
       });
 
-      bodies.push(buildAnnotationRequest(req, panel, annotation));
+      const body = buildAnnotationRequest(req, panel, annotation);
+      body.timeout = '90s';
+      bodies.push(body);
       return bodies;
     });
 

diff --git a/src/core_plugins/metrics/server/lib/vis_data/series/get_request_params.js b/src/core_plugins/metrics/server/lib/vis_data/series/get_request_params.js
@@ -25,12 +25,11 @@ export default (req, panel, series) => {
 
   bodies.push({
     index: indexPattern,
-    ignore: [404],
-    timeout: '90s',
-    requestTimeout: 90000,
     ignoreUnavailable: true,
   });
 
-  bodies.push(buildRequestBody(req, panel, series));
+  const body = buildRequestBody(req, panel, series);
+  body.timeout = '90s';
+  bodies.push(body);
   return bodies;
 };
diff --git a/src/core_plugins/metrics/server/lib/vis_data/table/get_request_params.js b/src/core_plugins/metrics/server/lib/vis_data/table/get_request_params.js
@@ -23,12 +23,11 @@ export default (req, panel, entities) => {
   entities.forEach(entity => {
     bodies.push({
       index: panel.index_pattern,
-      ignore: [404],
-      timeout: '90s',
-      requestTimeout: 90000,
       ignoreUnavailable: true,
     });
-    bodies.push(buildRequestBody(req, panel, entity));
+    const body = buildRequestBody(req, panel, entity);
+    body.timeout = '90s';
+    bodies.push(body);
   });
   return bodies;
 };