public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dataproxy.go
+5 -5
View File
@@ -125,15 +125,15 @@ func ProxyDataSourceRequest(c *middleware.Context) {
return
}
auditLog(ds.Type, c)
proxyLog(ds.Type, c)
proxy.ServeHTTP(c.Resp, c.Req.Request)
c.Resp.Header().Del("Set-Cookie")
}
func auditLog(dataSourceType string, c *middleware.Context) {
if setting.AuditLogging {
auditLogger := log.New("data-proxy-audit", "userid", c.UserId, "orgid", c.OrgId, "username", c.Login)
func proxyLog(dataSourceType string, c *middleware.Context) {
if setting.DataProxyLogging {
auditLogger := log.New("data-proxy-log", "userid", c.UserId, "orgid", c.OrgId, "username", c.Login)
var body string
if c.Req.Request.Body != nil {
@@ -142,6 +142,6 @@ func auditLog(dataSourceType string, c *middleware.Context) {
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)
}
}