Cw scad (#1297)

merging to cw-scad branch to run integ test.
aws · Aug 14, 2024 · 9f7d920 · 9f7d920
1 parent 329cfc8
commit 9f7d920
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/test-build-docker.yml b/.github/workflows/test-build-docker.yml
@@ -3,7 +3,7 @@
 
 name: Build And Upload Docker Image
 env:
-  CWA_GITHUB_TEST_REPO_NAME: "aws/amazon-cloudwatch-agent-test"
+  CWA_GITHUB_TEST_REPO_NAME: "pkkokane28/amazon-cloudwatch-agent-test"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/test-build-packages.yml b/.github/workflows/test-build-packages.yml
@@ -3,7 +3,7 @@
 
 name: Build And Upload Packages
 env:
-  CWA_GITHUB_TEST_REPO_NAME: "aws/amazon-cloudwatch-agent-test"
+  CWA_GITHUB_TEST_REPO_NAME: "pkkokane28/amazon-cloudwatch-agent-test"
 
 on:
   workflow_dispatch:

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -3,7 +3,7 @@
 
 name: Build And Upload
 env:
-  CWA_GITHUB_TEST_REPO_NAME: "aws/amazon-cloudwatch-agent-test"
+  CWA_GITHUB_TEST_REPO_NAME: "pkkokane28/amazon-cloudwatch-agent-test"
 
 on:
   workflow_dispatch:

diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml
@@ -134,6 +134,8 @@ exporters:
                 - pod_memory_request
                 - pod_memory_limit
                 - pod_cpu_limit
+                - pod_cpu_usage_total
+                - pod_memory_working_set
                 - pod_cpu_request
                 - pod_container_status_running
                 - pod_container_status_terminated

diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml
@@ -135,6 +135,8 @@ exporters:
                 - pod_memory_limit
                 - pod_cpu_limit
                 - pod_cpu_request
+                - pod_cpu_usage_total
+                - pod_memory_working_set
                 - pod_container_status_running
                 - pod_container_status_terminated
                 - pod_container_status_waiting

diff --git a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml
@@ -99,6 +99,8 @@ exporters:
                 - pod_status_unknown
                 - pod_status_succeeded
                 - pod_memory_request
+                - pod_cpu_usage_total
+                - pod_memory_working_set
                 - pod_memory_limit
                 - pod_cpu_limit
                 - pod_cpu_request

diff --git a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml
@@ -133,6 +133,8 @@ exporters:
                 - pod_memory_limit
                 - pod_cpu_limit
                 - pod_cpu_request
+                - pod_cpu_usage_total
+                - pod_memory_working_set
                 - pod_container_status_running
                 - pod_container_status_terminated
                 - pod_container_status_waiting

diff --git a/translator/translate/otel/exporter/awsemf/kubernetes.go b/translator/translate/otel/exporter/awsemf/kubernetes.go
@@ -99,7 +99,7 @@ func getPodMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar
 		podMetricDeclarations[0].Dimensions = append(podMetricDeclarations[0].Dimensions, []string{"FullPodName", "PodName", "Namespace", "ClusterName"})
 		selectors = append(selectors, []string{"pod_number_of_container_restarts", "pod_number_of_containers", "pod_number_of_running_containers",
 			"pod_status_ready", "pod_status_scheduled", "pod_status_running", "pod_status_pending", "pod_status_failed", "pod_status_unknown",
-			"pod_status_succeeded", "pod_memory_request", "pod_memory_limit", "pod_cpu_limit", "pod_cpu_request",
+			"pod_status_succeeded", "pod_memory_request", "pod_memory_limit", "pod_cpu_limit", "pod_cpu_request", "pod_cpu_usage_total", "pod_memory_working_set",
 			"pod_container_status_running", "pod_container_status_terminated", "pod_container_status_waiting", "pod_container_status_waiting_reason_crash_loop_back_off",
 			"pod_container_status_waiting_reason_image_pull_error", "pod_container_status_waiting_reason_start_error", "pod_container_status_waiting_reason_create_container_error",
 			"pod_container_status_waiting_reason_create_container_config_error", "pod_container_status_terminated_reason_oom_killed",

diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go
@@ -306,7 +306,7 @@ func TestTranslator(t *testing.T) {
 						Dimensions: [][]string{{"PodName", "Namespace", "ClusterName"}, {"ClusterName"}, {"FullPodName", "PodName", "Namespace", "ClusterName"}, {"Service", "Namespace", "ClusterName"}},
 						MetricNameSelectors: []string{"pod_cpu_reserved_capacity", "pod_memory_reserved_capacity", "pod_number_of_container_restarts", "pod_number_of_containers", "pod_number_of_running_containers",
 							"pod_status_ready", "pod_status_scheduled", "pod_status_running", "pod_status_pending", "pod_status_failed", "pod_status_unknown",
-							"pod_status_succeeded", "pod_memory_request", "pod_memory_limit", "pod_cpu_limit", "pod_cpu_request",
+							"pod_status_succeeded", "pod_memory_request", "pod_memory_limit", "pod_cpu_limit", "pod_cpu_request", "pod_cpu_usage_total", "pod_memory_working_set",
 							"pod_container_status_running", "pod_container_status_terminated", "pod_container_status_waiting", "pod_container_status_waiting_reason_crash_loop_back_off",
 							"pod_container_status_waiting_reason_image_pull_error", "pod_container_status_waiting_reason_start_error", "pod_container_status_waiting_reason_create_container_error",
 							"pod_container_status_waiting_reason_create_container_config_error", "pod_container_status_terminated_reason_oom_killed",