Skip to content

N
nexpie-grafana-theme
Commit 182e079d by Torkel Ödegaard
Options

Merge branch 'master' into cloudwatch

parents 3d520957 318af9b4
Showing with 17 additions and 8 deletions
.gitignore
...@@ -31,3 +31,4 @@ conf/custom.ini ...@@ -31,3 +31,4 @@ conf/custom.ini
fig.yml fig.yml
profile.cov profile.cov
grafana grafana
.notouch
conf/defaults.ini
...@@ -224,6 +224,8 @@ level = Info ...@@ -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]
......
docs/mkdocs.yml
...@@ -25,13 +25,16 @@ google_analytics: ['UA-47280256-1', 'grafana.org'] ...@@ -25,13 +25,16 @@ google_analytics: ['UA-47280256-1', 'grafana.org']
pages: pages:
# Introduction: # Introduction:
- ['index.md', 'About', 'Grafana'] - ['index.md', 'Project', 'About Grafana']
- ['project/cla.md', 'Project', 'Contributor License Agreement']
- ['installation/index.md', 'Installation', 'Installation'] - ['installation/index.md', 'Installation', 'Installation']
- ['installation/debian.md', 'Installation', 'Installing on Debian / Ubuntu'] - ['installation/debian.md', 'Installation', 'Installing on Debian / Ubuntu']
- ['installation/rpm.md', 'Installation', 'Installing on RPM-based Linux'] - ['installation/rpm.md', 'Installation', 'Installing on RPM-based Linux']
- ['installation/mac.md', 'Installation', 'Installing on Mac OS X'] - ['installation/mac.md', 'Installation', 'Installing on Mac OS X']
- ['installation/windows.md', 'Installation', 'Installing on Windows'] - ['installation/windows.md', 'Installation', 'Installing on Windows']
- ['installation/docker.md', 'Installation', 'Installing on Docker'] - ['installation/docker.md', 'Installation', 'Installing on Docker']
- ['project/building_from_source.md', 'Installation', 'Building from Source']
- ['installation/configuration.md', 'Installation', 'Configuration'] - ['installation/configuration.md', 'Installation', 'Configuration']
- ['installation/ldap.md', 'Installation', 'LDAP Integration'] - ['installation/ldap.md', 'Installation', 'LDAP Integration']
...@@ -70,7 +73,4 @@ pages: ...@@ -70,7 +73,4 @@ pages:
- ['tutorials/index.md', 'Tutorials', 'Tutorials'] - ['tutorials/index.md', 'Tutorials', 'Tutorials']
- ['tutorials/hubot_howto.md', 'Tutorials', 'How To integrate Hubot and Grafana'] - ['tutorials/hubot_howto.md', 'Tutorials', 'How To integrate Hubot and Grafana']
- ['project/building_from_source.md', 'Project', 'Building from Source']
- ['project/cla.md', 'Project', 'Contributor License Agreement']
- ['jsearch.md', '**HIDDEN**'] - ['jsearch.md', '**HIDDEN**']
pkg/log/console.go
...@@ -47,6 +47,7 @@ var ( ...@@ -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 { ...@@ -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 { ...@@ -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 { ...@@ -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) { ...@@ -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)
......
public/app/plugins/datasource/elasticsearch/query_def.js
...@@ -36,7 +36,7 @@ function (_) { ...@@ -36,7 +36,7 @@ function (_) {
{text: "No limit", value: '0' }, {text: "No limit", value: '0' },
{text: "1", value: '1' }, {text: "1", value: '1' },
{text: "2", value: '2' }, {text: "2", value: '2' },
{text: "3", value: '4' }, {text: "3", value: '3' },
{text: "5", value: '5' }, {text: "5", value: '5' },
{text: "10", value: '10' }, {text: "10", value: '10' },
{text: "15", value: '15' }, {text: "15", value: '15' },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment