Merge branch 'master' into external-plugins

pkg/models/dashboards.go

@@ -43,6 +43,8 @@ func NewDashboard(title string) *Dashboard {
 	dash.Data = make(map[string]interface{})
 	dash.Data = make(map[string]interface{})
 	dash.Data["title"] = title
 	dash.Data["title"] = title
 	dash.Title = title
 	dash.Title = title
+	dash.Created = time.Now()
+	dash.Updated = time.Now()
 	dash.UpdateSlug()
 	dash.UpdateSlug()
 	return dash
 	return dash
 }
 }
@@ -73,9 +75,12 @@ func NewDashboardFromJson(data map[string]interface{}) *Dashboard {
 
 
 		if dash.Data["version"] != nil {
 		if dash.Data["version"] != nil {
 			dash.Version = int(dash.Data["version"].(float64))
 			dash.Version = int(dash.Data["version"].(float64))
+			dash.Updated = time.Now()
 		}
 		}
 	} else {
 	} else {
 		dash.Data["version"] = 0
 		dash.Data["version"] = 0
+		dash.Created = time.Now()
+		dash.Updated = time.Now()
 	}
 	}
 
 
 	return dash
 	return dash

public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts

@@ -443,7 +443,7 @@ describe('ElasticResponse', function() {
       result = new ElasticResponse(targets, response).getTimeSeries();
       result = new ElasticResponse(targets, response).getTimeSeries();
     });
     });
 
 
-    it.only('should return table', function() {
+    it('should return table', function() {
       expect(result.data.length).to.be(1);
       expect(result.data.length).to.be(1);
       expect(result.data[0].type).to.be('docs');
       expect(result.data[0].type).to.be('docs');
       expect(result.data[0].datapoints.length).to.be(2);
       expect(result.data[0].datapoints.length).to.be(2);