public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure kibana and grafana on same hostname do not interfere with each other

Browse Source 
This happens if you have kibana on /kibana and grafana on /grafana, resulting in some bad redirects
This commit is contained in:
Christian Winther
2014-02-05 18:02:15 +00:00
parent aea4b37760
commit e8be950752
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/dashboard.js
+4 -4
View File
@@ -102,8 +102,8 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
$location.path(config.default_route);
alertSrv.set('Saving to browser storage has been replaced',' with saving to Elasticsearch.'+
' Click <a href="#/dashboard/local/deprecated">here</a> to load your old dashboard anyway.');
} else if(!(_.isUndefined(window.localStorage.kibanaDashboardDefault))) {
$location.path(window.localStorage.kibanaDashboardDefault);
} else if(!(_.isUndefined(window.localStorage.grafanaDashboardDefault))) {
$location.path(window.localStorage.grafanaDashboardDefault);
} else {
$location.path(config.default_route);
}
@@ -197,7 +197,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
if(!_.isUndefined(window.localStorage['dashboard'])) {
delete window.localStorage['dashboard'];
}
window.localStorage.kibanaDashboardDefault = route;
window.localStorage.grafanaDashboardDefault = route;
return true;
} else {
return false;
@@ -211,7 +211,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
delete window.localStorage['dashboard'];
}
delete window.localStorage.kibanaDashboardDefault;
delete window.localStorage.grafanaDashboardDefault;
return true;
} else {
return false;