浏览代码

Data source proxy: Fixed issue with using data source proxy when grafana is behind nginx suburl, Fixes #1784

Torkel Ödegaard 10 年之前
父节点
当前提交
649d40ed66
共有 2 个文件被更改,包括 1 次插入4 次删除
  1. 1 0
      CHANGELOG.md
  2. 0 4
      public/app/services/backendSrv.js

+ 1 - 0
CHANGELOG.md

@@ -1,6 +1,7 @@
 # 2.0.0 (unreleased)
 
 **Fixes**
+- [Issue #1784](https://github.com/grafana/grafana/issues/1784). Data source proxy: Fixed issue with using data source proxy when grafana is behind nginx suburl
 - [Issue #1749](https://github.com/grafana/grafana/issues/1749). Graph Panel: Table legends are now visible when rendered to PNG
 - [Issue #1786](https://github.com/grafana/grafana/issues/1786). Graph Panel: Legend in table mode now aligns, graph area is reduced depending on how many series
 - [Issue #1734](https://github.com/grafana/grafana/issues/1734). Support for unicode / international characters in dashboard title (improved slugify)

+ 0 - 4
public/app/services/backendSrv.js

@@ -93,10 +93,6 @@ function (angular, _, config) {
       var requestIsLocal = options.url.indexOf('/') === 0;
       var firstAttempt = options.retry === 0;
 
-      if (requestIsLocal && firstAttempt) {
-        options.url = config.appSubUrl + options.url;
-      }
-
       return $http(options).then(null, function(err) {
         // handle unauthorized for backend requests
         if (requestIsLocal && firstAttempt  && err.status === 401) {