opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 22:12:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable Grafana extensions at build time. (#11752)

Browse Source 
* extensions: import and build

* bus: use predefined error

* enterprise: build script for enterprise packages

* poc: auto registering services and dependency injection

(cherry picked from commit b5b1ef875f905473af41e49f8071cb9028edc845)

* poc: backend services registry progress

(cherry picked from commit 97be69725881241bfbf1e7adf0e66801d6b0af3d)

* poc: minor update

(cherry picked from commit 03d7a6888b81403f458b94305792e075568f0794)

* ioc: introduce manuel ioc

* enterprise: adds setting for enterprise

* build: test and build specific ee commit

* cleanup: test testing code

* removes example hello service
This commit is contained in:
Carl Bergquist
2018-04-27 13:41:58 +02:00
committed by Torkel Ödegaard
parent afce0feb05
commit 28f7b6dad1
30 changed files with 1678 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

@ -23,7 +23,7 @@ func (hs *HTTPServer) registerRoutes() {
// automatically set HEAD for every GET
macaronR.SetAutoHead(true)
r := newRouteRegister(middleware.RequestMetrics, middleware.RequestTracing)
r := hs.RouteRegister
// not logged in views
r.Get("/", reqSignedIn, Index)

9
pkg/api/http_server.go
View File

@ -35,15 +35,14 @@ type HTTPServer struct {
context context.Context
streamManager *live.StreamManager
cache *gocache.Cache
RouteRegister RouteRegister `inject:""`
httpSrv *http.Server
}
func NewHTTPServer() *HTTPServer {
return &HTTPServer{
log: log.New("http.server"),
cache: gocache.New(5*time.Minute, 10*time.Minute),
}
func (hs *HTTPServer) Init() {
hs.log = log.New("http.server")
hs.cache = gocache.New(5*time.Minute, 10*time.Minute)
}
func (hs *HTTPServer) Start(ctx context.Context) error {

2
pkg/api/index.go
View File

@ -289,7 +289,7 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
data.NavTree = append(data.NavTree, &dtos.NavLink{
Text: "Help",
SubTitle: fmt.Sprintf(`Grafana v%s (%s)`, setting.BuildVersion, setting.BuildCommit),
SubTitle: fmt.Sprintf(`%s v%s (%s)`, setting.ApplicationName, setting.BuildVersion, setting.BuildCommit),
Id: "help",
Url: "#",
Icon: "gicon gicon-question",

5
pkg/api/route_register.go
View File

@ -11,6 +11,8 @@ type Router interface {
Get(pattern string, handlers ...macaron.Handler) *macaron.Route
}
// RouteRegister allows you to add routes and macaron.Handlers
// that the web server should serve.
type RouteRegister interface {
Get(string, ...macaron.Handler)
Post(string, ...macaron.Handler)
@ -26,7 +28,8 @@ type RouteRegister interface {
type RegisterNamedMiddleware func(name string) macaron.Handler
func newRouteRegister(namedMiddleware ...RegisterNamedMiddleware) RouteRegister {
// NewRouteRegister creates a new RouteRegister with all middlewares sent as params
func NewRouteRegister(namedMiddleware ...RegisterNamedMiddleware) RouteRegister {
return &routeRegister{
prefix: "",
routes: []route{},

6
pkg/api/route_register_test.go
View File

@ -51,7 +51,7 @@ func TestRouteSimpleRegister(t *testing.T) {
}
// Setup
rr := newRouteRegister(func(name string) macaron.Handler {
rr := NewRouteRegister(func(name string) macaron.Handler {
return emptyHandler(name)
})
@ -96,7 +96,7 @@ func TestRouteGroupedRegister(t *testing.T) {
}
// Setup
rr := newRouteRegister()
rr := NewRouteRegister()
rr.Delete("/admin", emptyHandler("1"))
rr.Get("/down", emptyHandler("1"), emptyHandler("2"))
@ -150,7 +150,7 @@ func TestNamedMiddlewareRouteRegister(t *testing.T) {
}
// Setup
rr := newRouteRegister(func(name string) macaron.Handler {
rr := NewRouteRegister(func(name string) macaron.Handler {
return emptyHandler(name)
})