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

Support fields from nested objects pulled from Elasticsearch

Browse Source
This commit is contained in:
Gregory Becker
2014-09-19 14:03:08 +01:00
parent 563dd898c1
commit 10f9022d7c
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/services/elasticsearch/es-datasource.js
View File

@@ -86,7 +86,23 @@ function (angular, _, config, kbn, moment) {
var list = [];
var hits = results.data.hits.hits;
var getFieldFromSource = function(source, fieldName) {
var fieldValue;
if (fieldName) {
var fieldNames = fieldName.split('.');
fieldValue = source;
for (var i = 0; i < fieldNames.length; i++) {
fieldValue = fieldValue[fieldNames[i]];
}
if (_.isArray(fieldValue)) {
fieldValue = fieldValue.join(',');
}
}
return fieldValue;
};
for (var i = 0; i < hits.length; i++) {
console.log('annotationQuery', hits[i]);
var source = hits[i]._source;
var fields = hits[i].fields;
var time = source[timeField];
@@ -98,21 +114,11 @@ function (angular, _, config, kbn, moment) {
var event = {
annotation: annotation,
time: moment.utc(time).valueOf(),
title: source[titleField],
title: getFieldFromSource(source, titleField),
tags: getFieldFromSource(source, tagsField),
text: getFieldFromSource(source, textField)
};
if (source[tagsField]) {
if (_.isArray(source[tagsField])) {
event.tags = source[tagsField].join(', ');
}
else {
event.tags = source[tagsField];
}
}
if (textField && source[textField]) {
event.text = source[textField];
}
list.push(event);
}
return list;