From f3b8ef65753f72ae474fde8fd9b905c59f56527b Mon Sep 17 00:00:00 2001 From: keigof Date: Wed, 5 Aug 2026 09:05:38 +0000 Subject: [PATCH] fix: remove CSM traffic log from the container log filter --- .../googlecloudlogk8scontainer/impl/query_task.go | 2 ++ .../googlecloudlogk8scontainer/impl/query_task_test.go | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task.go b/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task.go index 62c9f70c7..855ef2d0c 100644 --- a/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task.go +++ b/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task.go @@ -35,6 +35,8 @@ func GenerateK8sContainerQuery(cluster googlecloudk8scommon_contract.GoogleCloud resource.labels.project_id="%s" resource.labels.location="%s" resource.labels.cluster_name="%s" +-LOG_ID("server-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log +-LOG_ID("client-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log %s %s`, cluster.ProjectID, cluster.Location, cluster.NameFor(googlecloudk8scommon_contract.ClusterNameUsageK8sCluster), generateNamespacesFilter(namespacesFilter), generatePodNamesFilter(podNamesFilter)) } diff --git a/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task_test.go b/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task_test.go index 533d8cfc4..90d1b248d 100644 --- a/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task_test.go +++ b/pkg/task/inspection/googlecloudlogk8scontainer/impl/query_task_test.go @@ -43,6 +43,8 @@ func TestGenerateK8sContainerQueryIsValid(t *testing.T) { resource.labels.project_id="foo-project" resource.labels.location="foo-location" resource.labels.cluster_name="foo-cluster" +-LOG_ID("server-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log +-LOG_ID("client-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log -- Invalid: none of the resources will be selected. Ignoring namespace filter. -- Invalid: none of the resources will be selected. Ignoring pod name filter.`, }, @@ -59,6 +61,8 @@ resource.labels.cluster_name="foo-cluster" resource.labels.project_id="foo-project" resource.labels.location="foo-location" resource.labels.cluster_name="foo-cluster" +-LOG_ID("server-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log +-LOG_ID("client-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log resource.labels.namespace_name=("kube-system") -- Invalid: none of the resources will be selected. Ignoring pod name filter.`, }, @@ -75,6 +79,8 @@ resource.labels.namespace_name=("kube-system") resource.labels.project_id="foo-project" resource.labels.location="foo-location" resource.labels.cluster_name="foo-cluster" +-LOG_ID("server-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log +-LOG_ID("client-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log -- Invalid: none of the resources will be selected. Ignoring namespace filter. resource.labels.pod_name:("nginx-pod")`, }, @@ -91,6 +97,8 @@ resource.labels.pod_name:("nginx-pod")`, resource.labels.project_id="foo-project" resource.labels.location="foo-location" resource.labels.cluster_name="foo-cluster" +-LOG_ID("server-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log +-LOG_ID("client-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log resource.labels.namespace_name=("kube-system") resource.labels.pod_name:("nginx-pod")`, }, @@ -107,6 +115,8 @@ resource.labels.pod_name:("nginx-pod")`, resource.labels.project_id="foo-project" resource.labels.location="foo-location" resource.labels.cluster_name="foo-cluster" +-LOG_ID("server-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log +-LOG_ID("client-accesslog-stackdriver") -- Use CSM Traffic log parser for CSM traffic log resource.labels.namespace_name=("kube-system" OR "istio-system") resource.labels.pod_name:("nginx-pod" OR "apache-pod")`, },