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 'alerting' into grafana-annotations

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-09-13 09:38:12 +02:00
parent 4a2f2fba73 1264a1b3a6
commit 6375418d8c
31 changed files with 381 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/sqlstore/datasource.go
View File

@@ -43,7 +43,7 @@ func GetDataSourceByName(query *m.GetDataSourceByNameQuery) error {
}
func GetDataSources(query *m.GetDataSourcesQuery) error {
sess := x.Limit(100, 0).Where("org_id=?", query.OrgId).Asc("name")
sess := x.Limit(1000, 0).Where("org_id=?", query.OrgId).Asc("name")
query.Result = make([]*m.DataSource, 0)
return sess.Find(&query.Result)