From 96c02e525a102441a0e3f5032799bcbcdb23c0ce Mon Sep 17 00:00:00 2001 From: ppisljar Date: Mon, 3 Dec 2018 08:48:47 +0100 Subject: [PATCH 1/2] fixing broken tsvb --- .../metrics/server/lib/vis_data/get_annotations.js | 8 ++++---- .../server/lib/vis_data/series/get_request_params.js | 8 ++++---- .../server/lib/vis_data/table/get_request_params.js | 8 ++++---- 3 files changed, 12 insertions(+), 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 index 513cf9ba40d7a..33a1476436284 100644 --- 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,13 @@ export default async (req, panel) => { bodies.push({ index: indexPattern, - ignore: [404], - timeout: '90s', - requestTimeout: 90000, + //ignore: [404], 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 index 5196ef7ead197..57c23d5d7d22a 100644 --- 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,12 @@ export default (req, panel, series) => { bodies.push({ index: indexPattern, - ignore: [404], - timeout: '90s', - requestTimeout: 90000, + //ignore: [404], 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 index c24d812c263fb..451c9f758462e 100644 --- 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,12 @@ export default (req, panel, entities) => { entities.forEach(entity => { bodies.push({ index: panel.index_pattern, - ignore: [404], - timeout: '90s', - requestTimeout: 90000, + //ignore: [404], ignoreUnavailable: true, }); - bodies.push(buildRequestBody(req, panel, entity)); + const body = buildRequestBody(req, panel, entity); + body.timeout = '90s'; + bodies.push(body); }); return bodies; }; From a144fbac339b2d74fc201c85509cd375ae5cb5c0 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Mon, 3 Dec 2018 09:38:45 +0100 Subject: [PATCH 2/2] removing `ignore: [404]` --- src/core_plugins/metrics/server/lib/vis_data/get_annotations.js | 1 - .../metrics/server/lib/vis_data/series/get_request_params.js | 1 - .../metrics/server/lib/vis_data/table/get_request_params.js | 1 - 3 files changed, 3 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 index 33a1476436284..cf4008ce83cad 100644 --- 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,7 +39,6 @@ export default async (req, panel) => { bodies.push({ index: indexPattern, - //ignore: [404], ignoreUnavailable: true, }); 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 index 57c23d5d7d22a..ed56035d859b8 100644 --- 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,7 +25,6 @@ export default (req, panel, series) => { bodies.push({ index: indexPattern, - //ignore: [404], ignoreUnavailable: true, }); 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 index 451c9f758462e..d8370edeb26c2 100644 --- 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,7 +23,6 @@ export default (req, panel, entities) => { entities.forEach(entity => { bodies.push({ index: panel.index_pattern, - //ignore: [404], ignoreUnavailable: true, }); const body = buildRequestBody(req, panel, entity);