Began work on pro modification

pull/1442/head
Torkel Ödegaard 11 years ago
parent 02fb2baf62
commit eb6099a93f
  1. 2
      src/app/components/require.config.js
  2. 5
      src/app/services/datasourceSrv.js
  3. 48
      src/app/services/grafana/grafanaDatasource.js

@ -2,7 +2,7 @@
* Bootstrap require with the needed config, then load the app.js module.
*/
require.config({
baseUrl: 'app',
baseUrl: 'public/app',
paths: {
config: ['../config', '../config.sample'],

@ -3,6 +3,7 @@ define([
'lodash',
'config',
'./graphite/graphiteDatasource',
'./grafana/grafanaDatasource',
'./influxdb/influxdbDatasource',
'./opentsdb/opentsdbDatasource',
'./elasticsearch/es-datasource',
@ -64,8 +65,8 @@ function (angular, _, config) {
case 'opentsdb':
Datasource = $injector.get('OpenTSDBDatasource');
break;
case 'elasticsearch':
Datasource = $injector.get('ElasticDatasource');
case 'grafana':
Datasource = $injector.get('GrafanaDatasource');
break;
}
return new Datasource(ds);

@ -0,0 +1,48 @@
define([
'angular',
'lodash',
'jquery',
'config',
'kbn',
'moment'
],
function (angular, _, $, config, kbn, moment) {
'use strict';
var module = angular.module('grafana.services');
module.factory('GrafanaDatasource', function($q, $http) {
function GrafanaDatasource(datasource) {
this.type = 'grafana';
this.grafanaDB = true;
}
GrafanaDatasource.prototype.getDashboard = function(id, isTemp) {
var url = '/dashboard/' + id;
if (isTemp) {
url = '/temp/' + id;
}
return $http.get('/api/dashboards/' + id)
.then(function(result) {
if (result.data) {
return angular.fromJson(result.data);
} else {
return false;
}
}, function(data) {
if(data.status === 0) {
throw "Could not contact Elasticsearch. Please ensure that Elasticsearch is reachable from your browser.";
} else {
throw "Could not find dashboard " + id;
}
});
};
return GrafanaDatasource;
});
});
Loading…
Cancel
Save