Add config option to strip (most) colors from console logs

conf/defaults.ini

@@ -224,6 +224,8 @@ level = Info
 # For "console" mode only
 # For "console" mode only
 [log.console]
 [log.console]
 level =
 level =
+# Set formatting to "false" to disable color formatting of console logs
+formatting = true
 
 
 # For "file" mode only
 # For "file" mode only
 [log.file]
 [log.file]

pkg/log/console.go

@@ -47,6 +47,7 @@ var (
 type ConsoleWriter struct {
 type ConsoleWriter struct {
 	lg         *log.Logger
 	lg         *log.Logger
 	Level      int  `json:"level"`
 	Level      int  `json:"level"`
+	Formatting bool `json:"formatting"`
 }
 }
 
 
 // create ConsoleWriter returning as LoggerInterface.
 // create ConsoleWriter returning as LoggerInterface.
@@ -54,6 +55,7 @@ func NewConsole() LoggerInterface {
 	return &ConsoleWriter{
 	return &ConsoleWriter{
 		lg:         log.New(os.Stderr, "", log.Ldate|log.Ltime),
 		lg:         log.New(os.Stderr, "", log.Ldate|log.Ltime),
 		Level:      TRACE,
 		Level:      TRACE,
+		Formatting: true,
 	}
 	}
 }
 }
 
 
@@ -65,7 +67,7 @@ func (cw *ConsoleWriter) WriteMsg(msg string, skip, level int) error {
 	if cw.Level > level {
 	if cw.Level > level {
 		return nil
 		return nil
 	}
 	}
-	if runtime.GOOS == "windows" {
+	if runtime.GOOS == "windows" || !cw.Formatting {
 		cw.lg.Println(msg)
 		cw.lg.Println(msg)
 	} else {
 	} else {
 		cw.lg.Println(colors[level](msg))
 		cw.lg.Println(colors[level](msg))

pkg/setting/setting.go

@@ -140,7 +140,7 @@ type CommandLineArgs struct {
 
 
 func init() {
 func init() {
 	IsWindows = runtime.GOOS == "windows"
 	IsWindows = runtime.GOOS == "windows"
-	log.NewLogger(0, "console", `{"level": 0}`)
+	log.NewLogger(0, "console", `{"level": 0, "formatting":true}`)
 }
 }
 
 
 func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
 func parseAppUrlAndSubUrl(section *ini.Section) (string, string) {
@@ -527,7 +527,11 @@ func initLogging(args *CommandLineArgs) {
 		// Generate log configuration.
 		// Generate log configuration.
 		switch mode {
 		switch mode {
 		case "console":
 		case "console":
-			LogConfigs[i] = util.DynMap{"level": level}
+			formatting := sec.Key("formatting").MustBool(true)
+			LogConfigs[i] = util.DynMap{
+				"level":      level,
+				"formatting": formatting,
+			}
 		case "file":
 		case "file":
 			logPath := sec.Key("file_name").MustString(filepath.Join(LogsPath, "grafana.log"))
 			logPath := sec.Key("file_name").MustString(filepath.Join(LogsPath, "grafana.log"))
 			os.MkdirAll(filepath.Dir(logPath), os.ModePerm)
 			os.MkdirAll(filepath.Dir(logPath), os.ModePerm)