Commit 0a4f6d0d by Spencer Alger Committed by Rashid Khan

added check for 404 response from the index_save call, assumes that…

added check for 404 response from the index_save call, assumes that auto_create_index is disabled and attempts to create the index before saving a second time
parent 5dd1c556
...@@ -800,6 +800,10 @@ angular.module('kibana.services', []) ...@@ -800,6 +800,10 @@ angular.module('kibana.services', [])
); );
}; };
this.elasticsearch_create_index = function () {
return ejs.client.post('/'+config.kibana_index);
};
this.elasticsearch_delete = function(id) { this.elasticsearch_delete = function(id) {
return ejs.Document(config.kibana_index,'dashboard',id).doDelete( return ejs.Document(config.kibana_index,'dashboard',id).doDelete(
// Success // Success
......
...@@ -61,6 +61,10 @@ angular.module('kibana.dashcontrol', []) ...@@ -61,6 +61,10 @@ angular.module('kibana.dashcontrol', [])
services: {} services: {}
}; };
function notice(type, title, message) {
alertSrv.set(title, message, type, 5000);
}
$scope.init = function() { $scope.init = function() {
$scope.gist_pattern = /(^\d{5,}$)|(^[a-z0-9]{10,}$)|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/; $scope.gist_pattern = /(^\d{5,}$)|(^[a-z0-9]{10,}$)|(gist.github.com(\/*.*)\/[a-z0-9]{5,}\/*$)/;
$scope.gist = {}; $scope.gist = {};
...@@ -69,17 +73,17 @@ angular.module('kibana.dashcontrol', []) ...@@ -69,17 +73,17 @@ angular.module('kibana.dashcontrol', [])
$scope.set_default = function() { $scope.set_default = function() {
if(dashboard.set_default()) { if(dashboard.set_default()) {
alertSrv.set('Local Default Set',dashboard.current.title+' has been set as your local default','success',5000); notice('success', 'Local Default Set', dashboard.current.title+' has been set as your local default');
} else { } else {
alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000); notice('error', 'Incompatible Browser', 'Sorry, your browser is too old for this feature');
} }
}; };
$scope.purge_default = function() { $scope.purge_default = function() {
if(dashboard.purge_default()) { if(dashboard.purge_default()) {
alertSrv.set('Local Default Clear','Your local default dashboard has been cleared','success',5000); notice('success', 'Local Default Clear', 'Your local default dashboard has been cleared');
} else { } else {
alertSrv.set('Incompatible Browser','Sorry, your browser is too old for this feature','error',5000); notice('error', 'Incompatible Browser', 'Sorry, your browser is too old for this feature');
} }
}; };
...@@ -91,13 +95,30 @@ angular.module('kibana.dashcontrol', []) ...@@ -91,13 +95,30 @@ angular.module('kibana.dashcontrol', [])
).then( ).then(
function(result) { function(result) {
if(!_.isUndefined(result._id)) { if(!_.isUndefined(result._id)) {
alertSrv.set('Dashboard Saved','This dashboard has been saved to Elasticsearch as "' + notice(
result._id + '"','success',5000); 'success',
'Dashboard Saved',
'This dashboard has been saved to Elasticsearch as "'+result._id + '"'
);
if(type === 'temp') { if(type === 'temp') {
$scope.share = dashboard.share_link(dashboard.current.title,'temp',result._id); $scope.share = dashboard.share_link(dashboard.current.title, 'temp', result._id);
} }
} else { } else {
alertSrv.set('Save failed','Dashboard could not be saved to Elasticsearch','error',5000); if (result.status === 404) {
// auto create must be disabled and the index doesn't exist, create it!
return dashboard.elasticsearch_create_index().then(function () {
return $scope.elasticsearch_save(type, ttl);
}, function () {
notice(
'error',
'Save failed',
'Dashboard could not be saved because the "'+config.kibana_index+'" '+
'index does not exist and could not be created.'
);
});
} else {
notice('error', 'Save failed', 'Dashboard could not be saved to Elasticsearch');
}
} }
}); });
}; };
...@@ -107,15 +128,15 @@ angular.module('kibana.dashcontrol', []) ...@@ -107,15 +128,15 @@ angular.module('kibana.dashcontrol', [])
function(result) { function(result) {
if(!_.isUndefined(result)) { if(!_.isUndefined(result)) {
if(result.found) { if(result.found) {
alertSrv.set('Dashboard Deleted',id+' has been deleted','success',5000); notice('success', 'Dashboard Deleted', id+' has been deleted');
// Find the deleted dashboard in the cached list and remove it // Find the deleted dashboard in the cached list and remove it
var toDelete = _.where($scope.elasticsearch.dashboards,{_id:id})[0]; var toDelete = _.where($scope.elasticsearch.dashboards,{_id:id})[0];
$scope.elasticsearch.dashboards = _.without($scope.elasticsearch.dashboards,toDelete); $scope.elasticsearch.dashboards = _.without($scope.elasticsearch.dashboards,toDelete);
} else { } else {
alertSrv.set('Dashboard Not Found','Could not find '+id+' in Elasticsearch','warning',5000); notice('warning', 'Dashboard Not Found', 'Could not find '+id+' in Elasticsearch');
} }
} else { } else {
alertSrv.set('Dashboard Not Deleted','An error occurred deleting the dashboard','error',5000); notice('error', 'Dashboard Not Deleted', 'An error occurred deleting the dashboard');
} }
} }
); );
...@@ -137,10 +158,14 @@ angular.module('kibana.dashcontrol', []) ...@@ -137,10 +158,14 @@ angular.module('kibana.dashcontrol', [])
function(link) { function(link) {
if(!_.isUndefined(link)) { if(!_.isUndefined(link)) {
$scope.gist.last = link; $scope.gist.last = link;
alertSrv.set('Gist saved','You will be able to access your exported dashboard file at '+ notice(
'<a href="'+link+'">'+link+'</a> in a moment','success'); 'success',
'Gist saved',
'You will be able to access your exported dashboard file at '+
'<a href="'+link+'">'+link+'</a> in a moment'
);
} else { } else {
alertSrv.set('Save failed','Gist could not be saved','error',5000); notice('error', 'Save failed', 'Gist could not be saved');
} }
}); });
}; };
...@@ -151,7 +176,7 @@ angular.module('kibana.dashcontrol', []) ...@@ -151,7 +176,7 @@ angular.module('kibana.dashcontrol', [])
if(files && files.length > 0) { if(files && files.length > 0) {
$scope.gist.files = files; $scope.gist.files = files;
} else { } else {
alertSrv.set('Gist Failed','Could not retrieve dashboard list from gist','error',5000); notice('error', 'Gist Failed', 'Could not retrieve dashboard list from gist',5000);
} }
}); });
}; };
...@@ -183,7 +208,7 @@ angular.module('kibana.dashcontrol', []) ...@@ -183,7 +208,7 @@ angular.module('kibana.dashcontrol', [])
// Something // Something
document.getElementById('dashupload').addEventListener('change', file_selected, false); document.getElementById('dashupload').addEventListener('change', file_selected, false);
} else { } else {
alertSrv.set('Oops','Sorry, the HTML5 File APIs are not fully supported in this browser.','error'); alertSrv.set('Oops', 'Sorry, the HTML5 File APIs are not fully supported in this browser.', 'error', 5000);
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment