IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 23:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(OpenTSDB): correct content-type, fixes #4965

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-08-17 09:42:40 +02:00
parent 0ea3458f69
commit 159ea69e5d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/opentsdb/datasource.js
View File

@ -129,11 +129,6 @@ function (angular, _, dateMath) {
};
this._addCredentialOptions(options);
// In case the backend is 3rd-party hosted and does not suport OPTIONS, urlencoded requests
// go as POST rather than OPTIONS+POST
options.headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
return backendSrv.datasourceRequest(options);
};

7
public/app/plugins/panel/graph/graph.js
View File

@ -251,11 +251,14 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
function callPlot(incrementRenderCounter) {
try {
$.plot(elem, sortedSeries, options);
delete ctrl.error;
delete ctrl.inspector;
if (ctrl.renderError) {
delete ctrl.error;
delete ctrl.inspector;
}
} catch (e) {
console.log('flotcharts error', e);
ctrl.error = e.message || "Render Error";
ctrl.renderError = true;
ctrl.inspector = {error: ctrl.error};
}