policyfilter fix

cmd/tetra/policyfilter/policyfilter.go

@@ -4,6 +4,7 @@
 package policyfilter
 
 import (
+	"fmt"
 	"path/filepath"
 	"strconv"
 
@@ -26,11 +27,32 @@ func New() *cobra.Command {
 	ret.AddCommand(
 		dumpCmd(),
 		addCommand(),
+		cgroupGetIDCommand(),
 	)
 
 	return ret
 }
 
+func cgroupGetIDCommand() *cobra.Command {
+	mapFname := filepath.Join(defaults.DefaultMapRoot, defaults.DefaultMapPrefix, policyfilter.MapName)
+	ret := &cobra.Command{
+		Use:   "cgroupid",
+		Short: "retrieve cgroup id from file",
+		Args:  cobra.ExactArgs(1),
+		Run: func(_ *cobra.Command, args []string) {
+			cgID, err := cgroups.GetCgroupIdFromPath(args[0])
+			if err != nil {
+				logger.GetLogger().WithError(err).Fatal("Failed to parse cgroup")
+			}
+			fmt.Printf("%d\n", cgID)
+		},
+	}
+
+	flags := ret.Flags()
+	flags.StringVar(&mapFname, "map-fname", mapFname, "policyfilter map filename")
+	return ret
+}
+
 func dumpCmd() *cobra.Command {
 	mapFname := filepath.Join(defaults.DefaultMapRoot, defaults.DefaultMapPrefix, policyfilter.MapName)
 	ret := &cobra.Command{

pkg/cgroups/fsscan/fsscan.go

@@ -151,6 +151,10 @@ func findContainerDirectory(podpath string, containerID string) string {
 		}
 
 		name := dentry.Name()
+		// skip crio's conmon container
+		if strings.Contains(name, "crio-conmon") {
+			continue
+		}
 		if strings.Contains(name, containerID) {
 			return name
 		}