apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move log package to /infra (#17023)

Browse Source 
ref #14679

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
pull/17020/head^2
zhulongcheng 7 years ago committed by Carl Bergquist
parent 0efb8821f9
commit 2fff8f77dc
127 changed files with 118 additions and 118 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      pkg/api/app_routes.go
  2. 2
      pkg/api/avatar/avatar.go
  3. 2
      pkg/api/dashboard.go
  4. 2
      pkg/api/frontendsettings.go
  5. 2
      pkg/api/http_server.go
  6. 2
      pkg/api/live/conn.go
  7. 2
      pkg/api/live/hub.go
  8. 2
      pkg/api/live/stream_manager.go
  9. 2
      pkg/api/login.go
  10. 2
      pkg/api/login_oauth.go
  11. 2
      pkg/api/playlist.go
  12. 2
      pkg/api/playlist_play.go
  13. 2
      pkg/api/pluginproxy/ds_proxy.go
  14. 2
      pkg/api/pluginproxy/ds_proxy_test.go
  15. 2
      pkg/api/pluginproxy/pluginproxy.go
  16. 2
      pkg/cmd/grafana-server/main.go
  17. 2
      pkg/cmd/grafana-server/server.go
  18. 2
      pkg/components/imguploader/azureblobuploader.go
  19. 2
      pkg/components/imguploader/gcsuploader.go
  20. 2
      pkg/components/imguploader/imguploader.go
  21. 2
      pkg/components/imguploader/s3uploader.go
  22. 2
      pkg/components/securejsondata/securejsondata.go
  23. 0
      pkg/infra/log/file.go
  24. 0
      pkg/infra/log/file_test.go
  25. 0
      pkg/infra/log/handlers.go
  26. 0
      pkg/infra/log/interface.go
  27. 0
      pkg/infra/log/log.go
  28. 0
      pkg/infra/log/log_writer.go
  29. 0
      pkg/infra/log/log_writer_test.go
  30. 0
      pkg/infra/log/syslog.go
  31. 0
      pkg/infra/log/syslog_windows.go
  32. 2
      pkg/infra/metrics/service.go
  33. 2
      pkg/infra/remotecache/database_storage.go
  34. 2
      pkg/infra/remotecache/database_storage_test.go
  35. 2
      pkg/infra/remotecache/remotecache.go
  36. 2
      pkg/infra/serverlock/serverlock.go
  37. 2
      pkg/infra/serverlock/serverlock_test.go
  38. 2
      pkg/infra/tracing/tracing.go
  39. 2
      pkg/infra/usagestats/service.go
  40. 2
      pkg/login/social/common.go
  41. 2
      pkg/login/social/social.go
  42. 2
      pkg/middleware/middleware.go
  43. 2
      pkg/middleware/recovery.go
  44. 2
      pkg/models/context.go
  45. 2
      pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
  46. 2
      pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
  47. 2
      pkg/plugins/datasource_plugin.go
  48. 2
      pkg/plugins/hclog-wrapper.go
  49. 2
      pkg/plugins/plugins.go
  50. 2
      pkg/plugins/update_checker.go
  51. 2
      pkg/services/alerting/engine.go
  52. 2
      pkg/services/alerting/eval_context.go
  53. 2
      pkg/services/alerting/eval_handler.go
  54. 2
      pkg/services/alerting/extractor.go
  55. 2
      pkg/services/alerting/notifier.go
  56. 2
      pkg/services/alerting/notifiers/alertmanager.go
  57. 2
      pkg/services/alerting/notifiers/alertmanager_test.go
  58. 2
      pkg/services/alerting/notifiers/base.go
  59. 2
      pkg/services/alerting/notifiers/dingding.go
  60. 2
      pkg/services/alerting/notifiers/discord.go
  61. 2
      pkg/services/alerting/notifiers/email.go
  62. 2
      pkg/services/alerting/notifiers/googlechat.go
  63. 2
      pkg/services/alerting/notifiers/hipchat.go
  64. 2
      pkg/services/alerting/notifiers/kafka.go
  65. 2
      pkg/services/alerting/notifiers/line.go
  66. 2
      pkg/services/alerting/notifiers/opsgenie.go
  67. 2
      pkg/services/alerting/notifiers/pagerduty.go
  68. 2
      pkg/services/alerting/notifiers/pushover.go
  69. 2
      pkg/services/alerting/notifiers/sensu.go
  70. 2
      pkg/services/alerting/notifiers/slack.go
  71. 2
      pkg/services/alerting/notifiers/teams.go
  72. 2
      pkg/services/alerting/notifiers/telegram.go
  73. 2
      pkg/services/alerting/notifiers/threema.go
  74. 2
      pkg/services/alerting/notifiers/victorops.go
  75. 2
      pkg/services/alerting/notifiers/webhook.go
  76. 2
      pkg/services/alerting/reader.go
  77. 2
      pkg/services/alerting/result_handler.go
  78. 2
      pkg/services/alerting/scheduler.go
  79. 2
      pkg/services/alerting/test_notification.go
  80. 2
      pkg/services/auth/auth_token.go
  81. 2
      pkg/services/auth/auth_token_test.go
  82. 2
      pkg/services/cleanup/cleanup.go
  83. 2
      pkg/services/dashboards/dashboard_service.go
  84. 2
      pkg/services/guardian/guardian.go
  85. 2
      pkg/services/ldap/ldap.go
  86. 2
      pkg/services/ldap/ldap_login_test.go
  87. 2
      pkg/services/ldap/ldap_test.go
  88. 2
      pkg/services/ldap/settings.go
  89. 2
      pkg/services/login/login.go
  90. 2
      pkg/services/notifications/notifications.go
  91. 2
      pkg/services/provisioning/dashboards/config_reader.go
  92. 2
      pkg/services/provisioning/dashboards/config_reader_test.go
  93. 2
      pkg/services/provisioning/dashboards/dashboard.go
  94. 2
      pkg/services/provisioning/dashboards/file_reader.go
  95. 2
      pkg/services/provisioning/dashboards/file_reader_linux_test.go
  96. 2
      pkg/services/provisioning/dashboards/file_reader_test.go
  97. 2
      pkg/services/provisioning/datasources/config_reader.go
  98. 2
      pkg/services/provisioning/datasources/config_reader_test.go
  99. 2
      pkg/services/provisioning/datasources/datasources.go
  100. 2
      pkg/services/provisioning/datasources/types.go
  101. Some files were not shown because too many files have changed in this diff Show More

2
pkg/api/app_routes.go
Unescape View File

@ -7,7 +7,7 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/api/pluginproxy" "github.com/grafana/grafana/pkg/api/pluginproxy"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"

2
pkg/api/avatar/avatar.go
Unescape View File

@ -22,7 +22,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1" "gopkg.in/macaron.v1"

2
pkg/api/dashboard.go
Unescape View File

@ -14,8 +14,8 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/dashdiffs" "github.com/grafana/grafana/pkg/components/dashdiffs"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/services/guardian"

2
pkg/api/frontendsettings.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/api/http_server.go
Unescape View File

@ -16,8 +16,8 @@ import (
httpstatic "github.com/grafana/grafana/pkg/api/static" httpstatic "github.com/grafana/grafana/pkg/api/static"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/remotecache" "github.com/grafana/grafana/pkg/infra/remotecache"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"

2
pkg/api/live/conn.go
Unescape View File

@ -6,7 +6,7 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
) )
const ( const (

2
pkg/api/live/hub.go
Unescape View File

@ -5,7 +5,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
) )
type hub struct { type hub struct {

2
pkg/api/live/stream_manager.go
Unescape View File

@ -6,7 +6,7 @@ import (
"sync" "sync"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )

2
pkg/api/login.go
Unescape View File

@ -7,8 +7,8 @@ import (
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/login" "github.com/grafana/grafana/pkg/login"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"

2
pkg/api/login_oauth.go
Unescape View File

@ -16,8 +16,8 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/login" "github.com/grafana/grafana/pkg/login"
"github.com/grafana/grafana/pkg/login/social" "github.com/grafana/grafana/pkg/login/social"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"

2
pkg/api/playlist.go
Unescape View File

@ -2,7 +2,7 @@ package api
import ( import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
_ "github.com/grafana/grafana/pkg/log" _ "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )

2
pkg/api/playlist_play.go
Unescape View File

@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
_ "github.com/grafana/grafana/pkg/log" _ "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/search" "github.com/grafana/grafana/pkg/services/search"
) )

2
pkg/api/pluginproxy/ds_proxy.go
Unescape View File

@ -17,7 +17,7 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/login/social" "github.com/grafana/grafana/pkg/login/social"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"

2
pkg/api/pluginproxy/ds_proxy_test.go
Unescape View File

@ -17,7 +17,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/login/social" "github.com/grafana/grafana/pkg/login/social"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"

2
pkg/api/pluginproxy/pluginproxy.go
Unescape View File

@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins" "github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"

2
pkg/cmd/grafana-server/main.go
Unescape View File

@ -14,8 +14,8 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/extensions" "github.com/grafana/grafana/pkg/extensions"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
_ "github.com/grafana/grafana/pkg/services/alerting/conditions" _ "github.com/grafana/grafana/pkg/services/alerting/conditions"
_ "github.com/grafana/grafana/pkg/services/alerting/notifiers" _ "github.com/grafana/grafana/pkg/services/alerting/notifiers"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/cmd/grafana-server/server.go
Unescape View File

@ -18,12 +18,12 @@ import (
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
_ "github.com/grafana/grafana/pkg/extensions" _ "github.com/grafana/grafana/pkg/extensions"
"github.com/grafana/grafana/pkg/infra/log"
_ "github.com/grafana/grafana/pkg/infra/metrics" _ "github.com/grafana/grafana/pkg/infra/metrics"
_ "github.com/grafana/grafana/pkg/infra/remotecache" _ "github.com/grafana/grafana/pkg/infra/remotecache"
_ "github.com/grafana/grafana/pkg/infra/serverlock" _ "github.com/grafana/grafana/pkg/infra/serverlock"
_ "github.com/grafana/grafana/pkg/infra/tracing" _ "github.com/grafana/grafana/pkg/infra/tracing"
_ "github.com/grafana/grafana/pkg/infra/usagestats" _ "github.com/grafana/grafana/pkg/infra/usagestats"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/login" "github.com/grafana/grafana/pkg/login"
"github.com/grafana/grafana/pkg/login/social" "github.com/grafana/grafana/pkg/login/social"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"

2
pkg/components/imguploader/azureblobuploader.go
Unescape View File

@ -20,7 +20,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )

2
pkg/components/imguploader/gcsuploader.go
Unescape View File

@ -8,7 +8,7 @@ import (
"os" "os"
"path" "path"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
"golang.org/x/oauth2/google" "golang.org/x/oauth2/google"
) )

2
pkg/components/imguploader/imguploader.go
Unescape View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"regexp" "regexp"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/components/imguploader/s3uploader.go
Unescape View File

@ -15,7 +15,7 @@ import (
"github.com/aws/aws-sdk-go/aws/endpoints" "github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )

2
pkg/components/securejsondata/securejsondata.go
Unescape View File

@ -1,7 +1,7 @@
package securejsondata package securejsondata
import ( import (
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )

0
pkg/log/file.go → pkg/infra/log/file.go
Unescape View File

0
pkg/log/file_test.go → pkg/infra/log/file_test.go
Unescape View File

0
pkg/log/handlers.go → pkg/infra/log/handlers.go
Unescape View File

0
pkg/log/interface.go → pkg/infra/log/interface.go
Unescape View File

0
pkg/log/log.go → pkg/infra/log/log.go
Unescape View File

0
pkg/log/log_writer.go → pkg/infra/log/log_writer.go
Unescape View File

0
pkg/log/log_writer_test.go → pkg/infra/log/log_writer_test.go
Unescape View File

0
pkg/log/syslog.go → pkg/infra/log/syslog.go
Unescape View File

0
pkg/log/syslog_windows.go → pkg/infra/log/syslog_windows.go
Unescape View File

2
pkg/infra/metrics/service.go
Unescape View File

@ -3,8 +3,8 @@ package metrics
import ( import (
"context" "context"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics/graphitebridge" "github.com/grafana/grafana/pkg/infra/metrics/graphitebridge"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/infra/remotecache/database_storage.go vendored
Unescape View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
) )

2
pkg/infra/remotecache/database_storage_test.go vendored
Unescape View File

@ -4,7 +4,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
pkg/infra/remotecache/remotecache.go vendored
Unescape View File

@ -7,7 +7,7 @@ import (
"errors" "errors"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/infra/serverlock/serverlock.go
Unescape View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
) )

2
pkg/infra/serverlock/serverlock_test.go
Unescape View File

@ -4,7 +4,7 @@ import (
"context" "context"
"testing" "testing"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
) )

2
pkg/infra/tracing/tracing.go
Unescape View File

@ -5,7 +5,7 @@ import (
"io" "io"
"strings" "strings"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/infra/usagestats/service.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/grafana/grafana/pkg/login/social" "github.com/grafana/grafana/pkg/login/social"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/login/social/common.go
Unescape View File

@ -6,7 +6,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
) )
type HttpGetResponse struct { type HttpGetResponse struct {

2
pkg/login/social/social.go
Unescape View File

@ -8,7 +8,7 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"
) )

2
pkg/middleware/middleware.go
Unescape View File

@ -9,8 +9,8 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/apikeygen" "github.com/grafana/grafana/pkg/components/apikeygen"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/remotecache" "github.com/grafana/grafana/pkg/infra/remotecache"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"

2
pkg/middleware/recovery.go
Unescape View File

@ -23,7 +23,7 @@ import (
"gopkg.in/macaron.v1" "gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/models/context.go
Unescape View File

@ -3,7 +3,7 @@ package models
import ( import (
"strings" "strings"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"gopkg.in/macaron.v1" "gopkg.in/macaron.v1"

2
pkg/plugins/datasource/wrapper/datasource_plugin_wrapper.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/grafana/grafana-plugin-model/go/datasource" "github.com/grafana/grafana-plugin-model/go/datasource"
"github.com/grafana/grafana/pkg/components/null" "github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
) )

2
pkg/plugins/datasource/wrapper/datasource_plugin_wrapper_test.go
Unescape View File

@ -4,7 +4,7 @@ import (
"testing" "testing"
"github.com/grafana/grafana-plugin-model/go/datasource" "github.com/grafana/grafana-plugin-model/go/datasource"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"
) )

2
pkg/plugins/datasource_plugin.go
Unescape View File

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/grafana/grafana-plugin-model/go/datasource" "github.com/grafana/grafana-plugin-model/go/datasource"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins/datasource/wrapper" "github.com/grafana/grafana/pkg/plugins/datasource/wrapper"
"github.com/grafana/grafana/pkg/tsdb" "github.com/grafana/grafana/pkg/tsdb"

2
pkg/plugins/hclog-wrapper.go
Unescape View File

@ -5,7 +5,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
glog "github.com/grafana/grafana/pkg/log" glog "github.com/grafana/grafana/pkg/infra/log"
hclog "github.com/hashicorp/go-hclog" hclog "github.com/hashicorp/go-hclog"
) )

2
pkg/plugins/plugins.go
Unescape View File

@ -13,7 +13,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"

2
pkg/plugins/update_checker.go
Unescape View File

@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/hashicorp/go-version" "github.com/hashicorp/go-version"
) )

2
pkg/services/alerting/engine.go
Unescape View File

@ -10,7 +10,7 @@ import (
tlog "github.com/opentracing/opentracing-go/log" tlog "github.com/opentracing/opentracing-go/log"
"github.com/benbjohnson/clock" "github.com/benbjohnson/clock"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/alerting/eval_context.go
Unescape View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/services/alerting/eval_handler.go
Unescape View File

@ -5,8 +5,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
) )
type DefaultEvalHandler struct { type DefaultEvalHandler struct {

2
pkg/services/alerting/extractor.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )

2
pkg/services/alerting/notifier.go
Unescape View File

@ -6,8 +6,8 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/imguploader" "github.com/grafana/grafana/pkg/components/imguploader"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/alerting/notifiers/alertmanager.go
Unescape View File

@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/alertmanager_test.go
Unescape View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"

2
pkg/services/alerting/notifiers/base.go
Unescape View File

@ -4,7 +4,7 @@ import (
"context" "context"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/dingding.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/discord.go
Unescape View File

@ -10,7 +10,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/alerting/notifiers/email.go
Unescape View File

@ -5,7 +5,7 @@ import (
"strings" "strings"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/alerting/notifiers/googlechat.go
Unescape View File

@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/alerting/notifiers/hipchat.go
Unescape View File

@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/kafka.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/line.go
Unescape View File

@ -5,7 +5,7 @@ import (
"net/url" "net/url"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/opsgenie.go
Unescape View File

@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/pagerduty.go
Unescape View File

@ -9,7 +9,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/pushover.go
Unescape View File

@ -9,7 +9,7 @@ import (
"strconv" "strconv"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/sensu.go
Unescape View File

@ -6,7 +6,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/slack.go
Unescape View File

@ -10,7 +10,7 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/alerting/notifiers/teams.go
Unescape View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/telegram.go
Unescape View File

@ -8,7 +8,7 @@ import (
"os" "os"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/threema.go
Unescape View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/notifiers/victorops.go
Unescape View File

@ -5,7 +5,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/alerting/notifiers/webhook.go
Unescape View File

@ -3,7 +3,7 @@ package notifiers
import ( import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting" "github.com/grafana/grafana/pkg/services/alerting"
) )

2
pkg/services/alerting/reader.go
Unescape View File

@ -5,8 +5,8 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )

2
pkg/services/alerting/result_handler.go
Unescape View File

@ -5,8 +5,8 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/metrics" "github.com/grafana/grafana/pkg/infra/metrics"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/annotations" "github.com/grafana/grafana/pkg/services/annotations"
"github.com/grafana/grafana/pkg/services/rendering" "github.com/grafana/grafana/pkg/services/rendering"

2
pkg/services/alerting/scheduler.go
Unescape View File

@ -4,7 +4,7 @@ import (
"math" "math"
"time" "time"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
) )

2
pkg/services/alerting/test_notification.go
Unescape View File

@ -7,7 +7,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/null" "github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )

2
pkg/services/auth/auth_token.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/grafana/grafana/pkg/infra/serverlock" "github.com/grafana/grafana/pkg/infra/serverlock"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"

2
pkg/services/auth/auth_token_test.go
Unescape View File

@ -9,7 +9,7 @@ import (
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"

2
pkg/services/cleanup/cleanup.go
Unescape View File

@ -8,8 +8,8 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/serverlock" "github.com/grafana/grafana/pkg/infra/serverlock"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/dashboards/dashboard_service.go
Unescape View File

@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/guardian" "github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/util" "github.com/grafana/grafana/pkg/util"

2
pkg/services/guardian/guardian.go
Unescape View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/services/ldap/ldap.go
Unescape View File

@ -12,7 +12,7 @@ import (
LDAP "gopkg.in/ldap.v3" LDAP "gopkg.in/ldap.v3"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
models "github.com/grafana/grafana/pkg/models" models "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/services/ldap/ldap_login_test.go
Unescape View File

@ -6,7 +6,7 @@ import (
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"gopkg.in/ldap.v3" "gopkg.in/ldap.v3"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
) )
func TestLdapLogin(t *testing.T) { func TestLdapLogin(t *testing.T) {

2
pkg/services/ldap/ldap_test.go
Unescape View File

@ -8,7 +8,7 @@ import (
"gopkg.in/ldap.v3" "gopkg.in/ldap.v3"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
) )

2
pkg/services/ldap/settings.go
Unescape View File

@ -8,7 +8,7 @@ import (
"github.com/grafana/grafana/pkg/util/errutil" "github.com/grafana/grafana/pkg/util/errutil"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )

2
pkg/services/login/login.go
Unescape View File

@ -2,7 +2,7 @@ package login
import ( import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/quota" "github.com/grafana/grafana/pkg/services/quota"

2
pkg/services/notifications/notifications.go
Unescape View File

@ -11,7 +11,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/events" "github.com/grafana/grafana/pkg/events"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/registry" "github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"

2
pkg/services/provisioning/dashboards/config_reader.go
Unescape View File

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
) )

2
pkg/services/provisioning/dashboards/config_reader_test.go
Unescape View File

@ -4,7 +4,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
) )

2
pkg/services/provisioning/dashboards/dashboard.go
Unescape View File

@ -3,7 +3,7 @@ package dashboards
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
pkg/services/provisioning/dashboards/file_reader.go
Unescape View File

@ -16,7 +16,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
) )

2
pkg/services/provisioning/dashboards/file_reader_linux_test.go
Unescape View File

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
) )
var ( var (

2
pkg/services/provisioning/dashboards/file_reader_test.go
Unescape View File

@ -13,7 +13,7 @@ import (
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/dashboards" "github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
) )

2
pkg/services/provisioning/datasources/config_reader.go
Unescape View File

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

2
pkg/services/provisioning/datasources/config_reader_test.go
Unescape View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"

2
pkg/services/provisioning/datasources/datasources.go
Unescape View File

@ -5,7 +5,7 @@ import (
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
) )

2
pkg/services/provisioning/datasources/types.go
Unescape View File

@ -2,7 +2,7 @@ package datasources
import ( import (
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/provisioning/values" "github.com/grafana/grafana/pkg/services/provisioning/values"
) )

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save