Add cluster_name field

Signed-off-by: Michi Mutsuzaki <[email protected]>
cilium · Oct 22, 2024 · 90e393d · 90e393d
1 parent 001d8a7
commit 90e393d
Show file tree

Hide file tree

Showing 14 changed files with 130 additions and 79 deletions.
diff --git a/api/v1/README.md b/api/v1/README.md
diff --git a/api/v1/tetragon/events.pb.go b/api/v1/tetragon/events.pb.go
diff --git a/api/v1/tetragon/events.proto b/api/v1/tetragon/events.proto
@@ -204,4 +204,6 @@ message GetEventsResponse {
     // aggregation_info contains information about aggregation results. This field
     // is set only for aggregated responses.
     AggregationInfo aggregation_info = 1002;
+    // Name of the cluster where this event was observed.
+    string cluster_name = 1003;
 }
diff --git a/contrib/tetragon-rthooks/vendor/github.com/cilium/tetragon/api/v1/tetragon/events.pb.go b/contrib/tetragon-rthooks/vendor/github.com/cilium/tetragon/api/v1/tetragon/events.pb.go
diff --git a/contrib/tetragon-rthooks/vendor/github.com/cilium/tetragon/api/v1/tetragon/events.proto b/contrib/tetragon-rthooks/vendor/github.com/cilium/tetragon/api/v1/tetragon/events.proto
diff --git a/docs/content/en/docs/reference/grpc-api.md b/docs/content/en/docs/reference/grpc-api.md
diff --git a/docs/content/en/docs/reference/helm-chart.md b/docs/content/en/docs/reference/helm-chart.md
diff --git a/install/kubernetes/tetragon/README.md b/install/kubernetes/tetragon/README.md
diff --git a/install/kubernetes/tetragon/templates/tetragon_configmap.yaml b/install/kubernetes/tetragon/templates/tetragon_configmap.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
   {{- include "tetragon.labels" . | nindent 4 }}
 data:
+  cluster-name: {{ .Values.tetragon.clusterName | quote }}
 {{- if .Values.tetragon.btf }}
   btf: {{ .Values.tetragon.btf }}
 {{- end }}
@@ -75,4 +76,4 @@ data:
 {{- if .Values.tetragon.enableKeepSensorsOnExit }}
   keep-sensors-on-exit: "true"
   release-pinned-bpf: "false"
-{{- end }}
+{{- end }}
diff --git a/install/kubernetes/tetragon/values.yaml b/install/kubernetes/tetragon/values.yaml
@@ -137,6 +137,9 @@ tetragon:
   # With both of the above redaction filters in place, we are now redacting all
   # password arguments.
   redactionFilters: ""
+  # -- Name of the cluster where Tetragon is installed. Tetragon uses this value
+  # to set the cluster_name field in GetEventsResponse messages.
+  clusterName: ""
   # -- Access Kubernetes API to associate Tetragon events with Kubernetes pods.
   enableK8sAPI: true
   # -- Enable Capabilities visibility in exec and kprobe events.

diff --git a/pkg/option/config.go b/pkg/option/config.go
@@ -25,6 +25,7 @@ type config struct {
 	Verbosity       int
 	ForceSmallProgs bool
 	ForceLargeProgs bool
+	ClusterName     string
 
 	EnableProcessNs   bool
 	EnableProcessCred bool

diff --git a/pkg/option/flags.go b/pkg/option/flags.go
@@ -28,6 +28,7 @@ const (
 	KeyDataCacheSize    = "data-cache-size"
 	KeyForceSmallProgs  = "force-small-progs"
 	KeyForceLargeProgs  = "force-large-progs"
+	KeyClusterName      = "cluster-name"
 
 	KeyLogLevel  = "log-level"
 	KeyLogFormat = "log-format"
@@ -143,6 +144,7 @@ func ReadAndSetFlags() error {
 	Config.ForceSmallProgs = viper.GetBool(KeyForceSmallProgs)
 	Config.ForceLargeProgs = viper.GetBool(KeyForceLargeProgs)
 	Config.Debug = viper.GetBool(KeyDebug)
+	Config.ClusterName = viper.GetString(KeyClusterName)
 
 	Config.EnableProcessCred = viper.GetBool(KeyEnableProcessCred)
 	Config.EnableProcessNs = viper.GetBool(KeyEnableProcessNs)
@@ -301,6 +303,7 @@ func AddFlags(flags *pflag.FlagSet) {
 	flags.BoolP(KeyDebug, "d", false, "Enable debug messages. Equivalent to '--log-level=debug'")
 	flags.String(KeyHubbleLib, defaults.DefaultTetragonLib, "Location of Tetragon libs (btf and bpf files)")
 	flags.String(KeyBTF, "", "Location of btf")
+	flags.String(KeyClusterName, "", "Name of the cluster where Tetragon is installed")
 
 	flags.String(KeyProcFS, "/proc/", "Location of procfs to consume existing PIDs")
 	flags.String(KeyKernelVersion, "", "Kernel version")