feat: Add collection key to differentiate namespaced policies

api/v1/tetragon/sensors.proto

@@ -74,16 +74,19 @@ message AddTracingPolicyResponse {}
 
 message DeleteTracingPolicyRequest {
 	string name = 1;
+	string namespace = 2;
 }
 message DeleteTracingPolicyResponse {}
 
 message EnableTracingPolicyRequest {
 	string name = 1;
+	string namespace = 2;
 }
 message EnableTracingPolicyResponse {}
 
 message DisableTracingPolicyRequest {
 	string name = 1;
+	string namespace = 2;
 }
 message DisableTracingPolicyResponse {}
 

cmd/tetra/common/flags.go

@@ -13,6 +13,7 @@ const (
 	KeyServerAddress = "server-address" // string
 	KeyTimeout       = "timeout"        // duration
 	KeyRetries       = "retries"        // int
+	KeyNamespace     = "namespace"      //string
 )
 
 const (

cmd/tetra/tracingpolicy/tracingpolicy.go

@@ -47,6 +47,7 @@ func New() *cobra.Command {
 		},
 	}
 
+	var tpDelNamespaceFlag string
 	tpDelCmd := &cobra.Command{
 		Use:   "delete <name>",
 		Short: "delete a tracing policy",
@@ -56,7 +57,8 @@ func New() *cobra.Command {
 			defer c.Close()
 
 			_, err := c.Client.DeleteTracingPolicy(c.Ctx, &tetragon.DeleteTracingPolicyRequest{
-				Name: args[0],
+				Name:      args[0],
+				Namespace: tpDelNamespaceFlag,
 			})
 			if err != nil {
 				return fmt.Errorf("failed to delete tracing policy: %w", err)
@@ -67,6 +69,7 @@ func New() *cobra.Command {
 		},
 	}
 
+	var tpEnableNamespaceFlag string
 	tpEnableCmd := &cobra.Command{
 		Use:   "enable <name>",
 		Short: "enable a tracing policy",
@@ -77,7 +80,8 @@ func New() *cobra.Command {
 			defer c.Close()
 
 			_, err := c.Client.EnableTracingPolicy(c.Ctx, &tetragon.EnableTracingPolicyRequest{
-				Name: args[0],
+				Name:      args[0],
+				Namespace: tpEnableNamespaceFlag,
 			})
 			if err != nil {
 				return fmt.Errorf("failed to enable tracing policy: %w", err)
@@ -88,6 +92,7 @@ func New() *cobra.Command {
 		},
 	}
 
+	var tpDisableNamespaceFlag string
 	tpDisableCmd := &cobra.Command{
 		Use:   "disable <name>",
 		Short: "disable a tracing policy",
@@ -98,7 +103,8 @@ func New() *cobra.Command {
 			defer c.Close()
 
 			_, err := c.Client.DisableTracingPolicy(c.Ctx, &tetragon.DisableTracingPolicyRequest{
-				Name: args[0],
+				Name:      args[0],
+				Namespace: tpDisableNamespaceFlag,
 			})
 
 			if err != nil {
@@ -191,6 +197,12 @@ func New() *cobra.Command {
 			return nil
 		},
 	}
+	tpDelFlags := tpDelCmd.Flags()
+	tpDelFlags.StringVarP(&tpDelNamespaceFlag, common.KeyNamespace, "n", "", "Namespace of the tracing policy.")
+	tpEnableFlags := tpEnableCmd.Flags()
+	tpEnableFlags.StringVarP(&tpEnableNamespaceFlag, common.KeyNamespace, "n", "", "Namespace of the tracing policy.")
+	tpDisableFlags := tpDisableCmd.Flags()
+	tpDisableFlags.StringVarP(&tpDisableNamespaceFlag, common.KeyNamespace, "n", "", "Namespace of the tracing policy.")
 	tpListFlags := tpListCmd.Flags()
 	tpListFlags.StringVarP(&tpListOutputFlag, common.KeyOutput, "o", "text", "Output format. text or json")
 

pkg/metrics/policystatemetrics/policystatemetrics_test.go

@@ -52,7 +52,7 @@ tetragon_tracingpolicy_loaded{state="load_error"} %d
 	err = testutil.CollectAndCompare(collector, expectedMetrics(0, 1, 0, 0))
 	assert.NoError(t, err)
 
-	err = manager.DisableTracingPolicy(context.TODO(), "pizza")
+	err = manager.DisableTracingPolicy(context.TODO(), "pizza", "")
 	assert.NoError(t, err)
 	err = testutil.CollectAndCompare(collector, expectedMetrics(1, 0, 0, 0))
 	assert.NoError(t, err)

pkg/sensors/collection.go

@@ -36,6 +36,19 @@ func (s TracingPolicyState) ToTetragonState() tetragon.TracingPolicyState {
 	}
 }
 
+// collectionKey is the unique key for sensors
+// this enables policies with the same name for different namespaces
+type collectionKey struct {
+	name, namespace string
+}
+
+func (ck *collectionKey) String() string {
+	if ck.namespace != "" {
+		return fmt.Sprintf("%s/%s", ck.namespace, ck.name)
+	}
+	return ck.name
+}
+
 // collection is a collection of sensors
 // This can either be creating from a tracing policy, or by loading sensors indepenently for sensors
 // that are not loaded via a tracing policy (e.g., base sensor) and testing.