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

Merge branch 'master' into external-plugins

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-11-21 13:48:31 +01:00
commit 29f6283eab
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/models/dashboards.go
View File

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

2
public/app/plugins/datasource/elasticsearch/specs/elastic_response_specs.ts
View File

@ -443,7 +443,7 @@ describe('ElasticResponse', function() {
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[0].type).to.be('docs');
expect(result.data[0].datapoints.length).to.be(2);