From 40a491a80bb5beac046128a01ec59c453edbf4ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 20 Sep 2014 08:30:59 +0200
Subject: [PATCH] Annotations: Elasticsearch annotation and field mapping
 fixes, small changes for PR #830

---
 CHANGELOG.md                                  |  1 +
 src/app/directives/grafanaGraph.js            |  5 -----
 src/app/services/annotationsSrv.js            |  3 ++-
 .../services/elasticsearch/es-datasource.js   | 22 +++++++++----------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7d233c8237..69835953dc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode
 - [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format
 - [Issue #828](https://github.com/grafana/grafana/issues/828). Elasticsearch: saving new dashboard with title equal to slugified url would cause it to deleted.
+- [Issue #830](https://github.com/grafana/grafana/issues/830). Annotations: Fix for elasticsearch annotations and mapping nested fields
 
 # 1.8.0-RC1 (2014-09-12)
 
diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js
index ee6b0fb7dd7..15f1556aa62 100755
--- a/src/app/directives/grafanaGraph.js
+++ b/src/app/directives/grafanaGraph.js
@@ -110,11 +110,6 @@ function (angular, $, kbn, moment, _) {
 
           // Populate element
           var options = {
-            hooks: {
-              drawSeries: [function() {
-                console.log('drawSeries', arguments);
-              }]
-            },
             legend: { show: false },
             series: {
               stackpercent: panel.stack ? panel.percentage : false,
diff --git a/src/app/services/annotationsSrv.js b/src/app/services/annotationsSrv.js
index c1733189462..04fb4224cc6 100644
--- a/src/app/services/annotationsSrv.js
+++ b/src/app/services/annotationsSrv.js
@@ -57,7 +57,8 @@ define([
 
     function errorHandler(err) {
       console.log('Annotation error: ', err);
-      alertSrv.set('Annotations','Could not fetch annotations','error');
+      var message = err.message || "Aannotation query failed";
+      alertSrv.set('Annotations error', message,'error');
     }
 
     function addAnnotation(options) {
diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 4cc1da3843e..04d1e62ce04 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -87,22 +87,22 @@ function (angular, _, config, kbn, moment) {
         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(',');
-            }
+          if (!fieldName) { return; }
+
+          var fieldNames = fieldName.split('.');
+          var 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];