diff --git a/src/plugins/console/index.js b/src/plugins/console/index.js index 7a5f980080af..7e29be227f6a 100644 --- a/src/plugins/console/index.js +++ b/src/plugins/console/index.js @@ -16,7 +16,9 @@ module.exports = function (kibana) { main: 'plugins/console/console', icon: 'plugins/console/logo.svg', injectVars: function (server, options) { - return options; + const varsToInject = options; + varsToInject.elasticsearchUrl = server.config().get('elasticsearch.url'); + return varsToInject; } } ]; @@ -155,16 +157,6 @@ module.exports = function (kibana) { } }) - server.route({ - path: '/api/console/proxy/settings', - method: 'GET', - handler: function (req, reply) { - reply({ - url: server.config().get('elasticsearch.url') - }); - } - }) - server.route({ path: '/api/console/api_server', method: ['GET', 'POST'], diff --git a/src/plugins/console/public/src/sense_editor/editor.js b/src/plugins/console/public/src/sense_editor/editor.js index 87835ef1da87..184427fe335d 100644 --- a/src/plugins/console/public/src/sense_editor/editor.js +++ b/src/plugins/console/public/src/sense_editor/editor.js @@ -6,6 +6,8 @@ let RowParser = require('./row_parser'); let InputMode = require('./mode/input'); let utils = require('../utils'); let es = require('../es'); +import chrome from 'ui/chrome'; + const smartResize = require('../smart_resize'); function isInt(x) { @@ -524,41 +526,37 @@ function SenseEditor($el) { cb = $.noop; } - $.ajax('../api/console/proxy/settings') - .then(function (proxySettings) { - editor.getRequestsInRange(range, true, function (requests) { + editor.getRequestsInRange(range, true, function (requests) { - var result = _.map(requests, function requestToCurl(req) { + var result = _.map(requests, function requestToCurl(req) { - if (typeof req === "string") { - // no request block - return req; - } + if (typeof req === "string") { + // no request block + return req; + } - var - es_path = req.url, - es_method = req.method, - es_data = req.data; + var + es_path = req.url, + es_method = req.method, + es_data = req.data; - var url = es.constructESUrl(proxySettings.url, es_path); + const elasticsearchBaseUrl = chrome.getInjected('elasticsearchUrl'); + var url = es.constructESUrl(elasticsearchBaseUrl, es_path); - var ret = 'curl -X' + es_method + ' "' + url + '"'; - if (es_data && es_data.length) { - ret += " -d'\n"; - // since Sense doesn't allow single quote json string any single qoute is within a string. - ret += es_data.join("\n").replace(/'/g, '\\"'); - if (es_data.length > 1) { - ret += "\n"; - } // end with a new line - ret += "'"; - } - return ret; - }); - - cb(result.join("\n")); + var ret = 'curl -X' + es_method + ' "' + url + '"'; + if (es_data && es_data.length) { + ret += " -d'\n"; + // since Sense doesn't allow single quote json string any single qoute is within a string. + ret += es_data.join("\n").replace(/'/g, '\\"'); + if (es_data.length > 1) { + ret += "\n"; + } // end with a new line + ret += "'"; + } + return ret; }); - }, function (err) { - console.error('Could not get proxy settings'); + + cb(result.join("\n")); }); };