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

Optimized backend queries

Browse Source
This commit is contained in:
utkarshcmu 2016-01-19 04:09:57 -08:00
parent 8f067a5ed2
commit 1ab1154010
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/api.go
View File

@ -69,7 +69,6 @@ func Register(r *macaron.Macaron) {
// dashboard snapshots // dashboard snapshots
r.Get("/dashboard/snapshot/*", Index) r.Get("/dashboard/snapshot/*", Index)
r.Get("/dashboard/snapshots/", reqSignedIn, Index)
// api for dashboard snapshots // api for dashboard snapshots
r.Post("/api/snapshots/", bind(m.CreateDashboardSnapshotCommand{}), CreateDashboardSnapshot) r.Post("/api/snapshots/", bind(m.CreateDashboardSnapshotCommand{}), CreateDashboardSnapshot)
@ -184,7 +183,7 @@ func Register(r *macaron.Macaron) {
r.Get("/tags", GetDashboardTags) r.Get("/tags", GetDashboardTags)
}) })
// dashboard snapshots // Dashboard snapshots
r.Group("/dashboard/snapshots", func() { r.Group("/dashboard/snapshots", func() {
r.Get("/", wrap(SearchDashboardSnapshots)) r.Get("/", wrap(SearchDashboardSnapshots))
}) })

2
pkg/api/index.go
View File

@ -63,7 +63,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{ data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
Text: "Snapshots", Text: "Snapshots",
Icon: "fa fa-fw fa-camera-retro", Icon: "fa fa-fw fa-camera-retro",
Url: "/dashboard/snapshots", Url: "/snapshots",
}) })
if c.OrgRole == m.ROLE_ADMIN { if c.OrgRole == m.ROLE_ADMIN {

3
pkg/services/sqlstore/dashboard_snapshot.go
View File

@ -68,7 +68,7 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error {
func SearchDashboardSnapshots(query *m.GetDashboardSnapshotsQuery) error { func SearchDashboardSnapshots(query *m.GetDashboardSnapshotsQuery) error {
var snapshots = make(m.DashboardSnapshots, 0) var snapshots = make(m.DashboardSnapshots, 0)
sess := x.Limit(query.Limit) sess := x.Cols("name,key,delete_key").Limit(query.Limit)
if query.Name != "" { if query.Name != "" {
sess.Where("name LIKE ?", query.Name) sess.Where("name LIKE ?", query.Name)
@ -77,6 +77,5 @@ func SearchDashboardSnapshots(query *m.GetDashboardSnapshotsQuery) error {
sess.Where("org_id = ?", query.OrgId) sess.Where("org_id = ?", query.OrgId)
err := sess.Find(&snapshots) err := sess.Find(&snapshots)
query.Result = snapshots query.Result = snapshots
return err return err
} }