diff --git a/src/kibana/index.js b/src/kibana/index.js index 9b8e87a0843f..b1417f6d0928 100644 --- a/src/kibana/index.js +++ b/src/kibana/index.js @@ -68,7 +68,7 @@ define(function (require) { return config; }); RestangularProvider.addResponseInterceptor(function(data, operation, what, url, response, deferred) { - if (data && data.status === 'success') { + if ((data && data.status === 'success') || (response.status === 200)){ if (response.headers('Token')) { localStorage.setItem('token', response.headers('Token')); } diff --git a/src/kibana/netmon_libs/custom_modules/save_rule/modal/modal.js b/src/kibana/netmon_libs/custom_modules/save_rule/modal/modal.js index 9d47677b695b..88a93d8dfc17 100644 --- a/src/kibana/netmon_libs/custom_modules/save_rule/modal/modal.js +++ b/src/kibana/netmon_libs/custom_modules/save_rule/modal/modal.js @@ -15,13 +15,14 @@ define(function (require) { $scope.ejs = ejsResource('https://' + window.location.hostname); $scope.elasticSearchFields = elasticSearchFields; $scope.validators = formValidators; - $scope.savableRule = { + enabled: true + }; + $scope.modalState = { state: 'unsaved' }; if (query.query_string.query && query.query_string.query !== '*') { - $scope.savableRule.queryObj = query; $scope.savableRule.query = query.query_string.query; } }; @@ -36,8 +37,8 @@ define(function (require) { var from = moment().subtract('days', 1).toDate(), to = moment().toDate(); - $scope.savableRule.state = 'unconfirmed'; - $scope.savableRule.loading = true; + $scope.modalState.state = 'unconfirmed'; + $scope.modalState.loading = true; form.$setPristine(); kbnIndex.indices(from, to, '[network_]YYYY_MM_DD', 'day') @@ -59,60 +60,40 @@ define(function (require) { .doSearch() .then( function(result) { - $scope.savableRule.loading = false; + $scope.modalState.loading = false; if (result && result.facets && result.facets.rules && result.facets.rules.count !== undefined) { - $scope.savableRule.numMatches = result.facets.rules.count; + $scope.modalState.numMatches = result.facets.rules.count; } else { - $scope.savableRule.state = 'error'; - $scope.savableRule.error = 'There was a problem executing your search.'; + $scope.modalState.state = 'error'; + $scope.modalState.error = 'There was a problem executing your search.'; } }, function() { - $scope.savableRule.loading = false; - $scope.savableRule.state = 'error'; - $scope.savableRule.error = 'There was a problem executing your search.'; + $scope.modalState.loading = false; + $scope.modalState.state = 'error'; + $scope.modalState.error = 'There was a problem executing your search.'; } ); }, function() { - $scope.savableRule.loading = false; - $scope.savableRule.state = 'error'; - $scope.savableRule.error = 'There was a problem executing your search.'; + $scope.modalState.loading = false; + $scope.modalState.state = 'error'; + $scope.modalState.error = 'There was a problem executing your search.'; } ); }; $scope.saveRule = function(rule) { - rule.query = $scope.elasticSearchFields.convertQuery(rule.query); - - var query = $scope.ejs.QueryStringQuery(rule.query); - - rule.loading = true; - Restangular - .all('rules/') - .post({ - name: rule.name, - enabled: true, - severity: rule.severity, - query: angular.fromJson(query.toString()) - }) - .then( - function(data) { - if (!data.error){ - $scope.savableRule = angular.copy(data); - $scope.savableRule.state = 'saved'; - $scope.savableRule.loading = false; - } else{ - $scope.savableRule = { - loading: false, - state: 'error', - error: data.message - }; - } - }, - function() { - $scope.savableRule = { + $scope.modalState.loading = true; + $http.put('/api/queryRules/' + rule.id, rule) + .then(function(data) { + $scope.savableRule = angular.copy(data); + $scope.modalState.state = 'saved'; + $scope.modalState.loading = false; + }, + function(error) { + $scope.modalState = { loading: false, state: 'error', error: 'There was a problem saving your rule.' diff --git a/src/kibana/netmon_libs/custom_modules/save_rule/modal/save-rule.html b/src/kibana/netmon_libs/custom_modules/save_rule/modal/save-rule.html index 31c069bfb664..b11b222f37ef 100644 --- a/src/kibana/netmon_libs/custom_modules/save_rule/modal/save-rule.html +++ b/src/kibana/netmon_libs/custom_modules/save_rule/modal/save-rule.html @@ -1,21 +1,21 @@ -
+

Create Rule

-
+
-
-

In the last 24 hours, this rule would have triggered {{ savableRule.numMatches | number }} time(s).

-

Are you sure you want to create the rule {{ savableRule.name }}?

+
+

In the last 24 hours, this rule would have triggered {{ modalState.numMatches | number }} time(s).

+

Are you sure you want to create the rule {{ savableRule.id }}?

- +
@@ -25,12 +25,12 @@

Create Rule

Save Complete

-
+
-
+
Rule saved successfully.
@@ -43,13 +43,13 @@

Save Complete

Error

-
+
-
- {{ savableRule.error }} +
+ {{ modalState.error }}
@@ -61,12 +61,12 @@

Error

Create Rule

-
+
-
+
@@ -80,7 +80,7 @@

Create Rule

name="name" id="inputName" class="form-control" - ng-model="savableRule.name" + ng-model="savableRule.id" ui-validate="{ required : 'validators.required($value)', basicCharacters : 'validators.basicCharacters($value)', uniqueRule : 'validators.uniqueRule($value, savableRule.id)' }" />
Name is required.
diff --git a/src/kibana/netmon_libs/custom_modules/save_rule/services/validators.js b/src/kibana/netmon_libs/custom_modules/save_rule/services/validators.js index 7cffa54d8112..9c23a4bdc646 100644 --- a/src/kibana/netmon_libs/custom_modules/save_rule/services/validators.js +++ b/src/kibana/netmon_libs/custom_modules/save_rule/services/validators.js @@ -3,16 +3,16 @@ * between Kibana and NetMon */ define(function (require) { - + var app = require('modules').get('app/dashboard'); - + app.factory('formValidators', function ($q, $timeout, $http, ejsResource, Restangular) { var timeouts = {}; return { hasErrors: function(formCtrl) { return !formCtrl.$pristine && !formCtrl.$valid; }, - showError: function(formCtrl, field) { + showError: function(formCtrl, field) { return !formCtrl.$pristine && !!formCtrl.$error[field]; }, required: function(value) { @@ -32,18 +32,14 @@ define(function (require) { $timeout.cancel(timeouts['uniqueRule']); } timeouts['uniqueRule'] = $timeout(function() { - Restangular - .one('rules/') - .get({ name: value }) + $http.get('/api/queryRules/' + value) .then(function(rule) { - if (!rule || rule.error || !rule.id) { - deferred.resolve(); - } else { - deferred.reject(); - } + deferred.reject(); + }, function(error){ + deferred.resolve(); }); }, 500); - + return deferred.promise; }, notAllQuery: function(value) { @@ -82,4 +78,4 @@ define(function (require) { } }; }); - }); \ No newline at end of file + });