resmgr: use better container names in dumps.

Use PrettyName()-compatible container name dumps together with container IDs in NRI evnet dumps. Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
containers · Sep 20, 2024 · daafb63 · daafb63
1 parent 542fe43
commit daafb63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkg/resmgr/cache/pod.go b/pkg/resmgr/cache/pod.go
@@ -93,12 +93,9 @@ func (p *pod) PrettyName() string {
 	}
 
 	namespace := p.GetNamespace()
-	switch namespace {
-	case "default":
-		p.prettyName = ""
-	case "":
+	if namespace == "" {
 		p.prettyName = "<unknown-namespace>/"
-	default:
+	} else {
 		p.prettyName = namespace + "/"
 	}
 

diff --git a/pkg/resmgr/nri.go b/pkg/resmgr/nri.go
@@ -671,7 +671,8 @@ func (p *nriPlugin) dump(dir, event string, args ...interface{}) {
 				return
 			}
 
-			p.Info("%s %s %s/%s:%s", dir, event, pod.GetNamespace(), pod.GetName(), ctr.GetName())
+			p.Info("%s %s %s/%s/%s (%s)", dir, event,
+				pod.GetNamespace(), pod.GetName(), ctr.GetName(), ctr.GetId())
 			p.dumpDetails(dir, event, ctr)
 		} else {
 			if len(args) < 1 {
@@ -723,7 +724,8 @@ func (p *nriPlugin) dump(dir, event string, args ...interface{}) {
 				return
 			}
 
-			p.Info("%s %s %s/%s:%s", dir, event, pod.GetNamespace(), pod.GetName(), ctr.GetName())
+			p.Info("%s %s %s/%s/%s (%s)", dir, event,
+				pod.GetNamespace(), pod.GetName(), ctr.GetName(), ctr.GetId())
 			p.dumpDetails(dir, event, ctr)
 			p.dumpDetails(dir, event, res)
 		} else {