From cc4b5bdfd186a2cc8aafda13153ddd81e3d3a0cb Mon Sep 17 00:00:00 2001 From: ebb-tide Date: Mon, 14 May 2018 17:21:07 -0700 Subject: [PATCH 1/2] Revert back to using fetch to get kapacitors log stream --- ui/src/kapacitor/apis/index.js | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ui/src/kapacitor/apis/index.js b/ui/src/kapacitor/apis/index.js index 984e714e4c..5bee7dc76a 100644 --- a/ui/src/kapacitor/apis/index.js +++ b/ui/src/kapacitor/apis/index.js @@ -107,22 +107,23 @@ const kapacitorLogHeaders = { } export const getLogStream = kapacitor => - AJAX({ - url: `${kapacitor.links.proxy}?path=/kapacitor/v1preview/logs`, + // fetch required for kapacitors log querying + fetch(`${kapacitor.links.proxy}?path=/kapacitor/v1preview/logs`, { method: 'GET', headers: kapacitorLogHeaders, credentials: 'include', }) export const getLogStreamByRuleID = (kapacitor, ruleID) => - AJAX({ - url: `${ - kapacitor.links.proxy - }?path=/kapacitor/v1preview/logs?task=${ruleID}`, - method: 'GET', - headers: kapacitorLogHeaders, - credentials: 'include', - }) + // fetch required for kapacitors log querying + fetch( + `${kapacitor.links.proxy}?path=/kapacitor/v1preview/logs?task=${ruleID}`, + { + method: 'GET', + headers: kapacitorLogHeaders, + credentials: 'include', + } + ) export const pingKapacitorVersion = async kapacitor => { try { From fbae80c2bd8b8d8b89aa7f52d473031cec9d3481 Mon Sep 17 00:00:00 2001 From: ebb-tide Date: Mon, 14 May 2018 17:39:33 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8785affed1..9cfd981291 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ 1. [#3402](https://github.com/influxdata/chronograf/pull/3402): Fix missing icons when using basepath 1. [#3412](https://github.com/influxdata/chronograf/pull/3412): Limit max-width of TICKScript editor. 1. [#3166](https://github.com/influxdata/chronograf/pull/3166): Fixes naming of new TICKScripts - +1. [#3453](https://github.com/influxdata/chronograf/pull/3453): Fix Kapacitor Logs fetch regression ## v1.4.4.1 [2018-04-16]