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

Extracted multi-graphite query function, fixed loadRecursive

Browse Source 
The new function in metricKeys generalizes what my loadAll
from the previous commit did, it takes a request and a
callback. The request is executed on each graphite installation
and the callback is executed for each result. This makes
implementing loadAll and loadRecursive almost as simple as
it was.
This commit is contained in:
Harald Kraemer 2014-04-30 13:13:51 +02:00
parent 637c720de5
commit 52e1f5273c
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/controllers/metricKeys.js
View File

@ -52,18 +52,23 @@ function (angular, _, config) {
$scope.loadAll = function() {
$scope.infoText = "Fetching all metrics from graphite...";
return $q.all( _.map( config.datasources, function( datasource ) {
if ( datasource.type = 'graphite' ) {
return $http.get( datasource.url + "/metrics/index.json" )
.then( saveMetricsArray );
}
} ) ).then( function() {
getFromEachGraphite( '/metrics/index.json', saveMetricsArray )
.then( function() {
$scope.infoText = "Indexing complete!";
}).then(null, function(err) {
}).then(null, function(err) {
$scope.errorText = err;
});
});
};
function getFromEachGraphite( request, data_callback, error_callback ) {
return $q.all( _.map( config.datasources, function( datasource ) {
if ( datasource.type = 'graphite' ) {
return $http.get( datasource.url + request )
.then( data_callback, error_callback );
}
} ) );
}
function saveMetricsArray(data, currentIndex)
{
if (!data && !data.data && data.data.length === 0) {
@ -82,6 +87,7 @@ function (angular, _, config) {
});
}
function deleteIndex()
{
var deferred = $q.defer();
@ -157,7 +163,6 @@ function (angular, _, config) {
function saveMetricKey(metricId) {
// Create request with id as title. Rethink this.
console.log( config.grafana_metrics_index, metricId );
var request = $scope.ejs.Document(config.grafana_metrics_index, 'metricKey', metricId).source({
metricPath: metricId
});
@ -175,7 +180,7 @@ function (angular, _, config) {
function loadMetricsRecursive(metricPath)
{
return $http.get(config.graphiteUrl + '/metrics/find/?query=' + metricPath).then(receiveMetric);
return getFromEachGraphite( '/metrics/find/?query=' + metricPath, receiveMetric );
}
});