Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.`,
},
Expand All @@ -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.`,
},
Expand All @@ -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")`,
},
Expand All @@ -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")`,
},
Expand All @@ -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")`,
},
Expand Down
Loading