+
diff --git a/src/app/routes/dashboard-from-es.js b/src/app/routes/dashboard-from-es.js
index 280776efa3b..f2d8ce85fb5 100644
--- a/src/app/routes/dashboard-from-es.js
+++ b/src/app/routes/dashboard-from-es.js
@@ -1,9 +1,7 @@
define([
'angular',
- 'jquery',
- 'config'
],
-function (angular, $, config) {
+function (angular) {
"use strict";
var module = angular.module('grafana.routes');
@@ -20,37 +18,15 @@ function (angular, $, config) {
});
});
- module.controller('DashFromElasticProvider', function($scope, $rootScope, elastic, $routeParams, alertSrv) {
+ module.controller('DashFromElasticProvider', function($scope, $rootScope, datasourceSrv, $routeParams, alertSrv) {
- var elasticsearch_load = function(id) {
- var url = '/dashboard/' + id;
-
- // hack to check if it is a temp dashboard
- if (window.location.href.indexOf('dashboard/temp') > 0) {
- url = '/temp/' + id;
- }
-
- return elastic.get(url)
- .then(function(result) {
- if (result._source && result._source.dashboard) {
- return angular.fromJson(result._source.dashboard);
- } else {
- return false;
- }
- }, function(data, status) {
- if(status === 0) {
- alertSrv.set('Error',"Could not contact Elasticsearch at " +
- config.elasticsearch + ". Please ensure that Elasticsearch is reachable from your browser.",'error');
- } else {
- alertSrv.set('Error',"Could not find dashboard " + id, 'error');
- }
- return false;
- });
- };
-
- elasticsearch_load($routeParams.id).then(function(dashboard) {
- $scope.emitAppEvent('setup-dashboard', dashboard);
- });
+ var db = datasourceSrv.getGrafanaDB();
+ db.getDashboard($routeParams.id)
+ .then(function(dashboard) {
+ $scope.emitAppEvent('setup-dashboard', dashboard);
+ }).then(null, function(error) {
+ alertSrv.set('Error', error, 'error');
+ });
});
diff --git a/src/app/services/all.js b/src/app/services/all.js
index b426088bd11..7f00219dbca 100644
--- a/src/app/services/all.js
+++ b/src/app/services/all.js
@@ -8,8 +8,7 @@ define([
'./annotationsSrv',
'./playlistSrv',
'./unsavedChangesSrv',
- './elasticsearch/es-client',
'./dashboard/dashboardKeyBindings',
'./dashboard/dashboardModel',
],
-function () {});
\ No newline at end of file
+function () {});
diff --git a/src/app/services/datasourceSrv.js b/src/app/services/datasourceSrv.js
index 705230515f8..97cf10cb6f9 100644
--- a/src/app/services/datasourceSrv.js
+++ b/src/app/services/datasourceSrv.js
@@ -16,6 +16,7 @@ function (angular, _, config) {
var datasources = {};
var metricSources = [];
var annotationSources = [];
+ var grafanaDB = {};
this.init = function() {
_.each(config.datasources, function(value, key) {
@@ -44,6 +45,9 @@ function (angular, _, config) {
editorSrc: value.annotationEditorSrc,
});
}
+ if (value.grafanaDB) {
+ grafanaDB = value;
+ }
});
};
@@ -82,6 +86,10 @@ function (angular, _, config) {
return metricSources;
};
+ this.getGrafanaDB = function() {
+ return grafanaDB;
+ };
+
this.init();
});
});
diff --git a/src/app/services/elasticsearch/es-client.js b/src/app/services/elasticsearch/es-client.js
deleted file mode 100644
index 5898bf8743f..00000000000
--- a/src/app/services/elasticsearch/es-client.js
+++ /dev/null
@@ -1,116 +0,0 @@
-define([
- 'angular',
- 'config'
-],
-function(angular, config) {
- "use strict";
-
- var module = angular.module('grafana.services');
-
- module.service('elastic', function($http, $q) {
-
- this._request = function(method, url, data) {
- var options = {
- url: config.elasticsearch + "/" + config.grafana_index + url,
- method: method,
- data: data
- };
-
- if (config.elasticsearchBasicAuth) {
- options.headers = {
- "Authorization": "Basic " + config.elasticsearchBasicAuth
- };
- }
-
- return $http(options);
- };
-
- this.get = function(url) {
- return this._request('GET', url)
- .then(function(results) {
- return results.data;
- });
- };
-
- this.post = function(url, data) {
- return this._request('POST', url, data)
- .then(function(results) {
- return results.data;
- });
- };
-
- this.deleteDashboard = function(id) {
- if (!this.isAdmin()) { return $q.reject("Invalid admin password"); }
-
- return this._request('DELETE', '/dashboard/' + id)
- .then(function(result) {
- return result.data._id;
- }, function(err) {
- throw err.data;
- });
- };
-
- this.saveForSharing = function(dashboard) {
- var data = {
- user: 'guest',
- group: 'guest',
- title: dashboard.title,
- tags: dashboard.tags,
- dashboard: angular.toJson(dashboard)
- };
-
- var ttl = dashboard.loader.save_temp_ttl;
-
- return this._request('POST', '/temp/?ttl=' + ttl, data)
- .then(function(result) {
-
- var baseUrl = window.location.href.replace(window.location.hash,'');
- var url = baseUrl + "#dashboard/temp/" + result.data._id;
-
- return { title: dashboard.title, url: url };
-
- }, function(err) {
- throw "Failed to save to temp dashboard to elasticsearch " + err.data;
- });
- };
-
- this.passwordCache = function(pwd) {
- if (!window.sessionStorage) { return null; }
- if (!pwd) { return window.sessionStorage["grafanaAdminPassword"]; }
- window.sessionStorage["grafanaAdminPassword"] = pwd;
- };
-
- this.isAdmin = function() {
- if (!config.admin || !config.admin.password) { return true; }
- if (this.passwordCache() === config.admin.password) { return true; }
-
- var password = window.prompt("Admin password", "");
- this.passwordCache(password);
-
- return password === config.admin.password;
- };
-
- this.saveDashboard = function(dashboard, title) {
- if (!this.isAdmin()) { return $q.reject("Invalid admin password"); }
-
- var dashboardClone = angular.copy(dashboard);
- title = dashboardClone.title = title ? title : dashboard.title;
-
- var data = {
- user: 'guest',
- group: 'guest',
- title: title,
- tags: dashboardClone.tags,
- dashboard: angular.toJson(dashboardClone)
- };
-
- return this._request('PUT', '/dashboard/' + encodeURIComponent(title), data)
- .then(function() {
- return { title: title, url: '/dashboard/elasticsearch/' + title };
- }, function(err) {
- throw 'Failed to save to elasticsearch ' + err.data;
- });
- };
-
- });
-});
diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 29291e029f3..1303bdd042e 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -21,16 +21,17 @@ function (angular, _, $, config, kbn, moment) {
this.supportAnnotations = true;
this.supportMetrics = false;
this.index = datasource.index;
+ this.grafanaDB = datasource.grafanaDB;
this.annotationEditorSrc = 'app/partials/elasticsearch/annotation_editor.html';
}
- ElasticDatasource.prototype._request = function(method, url, data) {
+ ElasticDatasource.prototype._request = function(method, url, index, data) {
var options = {
- url: this.url + "/" + this.index + url,
+ url: this.url + "/" + index + url,
method: method,
data: data
};
-
+ // TODO: fix basic auth
if (config.elasticsearchBasicAuth) {
options.headers = {
"Authorization": "Basic " + config.elasticsearchBasicAuth
@@ -41,14 +42,14 @@ function (angular, _, $, config, kbn, moment) {
};
ElasticDatasource.prototype._get = function(url) {
- return this._request('GET', url)
+ return this._request('GET', url, this.index)
.then(function(results) {
return results.data;
});
};
ElasticDatasource.prototype._post = function(url, data) {
- return this._request('POST', url, data)
+ return this._request('POST', url, this.index, data)
.then(function(results) {
return results.data;
});
@@ -71,9 +72,7 @@ function (angular, _, $, config, kbn, moment) {
var query = { "bool": { "should": [{ "query_string": { "query": queryString } }] } };
var data = { "query" : { "filtered": { "query" : query, "filter": filter } }, "size": 100 };
- this.index = annotation.index;
-
- return this._request('POST', '/_search', data).then(function(results) {
+ return this._request('POST', '/_search', annotation.index, data).then(function(results) {
var list = [];
var hits = results.data.hits.hits;
@@ -103,6 +102,116 @@ function (angular, _, $, config, kbn, moment) {
});
};
+ ElasticDatasource.prototype.getDashboard = function(id) {
+ var url = '/dashboard/' + id;
+
+ // hack to check if it is a temp dashboard
+ if (window.location.href.indexOf('dashboard/temp') > 0) {
+ url = '/temp/' + id;
+ }
+
+ return this._get(url)
+ .then(function(result) {
+ if (result._source && result._source.dashboard) {
+ return angular.fromJson(result._source.dashboard);
+ } else {
+ return false;
+ }
+ }, function(data, status) {
+ if(status === 0) {
+ throw "Could not contact Elasticsearch. Please ensure that Elasticsearch is reachable from your browser.";
+ } else {
+ throw "Could not find dashboard " + id;
+ }
+ });
+ };
+
+ ElasticDatasource.prototype.saveDashboard = function(dashboard, title) {
+ var dashboardClone = angular.copy(dashboard);
+ title = dashboardClone.title = title ? title : dashboard.title;
+
+ var data = {
+ user: 'guest',
+ group: 'guest',
+ title: title,
+ tags: dashboardClone.tags,
+ dashboard: angular.toJson(dashboardClone)
+ };
+
+ return this._request('PUT', '/dashboard/' + encodeURIComponent(title), this.index, data)
+ .then(function() {
+ return { title: title, url: '/dashboard/elasticsearch/' + title };
+ }, function(err) {
+ throw 'Failed to save to elasticsearch ' + err.data;
+ });
+ };
+
+ ElasticDatasource.prototype.saveDashboardTemp = function(dashboard) {
+ var data = {
+ user: 'guest',
+ group: 'guest',
+ title: dashboard.title,
+ tags: dashboard.tags,
+ dashboard: angular.toJson(dashboard)
+ };
+
+ var ttl = dashboard.loader.save_temp_ttl;
+
+ return this._request('POST', '/temp/?ttl=' + ttl, this.index, data)
+ .then(function(result) {
+
+ var baseUrl = window.location.href.replace(window.location.hash,'');
+ var url = baseUrl + "#dashboard/temp/" + result.data._id;
+
+ return { title: dashboard.title, url: url };
+
+ }, function(err) {
+ throw "Failed to save to temp dashboard to elasticsearch " + err.data;
+ });
+ };
+
+ ElasticDatasource.prototype.deleteDashboard = function(id) {
+ return this._request('DELETE', '/dashboard/' + id, this.index)
+ .then(function(result) {
+ return result.data._id;
+ }, function(err) {
+ throw err.data;
+ });
+ };
+
+ ElasticDatasource.prototype.searchDashboards = function(queryString) {
+ var tagsOnly = queryString.indexOf('tags!:') === 0;
+ if (tagsOnly) {
+ var tagsQuery = queryString.substring(6, queryString.length);
+ queryString = 'tags:' + tagsQuery + '*';
+ }
+ else {
+ if (queryString.length === 0) {
+ queryString = 'title:';
+ }
+
+ if (queryString[queryString.length - 1] !== '*') {
+ queryString += '*';
+ }
+ }
+
+ var query = {
+ query: { query_string: { query: queryString } },
+ facets: { tags: { terms: { field: "tags", order: "term", size: 50 } } },
+ size: 20,
+ sort: ["_uid"]
+ };
+
+ return this._post('/dashboard/_search', query)
+ .then(function(results) {
+ if(_.isUndefined(results.hits)) {
+ return { dashboards: [], tags: [] };
+ }
+
+ return { dashboards: results.hits.hits, tags: results.facets.terms };
+ });
+ };
+
return ElasticDatasource;
});