osbase/logtree.LeveledLogger -> go/logging.Leveled
This factors out the common leveled logger interface out of the logtree.
We want to use the same interface outside of logtree/supervisor usage
within the resolver code, which will be exposed to clients.
Change-Id: I299e76d91e8cefddf8f36f1e58432418c4694df2
Reviewed-on: https://review.monogon.dev/c/monogon/+/3411
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/node/core/main.go b/metropolis/node/core/main.go
index eba6773..e675f87 100644
--- a/metropolis/node/core/main.go
+++ b/metropolis/node/core/main.go
@@ -25,6 +25,7 @@
"golang.org/x/sys/unix"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/metropolis/node/core/cluster"
"source.monogon.dev/metropolis/node/core/devmgr"
"source.monogon.dev/metropolis/node/core/localstorage"
@@ -302,23 +303,23 @@
}
s := string(p.DN)
if strings.HasPrefix(s, "root.role.controlplane.launcher.consensus.etcd") {
- return p.Leveled.Severity().AtLeast(logtree.WARNING)
+ return p.Leveled.Severity().AtLeast(logging.WARNING)
}
// TODO(q3k): turn off RPC traces instead
if strings.HasPrefix(s, "root.role.controlplane.launcher.curator.listener.rpc") {
return false
}
if strings.HasPrefix(s, "root.role.kubernetes.run.kubernetes.networked.kubelet") {
- return p.Leveled.Severity().AtLeast(logtree.WARNING)
+ return p.Leveled.Severity().AtLeast(logging.WARNING)
}
if strings.HasPrefix(s, "root.role.kubernetes.run.kubernetes.networked.apiserver") {
- return p.Leveled.Severity().AtLeast(logtree.WARNING)
+ return p.Leveled.Severity().AtLeast(logging.WARNING)
}
if strings.HasPrefix(s, "root.role.kubernetes.run.kubernetes.controller-manager") {
- return p.Leveled.Severity().AtLeast(logtree.WARNING)
+ return p.Leveled.Severity().AtLeast(logging.WARNING)
}
if strings.HasPrefix(s, "root.role.kubernetes.run.kubernetes.scheduler") {
- return p.Leveled.Severity().AtLeast(logtree.WARNING)
+ return p.Leveled.Severity().AtLeast(logging.WARNING)
}
if strings.HasPrefix(s, "root.kernel") {
// Linux writes high-severity logs directly to the console anyways and
@@ -326,7 +327,7 @@
return false
}
if strings.HasPrefix(s, "supervisor") {
- return p.Leveled.Severity().AtLeast(logtree.WARNING)
+ return p.Leveled.Severity().AtLeast(logging.WARNING)
}
return true
}