More work on email and notification infra #1456

This commit is contained in:
Torkel Ödegaard
2015-06-05 08:15:38 +02:00
parent 3706d0dedd
commit c709a28f02
14 changed files with 54 additions and 15 deletions
+6 -6
View File
@@ -24,12 +24,12 @@ func GetApiKeys(c *middleware.Context) Response {
}
}
bus.Dispatch(&m.SendEmailCommand{
To: []string{"torkel@raintank.io"},
From: "grafana@test.com",
Subject: "Test from Grafana2",
Body: "Body! hej hoppas allt är bra",
})
// bus.Dispatch(&m.SendEmailCommand{
// To: []string{"torkel@raintank.io"},
// From: "grafana@test.com",
// Subject: "Test from Grafana2",
// Body: "Body! hej hoppas allt är bra",
// })
return Json(200, result)
}
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/search"
"github.com/grafana/grafana/pkg/services/search"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
)
+1 -1
View File
@@ -3,7 +3,7 @@ package api
import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/search"
"github.com/grafana/grafana/pkg/services/search"
)
func Search(c *middleware.Context) {