From df4e23c3cfb09ffdc491cb105ccb6cefef92d1c8 Mon Sep 17 00:00:00 2001
From: Tudor Golubenco <tudor@elastic.co>
Date: Wed, 31 Jan 2018 15:30:32 +0100
Subject: [PATCH] Logging fixes for verbosity (#6240)

* Add a check for the `verbose` flag, before going back to Info.
* Revert to using `warning` in the configuration instead of `warn`. It seems that
  we have always used `warning`.

Fixes #6239.
---
 libbeat/logp/config.go            | 2 +-
 libbeat/logp/configure/logging.go | 2 +-
 libbeat/logp/core_test.go         | 4 ++--
 libbeat/logp/level.go             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libbeat/logp/config.go b/libbeat/logp/config.go
index 3fa08b8ebbeb..d2617c76813c 100644
--- a/libbeat/logp/config.go
+++ b/libbeat/logp/config.go
@@ -5,7 +5,7 @@ package logp
 type Config struct {
 	Beat      string   `config:",ignore"`   // Name of the Beat (for default file name).
 	JSON      bool     `config:"json"`      // Write logs as JSON.
-	Level     Level    `config:"level"`     // Logging level (error, warn, info, debug).
+	Level     Level    `config:"level"`     // Logging level (error, warning, info, debug).
 	Selectors []string `config:"selectors"` // Selectors for debug level logging.
 
 	toObserver  bool
diff --git a/libbeat/logp/configure/logging.go b/libbeat/logp/configure/logging.go
index d99762201c05..a1699b8b4d2c 100644
--- a/libbeat/logp/configure/logging.go
+++ b/libbeat/logp/configure/logging.go
@@ -40,7 +40,7 @@ func applyFlags(cfg *logp.Config) {
 	if toStderr {
 		cfg.ToStderr = true
 	}
-	if cfg.Level > logp.InfoLevel {
+	if cfg.Level > logp.InfoLevel && verbose {
 		cfg.Level = logp.InfoLevel
 	}
 	for _, selectors := range debugSelectors {
diff --git a/libbeat/logp/core_test.go b/libbeat/logp/core_test.go
index 3e2950e15235..111a290f8817 100644
--- a/libbeat/logp/core_test.go
+++ b/libbeat/logp/core_test.go
@@ -81,12 +81,12 @@ func TestGlobalLoggerLevel(t *testing.T) {
 		assert.Equal(t, "info", logs[0].Message)
 	}
 
-	Warn("warn")
+	Warn("warning")
 	logs = ObserverLogs().TakeAll()
 	if assert.Len(t, logs, 1) {
 		assert.Equal(t, zap.WarnLevel, logs[0].Level)
 		assert.Equal(t, "", logs[0].LoggerName)
-		assert.Equal(t, "warn", logs[0].Message)
+		assert.Equal(t, "warning", logs[0].Message)
 	}
 
 	Err("error")
diff --git a/libbeat/logp/level.go b/libbeat/logp/level.go
index 492e804ac476..56fc8db6201d 100644
--- a/libbeat/logp/level.go
+++ b/libbeat/logp/level.go
@@ -24,7 +24,7 @@ const (
 var levelStrings = map[Level]string{
 	DebugLevel:    "debug",
 	InfoLevel:     "info",
-	WarnLevel:     "warn",
+	WarnLevel:     "warning",
 	ErrorLevel:    "error",
 	CriticalLevel: "critical",
 }