flag(stores): new flag format

cmd/tracee-ebpf/main.go

@@ -86,15 +86,9 @@ func main() {
 				Usage:   "control how and where output is printed. run '--output help' for more info.",
 			},
 			&cli.StringSliceFlag{
-				Name:    "proctree",
-				Aliases: []string{"t"},
-				Value:   cli.NewStringSlice("none"),
-				Usage:   "process tree options. run '--proctree help' for more info.",
-			},
-			&cli.StringSliceFlag{
-				Name:  "dnscache",
-				Value: cli.NewStringSlice("none"),
-				Usage: "dns cache options. run '--dnscache help' for more info",
+				Name:  "stores",
+				Value: cli.NewStringSlice(),
+				Usage: "stores configurations. run '--stores help' for more info",
 			},
 			&cli.StringSliceFlag{
 				Name:  flags.ContainersFlag,

cmd/tracee/cmd/root.go

@@ -218,27 +218,15 @@
 		return errfmt.WrapError(err)
 	}
 
-	// Process Tree flags
-
-	rootCmd.Flags().StringArrayP(
-		"proctree",
-		"t",
-		[]string{"source=none"},
-		"[source=[events|signals|both]...]\tControl process tree options",
-	)
-	err = viper.BindPFlag("proctree", rootCmd.Flags().Lookup("proctree"))
-	if err != nil {
-		return errfmt.WrapError(err)
-	}
-
-	// DNS Cache flags
+	// Stores flags
 
+	// TODO: extract flags
 	rootCmd.Flags().StringArray(
-		"dnscache",
-		[]string{"none"},
-		"\t\t\t\t\tEnable DNS Cache",
+		"stores",
+		[]string{""},
+		"\t\t\t\t\tStores configurations",
 	)
-	err = viper.BindPFlag("dnscache", rootCmd.Flags().Lookup("dnscache"))
+	err = viper.BindPFlag("stores", rootCmd.Flags().Lookup("stores"))
 	if err != nil {
 		return errfmt.WrapError(err)
 	}

pkg/cmd/cobra/cobra.go

@@ -141,32 +141,18 @@
 	cfg.CgroupFSPath = res.CgroupfsPath
 	cfg.CgroupFSForce = res.CgroupfsForce
 
-	// Process Tree command line flags
-
-	procTreeFlags, err := GetFlagsFromViper("proctree")
-	if err != nil {
-		return runner, err
-	}
-
-	procTree, err := flags.PrepareProcTree(procTreeFlags)
+	// Stores command line flags
+	storesFlags, err := GetFlagsFromViper("stores")
 	if err != nil {
 		return runner, err
 	}
-	cfg.ProcTree = procTree
-
-	// DNS Cache command line flags
 
-	dnsCacheFlags, err := GetFlagsFromViper("dnscache")
+	stores, err := flags.PrepareStores(storesFlags)
 	if err != nil {
 		return runner, err
 	}
-
-	dnsCache, err := flags.PrepareDnsCache(dnsCacheFlags)
-	if err != nil {
-		return runner, err
-	}
-
-	cfg.DNSCacheConfig = dnsCache
+	cfg.DNSCacheConfig = stores.DNS
+	cfg.ProcTree = stores.Process
 
 	// Capture command line flags - via cobra flag
 

pkg/cmd/cobra/config.go

@@ -20,12 +20,11 @@ type cliFlagger interface {
 func GetFlagsFromViper(key string) ([]string, error) {
 	var flagger cliFlagger
 	rawValue := viper.Get(key)
-
 	switch key {
 	case serverflag.ServerFlag:
 		flagger = &ServerConfig{}
-	case "proctree":
-		flagger = &ProcTreeConfig{}
+	case "stores":
+		flagger = &StoresConfig{}
 	case "capabilities":
 		flagger = &CapabilitiesConfig{}
 	case "containers":
@@ -34,8 +33,6 @@ func GetFlagsFromViper(key string) ([]string, error) {
 		flagger = &LogConfig{}
 	case "output":
 		flagger = &OutputConfig{}
-	case "dnscache":
-		flagger = &DnsCacheConfig{}
 	default:
 		return nil, errfmt.Errorf("unrecognized key: %s", key)
 	}
@@ -160,64 +157,6 @@ func (c *SocketConfig) flags() []string {
 	return flags
 }
 
-//
-// proctree flag
-//
-
-type ProcTreeConfig struct {
-	Source string              `mapstructure:"source"`
-	Cache  ProcTreeCacheConfig `mapstructure:"cache"`
-}
-
-type ProcTreeCacheConfig struct {
-	Process int `mapstructure:"process"`
-	Thread  int `mapstructure:"thread"`
-}
-
-func (c *ProcTreeConfig) flags() []string {
-	flags := make([]string, 0)
-
-	if c.Source != "" {
-		if c.Source == "none" {
-			flags = append(flags, "none")
-		} else {
-			flags = append(flags, fmt.Sprintf("source=%s", c.Source))
-		}
-	}
-	if c.Cache.Process != 0 {
-		flags = append(flags, fmt.Sprintf("process-cache=%d", c.Cache.Process))
-	}
-	if c.Cache.Thread != 0 {
-		flags = append(flags, fmt.Sprintf("thread-cache=%d", c.Cache.Thread))
-	}
-
-	return flags
-}
-
-//
-// dnscache flag
-//
-
-type DnsCacheConfig struct {
-	Enable bool `mapstructure:"enable"`
-	Size   int  `mapstructure:"size"`
-}
-
-func (c *DnsCacheConfig) flags() []string {
-	flags := make([]string, 0)
-
-	if !c.Enable {
-		flags = append(flags, "none")
-		return flags
-	}
-
-	if c.Size != 0 {
-		flags = append(flags, fmt.Sprintf("size=%d", c.Size))
-	}
-
-	return flags
-}
-
 //
 // capabilities flag
 //
@@ -480,3 +419,54 @@ type OutputWebhookConfig struct {
 	GoTemplate  string `mapstructure:"gotemplate"`
 	ContentType string `mapstructure:"content-type"`
 }
+
+//
+// stores flag
+//
+
+type ProcessConfig struct {
+	Enabled   bool   `mapstructure:"enabled"`
+	Processes int    `mapstructure:"processes"`
+	Threads   int    `mapstructure:"threads"`
+	Source    string `mapstructure:"source"`
+	Procfs    bool   `mapstructure:"use-procfs"`
+}
+
+type DNSConfig struct {
+	Enabled bool `mapstructure:"enabled"`
+	Size    int  `mapstructure:"size"`
+}
+
+type StoresConfig struct {
+	DNS     DNSConfig     `mapstructure:"dns"`
+	Process ProcessConfig `mapstructure:"process"`
+}
+
+func (c *StoresConfig) flags() []string {
+	flags := []string{}
+
+	if c.DNS.Enabled {
+		flags = append(flags, fmt.Sprintf("dns.enabled=%v", c.DNS.Enabled))
+	}
+	if c.DNS.Size != 0 {
+		flags = append(flags, fmt.Sprintf("dns.size=%d", c.DNS.Size))
+	}
+
+	if c.Process.Enabled {
+		flags = append(flags, fmt.Sprintf("process.enabled=%v", c.Process.Enabled))
+	}
+	if c.Process.Processes != 0 {
+		flags = append(flags, fmt.Sprintf("process.processes=%d", c.Process.Processes))
+	}
+	if c.Process.Threads != 0 {
+		flags = append(flags, fmt.Sprintf("process.threads=%d", c.Process.Threads))
+	}
+	if c.Process.Source != "" {
+		flags = append(flags, fmt.Sprintf("process.source=%s", c.Process.Source))
+	}
+	if c.Process.Procfs {
+		flags = append(flags, fmt.Sprintf("process.use-procfs=%v", c.Process.Procfs))
+	}
+
+	return flags
+}