Fix wrong merge of PR elastic#26510

markov00 · Dec 5, 2018 · b4a570f · b4a570f
1 parent 4bf31a3
commit b4a570f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/get_annotations.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/get_annotations.js
@@ -64,12 +64,10 @@ async function getAnnotationBody(req, panel, annotation, esQueryConfig) {
   const indexPatternString = annotation.index_pattern;
   const indexPatternObject = await getIndexPatternObject(req, indexPatternString);
   const request = buildAnnotationRequest(req, panel, annotation, esQueryConfig, indexPatternObject);
+  request.timeout = '90s';
   return [
     {
       index: indexPatternString,
-      ignore: [404],
-      timeout: '90s',
-      requestTimeout: 90000,
       ignoreUnavailable: true,
     },
     request,

diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/series/get_request_params.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/series/get_request_params.js
@@ -24,12 +24,10 @@ export default async (req, panel, series, esQueryConfig) => {
   const indexPatternString = series.override_index_pattern && series.series_index_pattern || panel.index_pattern;
   const indexPatternObject = await getIndexPatternObject(req, indexPatternString);
   const request = buildRequestBody(req, panel, series, esQueryConfig, indexPatternObject);
+  request.timeout = '90s';
   return [
     {
       index: indexPatternString,
-      ignore: [404],
-      timeout: '90s',
-      requestTimeout: 90000,
       ignoreUnavailable: true,
     },
     request,