IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 18:30:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename to audit logging to data proxy logging

Browse Source
This commit is contained in:
Ricky Niemi 2017-01-11 07:40:06 -08:00
parent 0fee7c863a
commit 269d16301a
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/defaults.ini
View File

@ -47,8 +47,8 @@ root_url = %(protocol)s://%(domain)s:%(http_port)s/
# Log web requests # Log web requests
router_logging = false router_logging = false
# This enables query request audit logging, output at warn level, default is false # This enables data proxy logging, default is false
audit_logging = false data_proxy_logging = false
# the path relative working path # the path relative working path
static_root_path = public static_root_path = public

2
conf/sample.ini
View File

@ -50,7 +50,7 @@
;router_logging = false ;router_logging = false
# This enables query request audit logging, output at warn level, default is false # This enables query request audit logging, output at warn level, default is false
audit_logging = false ;data_proxy_logging = false
# the path relative working path # the path relative working path
;static_root_path = public ;static_root_path = public

2
docs/sources/http_api/admin.md
View File

@ -143,7 +143,7 @@ with Grafana admin permission.
"protocol":"http", "protocol":"http",
"root_url":"%(protocol)s://%(domain)s:%(http_port)s/", "root_url":"%(protocol)s://%(domain)s:%(http_port)s/",
"router_logging":"true", "router_logging":"true",
"audit_logging":"true", "data_proxy_logging":"true",
"static_root_path":"public" "static_root_path":"public"
}, },
"session":{ "session":{

10
pkg/api/dataproxy.go
View File

@ -125,15 +125,15 @@ func ProxyDataSourceRequest(c *middleware.Context) {
return return
} }
auditLog(ds.Type, c) proxyLog(ds.Type, c)
proxy.ServeHTTP(c.Resp, c.Req.Request) proxy.ServeHTTP(c.Resp, c.Req.Request)
c.Resp.Header().Del("Set-Cookie") c.Resp.Header().Del("Set-Cookie")
} }
func auditLog(dataSourceType string, c *middleware.Context) { func proxyLog(dataSourceType string, c *middleware.Context) {
if setting.AuditLogging { if setting.DataProxyLogging {
auditLogger := log.New("data-proxy-audit", "userid", c.UserId, "orgid", c.OrgId, "username", c.Login) auditLogger := log.New("data-proxy-log", "userid", c.UserId, "orgid", c.OrgId, "username", c.Login)
var body string var body string
if c.Req.Request.Body != nil { if c.Req.Request.Body != nil {
@ -142,6 +142,6 @@ func auditLog(dataSourceType string, c *middleware.Context) {
body = string(buffer) body = string(buffer)
} }
auditLogger.Warn("Proxying incoming request", "datasource", dataSourceType, "uri", c.Req.RequestURI, "method", c.Req.Request.Method, "body", body) auditLogger.Info("Proxying incoming request", "datasource", dataSourceType, "uri", c.Req.RequestURI, "method", c.Req.Request.Method, "body", body)
} }
} }

4
pkg/setting/setting.go
View File

@ -65,7 +65,7 @@ var (
SshPort int SshPort int
CertFile, KeyFile string CertFile, KeyFile string
RouterLogging bool RouterLogging bool
AuditLogging bool DataProxyLogging bool
StaticRootPath string StaticRootPath string
EnableGzip bool EnableGzip bool
EnforceDomain bool EnforceDomain bool
@ -491,7 +491,7 @@ func NewConfigContext(args *CommandLineArgs) error {
HttpAddr = server.Key("http_addr").MustString(DEFAULT_HTTP_ADDR) HttpAddr = server.Key("http_addr").MustString(DEFAULT_HTTP_ADDR)
HttpPort = server.Key("http_port").MustString("3000") HttpPort = server.Key("http_port").MustString("3000")
RouterLogging = server.Key("router_logging").MustBool(false) RouterLogging = server.Key("router_logging").MustBool(false)
AuditLogging = server.Key("audit_logging").MustBool(false) DataProxyLogging = server.Key("data_proxy_logging").MustBool(false)
EnableGzip = server.Key("enable_gzip").MustBool(false) EnableGzip = server.Key("enable_gzip").MustBool(false)
EnforceDomain = server.Key("enforce_domain").MustBool(false) EnforceDomain = server.Key("enforce_domain").MustBool(false)
StaticRootPath = makeAbsolute(server.Key("static_root_path").String(), HomePath) StaticRootPath = makeAbsolute(server.Key("static_root_path").String(), HomePath)