go.d/python.d respect all netdata log levels (#17587)
Ilya Mashchenko committed
May 3, 2024 at 14:32 UTC
f7a464a4f899291e0445ff6c5e671dc5301c0078
3 files changed
+11
-3
src/collectors/python.d.plugin/python.d.plugin.in
+3
-1
@@ -895,10 +895,12 @@ def main():
895
log.logger.severity = 'DEBUG'
896
elif level == 'info':
897
log.logger.severity = 'INFO'
898
- elif level == 'warn' or level == 'warning':
898
+ elif level == 'warn' or level == 'warning' or level == 'notice':
899
log.logger.severity = 'WARNING'
900
elif level == 'err' or level == 'error':
901
log.logger.severity = 'ERROR'
902
+ elif level == 'emergency' or level == 'alert' or level == 'critical':
903
+ log.logger.severity = 'DISABLE'
904
905
if cmd.debug:
906
log.logger.severity = 'DEBUG'
src/collectors/python.d.plugin/python_modules/bases/loggers.py
+1
-1
@@ -18,7 +18,7 @@ except ImportError:
18
from bases.collection import on_try_except_finally, unicode_str
19
20
LOGGING_LEVELS = {
21
- 'CRITICAL': 50,
21
+ 'DISABLE': 99,
22
'ERROR': 40,
23
'WARNING': 30,
24
'INFO': 20,
src/go/collectors/go.d.plugin/logger/level.go
+7
-1
@@ -7,7 +7,10 @@ import (
7
"strings"
8
)
9
10
-const levelNotice = slog.Level(2)
10
+const (
11
+ levelNotice = slog.Level(2)
12
+ levelDisable = slog.Level(99)
13
+)
14
15
var (
16
customLevels = map[slog.Leveler]string{
@@ -33,6 +36,7 @@ func (l *level) Set(level slog.Level) {
36
}
37
38
func (l *level) SetByName(level string) {
39
+ // https://github.com/netdata/netdata/tree/master/src/libnetdata/log#log-levels
40
switch strings.ToLower(level) {
41
case "err", "error":
42
l.lvl.Set(slog.LevelError)
@@ -44,5 +48,7 @@ func (l *level) SetByName(level string) {
48
l.lvl.Set(slog.LevelInfo)
49
case "debug":
50
l.lvl.Set(slog.LevelDebug)
51
+ case "emergency", "alert", "critical":
52
+ l.lvl.Set(levelDisable)
53
}
54
}