From 6a9a2b95b13346c523351175bc5fac5d43b3a674 Mon Sep 17 00:00:00 2001
From: Stephen Wood <stephen@moz.com>
Date: Fri, 6 Sep 2013 16:23:33 -0700
Subject: [PATCH] Clarify error message.

Elasticsearch will throw a 404 if there is no indexes added yet, resulting in
this unclear message -- even for people that are not using any sort of proxy.

This message update should make it easier to quickly troubleshoot why the
the dialogue is popping up.
---
 js/services.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/services.js b/js/services.js
index 1d309f51475f9..d694062f3fdc0 100644
--- a/js/services.js
+++ b/js/services.js
@@ -89,9 +89,10 @@ angular.module('kibana.services', [])
       if(status === 0) {
         alertSrv.set('Error',"Could not contact Elasticsearch at "+config.elasticsearch+
           ". Please ensure that Elasticsearch is reachable from your system." ,'error');
-      } else {
-        alertSrv.set('Error',"Could not find "+config.elasticsearch+"/"+indices.join(',')+"/_mapping. If you"+
-          " are using a proxy, ensure it is configured correctly",'error');
+     } else {
+        alertSrv.set('Error',"No index found at "+config.elasticsearch+"/" +
+         indices.join(',')+"/_mapping. Please create at least one index."  +
+         "If you're using a proxy ensure it is configured correctly.",'error');
       }
     });
 
@@ -963,4 +964,4 @@ angular.module('kibana.services', [])
       return false;
     });
   };
-});
\ No newline at end of file
+});