IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated elastic.js, improved error text on table

Browse Source
This commit is contained in:
Rashid Khan 2013-04-05 12:11:47 -07:00
parent 68b765789a
commit e9d1fc7b1a
7 changed files with 2801 additions and 792 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/lib/elastic-angular-client.js
View File

@ -1,9 +1,10 @@
/*! elastic.js - v1.0.0 - 2013-01-15 /*! elastic.js - v1.0.0 - 2013-03-05
* https://github.com/fullscale/elastic.js * https://github.com/fullscale/elastic.js
* Copyright (c) 2013 FullScale Labs, LLC; Licensed MIT */ * Copyright (c) 2013 FullScale Labs, LLC; Licensed MIT */
/*jshint browser:true */ /*jshint browser:true */
/*global angular:true */ /*global angular:true */
/*jshint es5:true */
'use strict'; 'use strict';
/* /*
@ -26,8 +27,8 @@ angular.module('elasticjs.service', [])
(successcb || angular.noop)(response.data); (successcb || angular.noop)(response.data);
return response.data; return response.data;
}, function (response) { }, function (response) {
(errorcb || angular.noop)(undefined); (errorcb || angular.noop)(response.data);
return undefined; return response.data;
}); });
}; };

4
common/lib/elastic-angular-client.min.js vendored
View File

@ -1,4 +1,4 @@
/*! elastic.js - v1.0.0 - 2013-01-15 /*! elastic.js - v1.0.0 - 2013-03-05
* https://github.com/fullscale/elastic.js * https://github.com/fullscale/elastic.js
* Copyright (c) 2013 FullScale Labs, LLC; Licensed MIT */ * Copyright (c) 2013 FullScale Labs, LLC; Licensed MIT */
"use strict";angular.module("elasticjs.service",[]).factory("ejsResource",["$http",function(e){return function(t){var n=window.ejs||{},r=function(e,t,n){return e.then(function(e){return(t||angular.noop)(e.data),e.data},function(e){return(n||angular.noop)(undefined),undefined})};return t==null&&(t=""),n.client={server:function(e){return e==null?t:(t=e,this)},post:function(n,i,s,o){return n=t+n,r(e.post(n,i),s,o)},get:function(n,i,s,o){return n=t+n,r(e.get(n,i),s,o)},put:function(n,i,s,o){return n=t+n,r(e.put(n,i),s,o)},del:function(n,i,s,o){return n=t+n,r(e.delete(n,i),s,o)},head:function(n,r,i,s){return n=t+n,e.head(n,r).then(function(e){return(i||angular.noop)(e.headers()),e.headers()},function(e){return(s||angular.noop)(undefined),undefined})}},n}}]); "use strict";angular.module("elasticjs.service",[]).factory("ejsResource",["$http",function(e){return function(t){var n=window.ejs||{},r=function(e,t,n){return e.then(function(e){return(t||angular.noop)(e.data),e.data},function(e){return(n||angular.noop)(undefined),undefined})};return t==null&&(t=""),n.client={server:function(e){return e==null?t:(t=e,this)},post:function(n,i,s,o){return n=t+n,r(e.post(n,i),s,o)},get:function(n,i,s,o){return n=t+n,r(e.get(n,i),s,o)},put:function(n,i,s,o){return n=t+n,r(e.put(n,i),s,o)},del:function(n,i,s,o){return n=t+n,r(e.delete(n,i),s,o)},head:function(n,r,i,s){return n=t+n,e.head(n,r).then(function(e){return(i||angular.noop)(e.headers()),e.headers()},function(e){return(s||angular.noop)(undefined),undefined})}},n}}]);

3565
common/lib/elastic.js
View File

File diff suppressed because it is too large Load Diff

4
common/lib/elastic.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
js/app.js
View File

@ -27,7 +27,7 @@ var labjs = $LAB
.script("common/lib/angular-strap.min.js") .script("common/lib/angular-strap.min.js")
.script("common/lib/angular-sanitize.min.js") .script("common/lib/angular-sanitize.min.js")
.script("common/lib/elastic.min.js") .script("common/lib/elastic.min.js")
.script("common/lib/elastic-angular-client.min.js") .script("common/lib/elastic-angular-client.js")
.script("common/lib/dateformat.js") .script("common/lib/dateformat.js")
.script("common/lib/date.js") .script("common/lib/date.js")
.script("common/lib/datepicker.js") .script("common/lib/datepicker.js")

5
js/controllers.js
View File

@ -74,6 +74,11 @@ angular.module('kibana.controllers', [])
return 'panels/'+type+'/editor.html'; return 'panels/'+type+'/editor.html';
} }
// This is whoafully incomplete, but will do for now
$scope.parse_error = function(data) {
return data.match("nested: (.*?);")[1]
}
$scope.init(); $scope.init();
}) })

6
panels/table/module.js
View File

@ -98,7 +98,7 @@ angular.module('kibana.table', [])
$scope.populate_modal(request) $scope.populate_modal(request)
var results = request.doSearch(); var results = request.doSearch()
// Populate scope when we have results // Populate scope when we have results
results.then(function(results) { results.then(function(results) {
@ -110,8 +110,8 @@ angular.module('kibana.table', [])
query_id = $scope.query_id = new Date().getTime() query_id = $scope.query_id = new Date().getTime()
} }
if(_.isUndefined(results)) { if(!(_.isUndefined(results.error))) {
$scope.panel.error = 'Your query was unsuccessful'; $scope.panel.error = $scope.parse_error(results.error);
return; return;
} }
$scope.panel.error = false; $scope.panel.error = false;