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

began work on support index time patterns

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-06 12:58:53 +02:00
parent b24c539206
commit 14cb2b0143
8 changed files with 127 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@@ -1,14 +1,13 @@
define([
'angular',
'lodash',
'config',
'kbn',
'moment',
'./queryBuilder',
'./indexPattern',
'./queryCtrl',
'./directives'
],
function (angular, _, config, kbn, moment, ElasticQueryBuilder) {
function (angular, _, moment, ElasticQueryBuilder, IndexPattern) {
'use strict';
var module = angular.module('grafana.services');
@@ -21,10 +20,7 @@ function (angular, _, config, kbn, moment, ElasticQueryBuilder) {
this.url = datasource.url;
this.name = datasource.name;
this.index = datasource.index;
this.searchMaxResults = config.search.max_results || 20;
this.saveTemp = _.isUndefined(datasource.save_temp) ? true : datasource.save_temp;
this.saveTempTTL = _.isUndefined(datasource.save_temp_ttl) ? '30d' : datasource.save_temp_ttl;
this.indexPattern = new IndexPattern(datasource.index, datasource.jsonData.interval)
}
ElasticDatasource.prototype._request = function(method, url, index, data) {
@@ -45,7 +41,7 @@ function (angular, _, config, kbn, moment, ElasticQueryBuilder) {
};
ElasticDatasource.prototype._get = function(url) {
return this._request('GET', url, this.index)
return this._request('GET', url, this.indexPattern.getIndexForToday())
.then(function(results) {
return results.data;
});
@@ -128,9 +124,14 @@ function (angular, _, config, kbn, moment, ElasticQueryBuilder) {
};
ElasticDatasource.prototype.testDatasource = function() {
var query = JSON.stringify();
return this._post('/_search?search_type=count', query).then(function() {
return this._get('/_stats').then(function() {
return { status: "success", message: "Data source is working", title: "Success" };
}, function(err) {
if (err.data && err.data.error) {
return { status: "error", message: err.data.error, title: "Error" };
} else {
return { status: "error", message: err.status, title: "Error" };
}
});
};