diff --git a/grafana b/grafana
index a0036179d50..1c5f902770c 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit a0036179d500366e28552d2c332fd50f534913a3
+Subproject commit 1c5f902770c260f9bc63a0f07f1e9d22f60ce796
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 07ae8ddce8f..2159c2386fb 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -46,6 +46,10 @@ func getFrontendSettings(c *middleware.Context) (map[string]interface{}, error)
 			}
 		}
 
+		if ds.Type == m.DS_ES {
+			dsMap["index"] = ds.Database
+		}
+
 		datasources[ds.Name] = dsMap
 	}
 
diff --git a/pkg/models/datasource.go b/pkg/models/datasource.go
index 19a5d903fbe..ba1b4cad7b6 100644
--- a/pkg/models/datasource.go
+++ b/pkg/models/datasource.go
@@ -8,7 +8,7 @@ import (
 const (
 	DS_GRAPHITE      = "graphite"
 	DS_INFLUXDB      = "influxdb"
-	DS_ES            = "es"
+	DS_ES            = "elasticsearch"
 	DS_ACCESS_DIRECT = "direct"
 	DS_ACCESS_PROXY  = "proxy"
 )