From 10820f31c25aaa584faf72285cd2c30266bfd0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 5 Feb 2015 10:37:13 +0100 Subject: [PATCH] Changed go package path --- .bra.toml | 2 +- .gitmodules | 3 --- conf/grafana.dev.ini | 2 +- main.go | 6 +++--- pkg/api/account.go | 6 +++--- pkg/api/account_users.go | 6 +++--- pkg/api/admin_users.go | 6 +++--- pkg/api/api.go | 6 +++--- pkg/api/apikey.go | 8 ++++---- pkg/api/dashboard.go | 12 ++++++------ pkg/api/dataproxy.go | 8 ++++---- pkg/api/dataproxy_test.go | 2 +- pkg/api/datasources.go | 8 ++++---- pkg/api/dtos/models.go | 2 +- pkg/api/frontendsettings.go | 8 ++++---- pkg/api/index.go | 6 +++--- pkg/api/login.go | 14 +++++++------- pkg/api/login_oauth.go | 12 ++++++------ pkg/api/metrics.go | 4 ++-- pkg/api/render.go | 6 +++--- pkg/api/search.go | 8 ++++---- pkg/api/signup.go | 8 ++++---- pkg/api/stars.go | 6 +++--- pkg/api/user.go | 6 +++--- pkg/cmd/import.go | 10 +++++----- pkg/cmd/web.go | 14 +++++++------- pkg/components/renderer/renderer.go | 4 ++-- pkg/middleware/auth.go | 4 ++-- pkg/middleware/logger.go | 2 +- pkg/middleware/middleware.go | 8 ++++---- pkg/services/eventpublisher/eventpublisher.go | 6 +++--- pkg/services/sqlstore/account.go | 6 +++--- pkg/services/sqlstore/account_test.go | 4 ++-- pkg/services/sqlstore/account_users.go | 4 ++-- pkg/services/sqlstore/apikey.go | 4 ++-- pkg/services/sqlstore/dashboard.go | 4 ++-- pkg/services/sqlstore/dashboard_test.go | 2 +- pkg/services/sqlstore/datasource.go | 4 ++-- pkg/services/sqlstore/datasource_test.go | 4 ++-- pkg/services/sqlstore/migrations.go | 2 +- pkg/services/sqlstore/migrations_test.go | 6 +++--- pkg/services/sqlstore/migrator/migrator.go | 2 +- pkg/services/sqlstore/shared.go | 4 ++-- pkg/services/sqlstore/sqlstore.go | 10 +++++----- pkg/services/sqlstore/star.go | 4 ++-- pkg/services/sqlstore/stars_test.go | 2 +- pkg/services/sqlstore/user.go | 10 +++++----- pkg/setting/setting.go | 2 +- pkg/social/social.go | 4 ++-- todo.txt | 5 ----- 50 files changed, 139 insertions(+), 147 deletions(-) delete mode 100644 .gitmodules delete mode 100644 todo.txt diff --git a/.bra.toml b/.bra.toml index dd374c3b666..ba60f451517 100644 --- a/.bra.toml +++ b/.bra.toml @@ -6,7 +6,7 @@ init_cmds = [ watch_all = true watch_dirs = [ "$WORKDIR/pkg", - "$WORKDIR/grafana/src/views", + "$WORKDIR/src/views", "$WORKDIR/conf", ] watch_exts = [".go", ".ini"] diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 651db133841..00000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "grafana"] - path = grafana - url = git@github.com:torkelo/grafana-private.git diff --git a/conf/grafana.dev.ini b/conf/grafana.dev.ini index 67cf8a6f008..6b94bf11691 100644 --- a/conf/grafana.dev.ini +++ b/conf/grafana.dev.ini @@ -2,7 +2,7 @@ app_mode = development [server] router_logging = false -static_root_path = grafana/src +static_root_path = src [log] level = Trace diff --git a/main.go b/main.go index fa20bef4e6d..997fbd38f0b 100644 --- a/main.go +++ b/main.go @@ -5,9 +5,9 @@ import ( "runtime" "strconv" - "github.com/torkelo/grafana-pro/pkg/cmd" - "github.com/torkelo/grafana-pro/pkg/log" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/cmd" + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/setting" "github.com/codegangsta/cli" ) diff --git a/pkg/api/account.go b/pkg/api/account.go index 16c359faf80..6c97b90c350 100644 --- a/pkg/api/account.go +++ b/pkg/api/account.go @@ -1,9 +1,9 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" ) func GetAccount(c *middleware.Context) { diff --git a/pkg/api/account_users.go b/pkg/api/account_users.go index 7d0d9f030f8..ef2ad1a84db 100644 --- a/pkg/api/account_users.go +++ b/pkg/api/account_users.go @@ -1,9 +1,9 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" ) func AddAccountUser(c *middleware.Context, cmd m.AddAccountUserCommand) { diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index 3c766ab0af0..b202c5ce2a8 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -1,9 +1,9 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" ) func AdminSearchUsers(c *middleware.Context) { diff --git a/pkg/api/api.go b/pkg/api/api.go index 6ee9fff1b75..fd7c7283eb4 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -3,9 +3,9 @@ package api import ( "github.com/Unknwon/macaron" "github.com/macaron-contrib/binding" - "github.com/torkelo/grafana-pro/pkg/api/dtos" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" ) // Register adds http routes diff --git a/pkg/api/apikey.go b/pkg/api/apikey.go index f5dca4fc450..fa0946d0303 100644 --- a/pkg/api/apikey.go +++ b/pkg/api/apikey.go @@ -1,10 +1,10 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/util" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/util" ) func GetApiKeys(c *middleware.Context) { diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index 7a0b8fea05f..ac43f2693e3 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -5,12 +5,12 @@ import ( "os" "path" - "github.com/torkelo/grafana-pro/pkg/api/dtos" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" - "github.com/torkelo/grafana-pro/pkg/util" + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/util" ) func isDasboardStarredByUser(c *middleware.Context, dashId int64) (bool, error) { diff --git a/pkg/api/dataproxy.go b/pkg/api/dataproxy.go index 9849b96c5fe..636fbe4d1fa 100644 --- a/pkg/api/dataproxy.go +++ b/pkg/api/dataproxy.go @@ -5,10 +5,10 @@ import ( "net/http/httputil" "net/url" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/util" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/util" ) func NewReverseProxy(ds *m.DataSource, proxyPath string) *httputil.ReverseProxy { diff --git a/pkg/api/dataproxy_test.go b/pkg/api/dataproxy_test.go index cd226b206eb..adf0b645a18 100644 --- a/pkg/api/dataproxy_test.go +++ b/pkg/api/dataproxy_test.go @@ -7,7 +7,7 @@ import ( . "github.com/smartystreets/goconvey/convey" - m "github.com/torkelo/grafana-pro/pkg/models" + m "github.com/grafana/grafana/pkg/models" ) func TestAccountDataAccess(t *testing.T) { diff --git a/pkg/api/datasources.go b/pkg/api/datasources.go index 7b3d95abac9..c4a7ae4d657 100644 --- a/pkg/api/datasources.go +++ b/pkg/api/datasources.go @@ -1,10 +1,10 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/api/dtos" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" ) func GetDataSources(c *middleware.Context) { diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index d06daffdba2..dfb76229199 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - m "github.com/torkelo/grafana-pro/pkg/models" + m "github.com/grafana/grafana/pkg/models" ) type LoginCommand struct { diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go index 4860f035b9c..071852a5e8e 100644 --- a/pkg/api/frontendsettings.go +++ b/pkg/api/frontendsettings.go @@ -3,10 +3,10 @@ package api import ( "strconv" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) func getFrontendSettings(c *middleware.Context) (map[string]interface{}, error) { diff --git a/pkg/api/index.go b/pkg/api/index.go index 0ae9ce5a055..98860b26e6a 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -1,9 +1,9 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/api/dtos" - "github.com/torkelo/grafana-pro/pkg/middleware" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/setting" ) func setIndexViewData(c *middleware.Context) error { diff --git a/pkg/api/login.go b/pkg/api/login.go index 7614502661f..29433fc4f2e 100644 --- a/pkg/api/login.go +++ b/pkg/api/login.go @@ -3,13 +3,13 @@ package api import ( "net/url" - "github.com/torkelo/grafana-pro/pkg/api/dtos" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/log" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" - "github.com/torkelo/grafana-pro/pkg/util" + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/util" ) const ( diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go index 5f76e95386e..0790166e5d1 100644 --- a/pkg/api/login_oauth.go +++ b/pkg/api/login_oauth.go @@ -6,12 +6,12 @@ import ( "golang.org/x/oauth2" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/log" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" - "github.com/torkelo/grafana-pro/pkg/social" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/social" ) func OAuthLogin(ctx *middleware.Context) { diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 0c314480657..6d9165cd6ab 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -1,8 +1,8 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/api/dtos" - "github.com/torkelo/grafana-pro/pkg/middleware" + "github.com/grafana/grafana/pkg/api/dtos" + "github.com/grafana/grafana/pkg/middleware" "math/rand" "strconv" ) diff --git a/pkg/api/render.go b/pkg/api/render.go index db4dbc4a1e3..18deb8e20b2 100644 --- a/pkg/api/render.go +++ b/pkg/api/render.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/torkelo/grafana-pro/pkg/components/renderer" - "github.com/torkelo/grafana-pro/pkg/middleware" - "github.com/torkelo/grafana-pro/pkg/util" + "github.com/grafana/grafana/pkg/components/renderer" + "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/util" ) func RenderToPng(c *middleware.Context) { diff --git a/pkg/api/search.go b/pkg/api/search.go index 58fdfa3c2fd..b1ae9bcc241 100644 --- a/pkg/api/search.go +++ b/pkg/api/search.go @@ -4,10 +4,10 @@ import ( "regexp" "strings" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) // TODO: this needs to be cached or improved somehow diff --git a/pkg/api/signup.go b/pkg/api/signup.go index 572a86f69a4..4076a63fb9a 100644 --- a/pkg/api/signup.go +++ b/pkg/api/signup.go @@ -1,10 +1,10 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) // POST /api/user/signup diff --git a/pkg/api/stars.go b/pkg/api/stars.go index 20436302ccd..2b5e64ce8e0 100644 --- a/pkg/api/stars.go +++ b/pkg/api/stars.go @@ -1,9 +1,9 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" ) func StarDashboard(c *middleware.Context) { diff --git a/pkg/api/user.go b/pkg/api/user.go index bc152f49ead..306f7c7b3d4 100644 --- a/pkg/api/user.go +++ b/pkg/api/user.go @@ -1,9 +1,9 @@ package api import ( - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/middleware" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/middleware" + m "github.com/grafana/grafana/pkg/models" ) func GetUser(c *middleware.Context) { diff --git a/pkg/cmd/import.go b/pkg/cmd/import.go index 9f26fb76b00..1c3545904a2 100644 --- a/pkg/cmd/import.go +++ b/pkg/cmd/import.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/codegangsta/cli" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/log" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/services/sqlstore" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/services/sqlstore" + "github.com/grafana/grafana/pkg/setting" ) var CmdImportJson = cli.Command{ diff --git a/pkg/cmd/web.go b/pkg/cmd/web.go index a5c760634d0..d76e7858302 100644 --- a/pkg/cmd/web.go +++ b/pkg/cmd/web.go @@ -13,13 +13,13 @@ import ( "github.com/codegangsta/cli" "github.com/macaron-contrib/session" - "github.com/torkelo/grafana-pro/pkg/api" - "github.com/torkelo/grafana-pro/pkg/log" - "github.com/torkelo/grafana-pro/pkg/middleware" - "github.com/torkelo/grafana-pro/pkg/services/eventpublisher" - "github.com/torkelo/grafana-pro/pkg/services/sqlstore" - "github.com/torkelo/grafana-pro/pkg/setting" - "github.com/torkelo/grafana-pro/pkg/social" + "github.com/grafana/grafana/pkg/api" + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/middleware" + "github.com/grafana/grafana/pkg/services/eventpublisher" + "github.com/grafana/grafana/pkg/services/sqlstore" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/social" ) var CmdWeb = cli.Command{ diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go index 6140af41216..cd8979a57bc 100644 --- a/pkg/components/renderer/renderer.go +++ b/pkg/components/renderer/renderer.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - "github.com/torkelo/grafana-pro/pkg/log" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/log" + "github.com/grafana/grafana/pkg/setting" ) type RenderOpts struct { diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go index a3ab8e780eb..3a94f2f9bbf 100644 --- a/pkg/middleware/auth.go +++ b/pkg/middleware/auth.go @@ -6,8 +6,8 @@ import ( "github.com/Unknwon/macaron" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) type AuthOptions struct { diff --git a/pkg/middleware/logger.go b/pkg/middleware/logger.go index e3da83d836b..88c8eaede15 100644 --- a/pkg/middleware/logger.go +++ b/pkg/middleware/logger.go @@ -22,7 +22,7 @@ import ( "time" "github.com/Unknwon/macaron" - "github.com/torkelo/grafana-pro/pkg/log" + "github.com/grafana/grafana/pkg/log" ) var isWindows bool diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index a7cdd55abfc..d62e9950dbf 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -8,10 +8,10 @@ import ( "github.com/Unknwon/macaron" "github.com/macaron-contrib/session" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/log" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) type Context struct { diff --git a/pkg/services/eventpublisher/eventpublisher.go b/pkg/services/eventpublisher/eventpublisher.go index 33983ea79a5..fa7fe500443 100644 --- a/pkg/services/eventpublisher/eventpublisher.go +++ b/pkg/services/eventpublisher/eventpublisher.go @@ -7,9 +7,9 @@ import ( "time" "github.com/streadway/amqp" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/events" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/events" + "github.com/grafana/grafana/pkg/setting" ) var ( diff --git a/pkg/services/sqlstore/account.go b/pkg/services/sqlstore/account.go index c2154624d62..ff1f2fa0546 100644 --- a/pkg/services/sqlstore/account.go +++ b/pkg/services/sqlstore/account.go @@ -3,9 +3,9 @@ package sqlstore import ( "time" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/events" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/events" + m "github.com/grafana/grafana/pkg/models" ) func init() { diff --git a/pkg/services/sqlstore/account_test.go b/pkg/services/sqlstore/account_test.go index 86c4c7de108..f0c9f5cbd9a 100644 --- a/pkg/services/sqlstore/account_test.go +++ b/pkg/services/sqlstore/account_test.go @@ -5,8 +5,8 @@ import ( . "github.com/smartystreets/goconvey/convey" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" ) func TestAccountDataAccess(t *testing.T) { diff --git a/pkg/services/sqlstore/account_users.go b/pkg/services/sqlstore/account_users.go index 41359075ceb..7aa5de4db3f 100644 --- a/pkg/services/sqlstore/account_users.go +++ b/pkg/services/sqlstore/account_users.go @@ -6,8 +6,8 @@ import ( "github.com/go-xorm/xorm" - "github.com/torkelo/grafana-pro/pkg/bus" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" ) func init() { diff --git a/pkg/services/sqlstore/apikey.go b/pkg/services/sqlstore/apikey.go index bbedaa5dcb2..458548bd680 100644 --- a/pkg/services/sqlstore/apikey.go +++ b/pkg/services/sqlstore/apikey.go @@ -4,8 +4,8 @@ import ( "time" "github.com/go-xorm/xorm" - "github.com/torkelo/grafana-pro/pkg/bus" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" ) func init() { diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go index b25c6774460..f9668731ab5 100644 --- a/pkg/services/sqlstore/dashboard.go +++ b/pkg/services/sqlstore/dashboard.go @@ -4,8 +4,8 @@ import ( "bytes" "github.com/go-xorm/xorm" - "github.com/torkelo/grafana-pro/pkg/bus" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" ) func init() { diff --git a/pkg/services/sqlstore/dashboard_test.go b/pkg/services/sqlstore/dashboard_test.go index 5c878130136..962fccb90a2 100644 --- a/pkg/services/sqlstore/dashboard_test.go +++ b/pkg/services/sqlstore/dashboard_test.go @@ -5,7 +5,7 @@ import ( . "github.com/smartystreets/goconvey/convey" - m "github.com/torkelo/grafana-pro/pkg/models" + m "github.com/grafana/grafana/pkg/models" ) func insertTestDashboard(title string, accountId int64, tags ...interface{}) *m.Dashboard { diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go index 6360d50cc02..842b2bfb1c6 100644 --- a/pkg/services/sqlstore/datasource.go +++ b/pkg/services/sqlstore/datasource.go @@ -3,8 +3,8 @@ package sqlstore import ( "time" - "github.com/torkelo/grafana-pro/pkg/bus" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" "github.com/go-xorm/xorm" ) diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go index 4d3126e747c..17873196d8f 100644 --- a/pkg/services/sqlstore/datasource_test.go +++ b/pkg/services/sqlstore/datasource_test.go @@ -7,8 +7,8 @@ import ( . "github.com/smartystreets/goconvey/convey" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/services/sqlstore/sqlutil" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/services/sqlstore/sqlutil" ) func InitTestDB(t *testing.T) { diff --git a/pkg/services/sqlstore/migrations.go b/pkg/services/sqlstore/migrations.go index f18e55a7f1b..1bc4ebccfa2 100644 --- a/pkg/services/sqlstore/migrations.go +++ b/pkg/services/sqlstore/migrations.go @@ -1,6 +1,6 @@ package sqlstore -import . "github.com/torkelo/grafana-pro/pkg/services/sqlstore/migrator" +import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator" // --- Migration Guide line --- // 1. Never change a migration that is committed and pushed to master diff --git a/pkg/services/sqlstore/migrations_test.go b/pkg/services/sqlstore/migrations_test.go index 8d176e0c1ae..6e1f55d8f6f 100644 --- a/pkg/services/sqlstore/migrations_test.go +++ b/pkg/services/sqlstore/migrations_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/go-xorm/xorm" - "github.com/torkelo/grafana-pro/pkg/log" - . "github.com/torkelo/grafana-pro/pkg/services/sqlstore/migrator" - "github.com/torkelo/grafana-pro/pkg/services/sqlstore/sqlutil" + "github.com/grafana/grafana/pkg/log" + . "github.com/grafana/grafana/pkg/services/sqlstore/migrator" + "github.com/grafana/grafana/pkg/services/sqlstore/sqlutil" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go index 72c96bc78e1..53e61f3d1c9 100644 --- a/pkg/services/sqlstore/migrator/migrator.go +++ b/pkg/services/sqlstore/migrator/migrator.go @@ -7,7 +7,7 @@ import ( "github.com/go-xorm/xorm" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - "github.com/torkelo/grafana-pro/pkg/log" + "github.com/grafana/grafana/pkg/log" ) type Migrator struct { diff --git a/pkg/services/sqlstore/shared.go b/pkg/services/sqlstore/shared.go index 51300167757..be4266477c7 100644 --- a/pkg/services/sqlstore/shared.go +++ b/pkg/services/sqlstore/shared.go @@ -2,8 +2,8 @@ package sqlstore import ( "github.com/go-xorm/xorm" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/log" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" ) type dbTransactionFunc func(sess *xorm.Session) error diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go index 9200ef6ec2c..e2bfc1bddd8 100644 --- a/pkg/services/sqlstore/sqlstore.go +++ b/pkg/services/sqlstore/sqlstore.go @@ -6,11 +6,11 @@ import ( "path" "strings" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/log" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/services/sqlstore/migrator" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/log" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/services/sqlstore/migrator" + "github.com/grafana/grafana/pkg/setting" _ "github.com/go-sql-driver/mysql" "github.com/go-xorm/xorm" diff --git a/pkg/services/sqlstore/star.go b/pkg/services/sqlstore/star.go index 35543439d07..09dcb8ed939 100644 --- a/pkg/services/sqlstore/star.go +++ b/pkg/services/sqlstore/star.go @@ -3,8 +3,8 @@ package sqlstore import ( "github.com/go-xorm/xorm" - "github.com/torkelo/grafana-pro/pkg/bus" - m "github.com/torkelo/grafana-pro/pkg/models" + "github.com/grafana/grafana/pkg/bus" + m "github.com/grafana/grafana/pkg/models" ) func init() { diff --git a/pkg/services/sqlstore/stars_test.go b/pkg/services/sqlstore/stars_test.go index 23b2eaf6502..4d6597529ca 100644 --- a/pkg/services/sqlstore/stars_test.go +++ b/pkg/services/sqlstore/stars_test.go @@ -4,7 +4,7 @@ import ( "testing" . "github.com/smartystreets/goconvey/convey" - m "github.com/torkelo/grafana-pro/pkg/models" + m "github.com/grafana/grafana/pkg/models" ) func TestUserStarsDataAccess(t *testing.T) { diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go index 8287f89106f..ce82cdd58ca 100644 --- a/pkg/services/sqlstore/user.go +++ b/pkg/services/sqlstore/user.go @@ -6,11 +6,11 @@ import ( "github.com/go-xorm/xorm" - "github.com/torkelo/grafana-pro/pkg/bus" - "github.com/torkelo/grafana-pro/pkg/events" - m "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" - "github.com/torkelo/grafana-pro/pkg/util" + "github.com/grafana/grafana/pkg/bus" + "github.com/grafana/grafana/pkg/events" + m "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" + "github.com/grafana/grafana/pkg/util" ) func init() { diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 4464befc310..04383b418be 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -15,7 +15,7 @@ import ( "github.com/macaron-contrib/session" "gopkg.in/ini.v1" - "github.com/torkelo/grafana-pro/pkg/log" + "github.com/grafana/grafana/pkg/log" ) type Scheme string diff --git a/pkg/social/social.go b/pkg/social/social.go index 3afa96f76f0..7e650d11ba0 100644 --- a/pkg/social/social.go +++ b/pkg/social/social.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/torkelo/grafana-pro/pkg/models" - "github.com/torkelo/grafana-pro/pkg/setting" + "github.com/grafana/grafana/pkg/models" + "github.com/grafana/grafana/pkg/setting" "golang.org/x/oauth2" ) diff --git a/todo.txt b/todo.txt deleted file mode 100644 index 29f790ba8e2..00000000000 --- a/todo.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Security -- OAuth and email, unique? -- Form authentication token -- Password hash -- Account security for png rendering