add env var and reuse processors

Author: Paamicky

charts/amazon-cloudwatch-observability/templates/linux/_otel-container-insights-logs-config.tpl

@@ -9,11 +9,9 @@ OTEL Container Insights LOGS-only otelConfig (hybrid model).
 Metrics are generated by the agent from spec.config (JSON); this template supplies
 ONLY the CI log pipelines via spec.otelConfig. The agent merges the two at startup.
 
-The shared enrichment processors `resourcedetection/opentelemetry`, `k8sattributes/opentelemetry`,
-and `transform/identity` are referenced here. The agent's metrics config
-(spec.config) supplies them at merge, giving multi-cloud detection + service/identity enrichment.
-The CI-specific `k8sattributes/cw_k8s_ci_v0_logs_{node,pod}` are "_logs"-suffixed so they don't
-collide with the agent's metrics-side copies during the merge.
+The enrichment processors are referenced here but NOT redefined. The agent's metrics
+config (spec.config) supplies them at merge. Only the logs-specific processors
+(scope, cluster/node, filelog, exporter/auth/batch) are defined.
 */}}
 {{- define "otel-container-insights-logs.config" -}}
 extensions:
@@ -66,68 +64,6 @@ receivers:
     max_concurrent_files: 100
 
 processors:
-  k8sattributes/cw_k8s_ci_v0_logs_node:
-    auth_type: serviceAccount
-    passthrough: false
-    exclude:
-      pods: []
-    filter:
-      node_from_env_var: K8S_NODE_NAME
-    extract:
-      metadata:
-        - k8s.node.name
-      labels:
-        - tag_name: "k8s.node.label.$$$1"
-          key_regex: "(.*)"
-          from: node
-    pod_association:
-      - sources:
-          - from: resource_attribute
-            name: k8s.node.name
-
-  k8sattributes/cw_k8s_ci_v0_logs_pod:
-    auth_type: serviceAccount
-    passthrough: false
-    exclude:
-      pods: []
-    filter:
-      node_from_env_var: K8S_NODE_NAME
-    extract:
-      annotations:
-        - from: pod
-          key: resource.opentelemetry.io/service.name
-          tag_name: resource.opentelemetry.io/service.name
-        - from: pod
-          key: resource.opentelemetry.io/service.namespace
-          tag_name: resource.opentelemetry.io/service.namespace
-        - from: pod
-          key: resource.opentelemetry.io/service.instance.id
-          tag_name: resource.opentelemetry.io/service.instance.id
-        - from: pod
-          key: resource.opentelemetry.io/service.version
-          tag_name: resource.opentelemetry.io/service.version
-      metadata:
-        - k8s.pod.uid
-        - k8s.node.name
-        - k8s.deployment.name
-        - k8s.statefulset.name
-        - k8s.daemonset.name
-        - k8s.replicaset.name
-        - k8s.job.name
-        - k8s.cronjob.name
-        - k8s.pod.start_time
-        - k8s.container.name
-      labels:
-        - tag_name: "k8s.pod.label.$$$1"
-          key_regex: "(.*)"
-          from: pod
-    pod_association:
-      - sources:
-          - from: resource_attribute
-            name: k8s.pod.name
-          - from: resource_attribute
-            name: k8s.namespace.name
-
   transform/cw_k8s_ci_v0_logs_set_cluster_and_node:
     error_mode: ignore
     log_statements:
@@ -207,8 +143,8 @@ service:
       processors:
         - transform/cw_k8s_ci_v0_logs_set_cluster_and_node
         - resourcedetection/opentelemetry
-        - k8sattributes/cw_k8s_ci_v0_logs_node
-        - k8sattributes/cw_k8s_ci_v0_logs_pod
+        - k8sattributes/cw_k8s_ci_v0_node
+        - k8sattributes/cw_k8s_ci_v0_pod
         - k8sattributes/opentelemetry
         - transform/identity
         - transform/cw_k8s_ci_v0_logs_set_scope_app
@@ -222,7 +158,7 @@ service:
       processors:
         - transform/cw_k8s_ci_v0_logs_set_cluster_and_node
         - resourcedetection/opentelemetry
-        - k8sattributes/cw_k8s_ci_v0_logs_node
+        - k8sattributes/cw_k8s_ci_v0_node
         - k8sattributes/opentelemetry
         - transform/identity
         - transform/cw_k8s_ci_v0_logs_set_scope_host

charts/amazon-cloudwatch-observability/tests/flag_matrix.sh

@@ -120,7 +120,7 @@ OTEL_CI_CLUSTER='\"role\":\"cluster\"'
 # otelConfig (spec.otelConfig). The node JSON always sets logs.enabled:false; the
 # presence of CI logs is asserted via the logs exporter in the rendered otelConfig.
 OTEL_CI_LOGS_YAML_ON='cw_k8s_ci_v0_app_logs_dest'
-OTEL_CI_JSON_LOGS_OFF='\"logs\":{\"enabled\":false}'
+OTEL_CI_LOGS_JSON_OFF='\"logs\":{\"enabled\":false}'
 # aws-for-fluent-bit is the container image string — unique to the FluentBit
 # DaemonSet. Using this instead of bare "fluent-bit" avoids false matches in
 # OTEL config paths like /var/log/containers/fluent-bit* (which exist in the
@@ -160,12 +160,12 @@ run_case 4 false true true "ok" \
 # State #5: OTEL metrics only (logs disabled).
 run_case 5 true false false "ok" \
     "OTEL metrics only, no logs" \
-    "$OTEL_CI_BOTH_ROLES,$OTEL_CI_JSON_LOGS_OFF" "$OTEL_CI_LOGS_YAML_ON,$FLUENT_BIT_IMAGE"
+    "$OTEL_CI_BOTH_ROLES,$OTEL_CI_LOGS_JSON_OFF" "$OTEL_CI_LOGS_YAML_ON,$FLUENT_BIT_IMAGE"
 
 # State #6: hybrid — OTEL metrics + FluentBit logs.
 run_case 6 true false true "ok" \
     "Hybrid — OTEL metrics + FluentBit logs" \
-    "$OTEL_CI_BOTH_ROLES,$OTEL_CI_JSON_LOGS_OFF,$FLUENT_BIT_IMAGE" "$OTEL_CI_LOGS_YAML_ON"
+    "$OTEL_CI_BOTH_ROLES,$OTEL_CI_LOGS_JSON_OFF,$FLUENT_BIT_IMAGE" "$OTEL_CI_LOGS_YAML_ON"
 
 # State #7: full OTEL (metrics + logs, no FluentBit).
 run_case 7 true true false "ok" \

charts/amazon-cloudwatch-observability/values.yaml

@@ -720,6 +720,10 @@ agents:
   - name: cloudwatch-agent-cluster-scraper
     mode: deployment
     config: "default" # the reserved string "default" indicates building the default config dynamically
+    # if a customer json config role is empty, CWAGENT_ROLE=LEADER keeps this agent resolving to the "cluster" role.
+    env:
+      - name: CWAGENT_ROLE
+        value: LEADER
 agent:
   name:
   mode: daemonset # Represents the mode the AmazonCloudWatchAgent workload will run in (deployment, daemonset or statefulset)

integration-tests/amazon-cloudwatch-observability/validations/minikube/scenarios/agent_config_merge_isolation_test.go

@@ -110,6 +110,10 @@ func TestAgentConfigMergeIsolation(t *testing.T) {
 
 		mode, _ := spec["mode"].(string)
 		assert.Equal(t, "deployment", mode, "cluster-scraper should be in deployment mode")
+
+		// Fallback env: guarantees the scraper resolves to the cluster role even if a
+		// custom config omits role (JSON role: cluster wins by default; env is the safety net).
+		assertEnvValue(t, spec, "CWAGENT_ROLE", "LEADER")
 	})
 
 	t.Log("Agent config merge isolation validation passed")

integration-tests/amazon-cloudwatch-observability/validations/minikube/scenarios/otlp_hybrid_metrics_fluentbit_test.go

@@ -78,9 +78,9 @@ func TestOTLPHybridMetricsFluentBit(t *testing.T) {
 
 	// OTEL CI enabled (node role), logs off (FluentBit handles logs).
 	minikube.AssertOtelContainerInsights(t, config, "node")
-	// Hybrid + logs off: otelConfig is absent, so no CI logs pipeline expected.
-	otelConfig, _ := spec["otelConfig"].(string)
-	minikube.AssertOtelCILogs(t, otelConfig, false)
+	// Hybrid + logs off: no CI logs otelConfig should be emitted.
+	_, hasOtelConfig := spec["otelConfig"].(string)
+	assert.False(t, hasOtelConfig, "otelConfig should be absent when CI logs are disabled")
 
 	// CWA DaemonSet must not have log-related host mounts.
 	assertNoLogMounts(t, k8sClient, "cloudwatch-agent")

integration-tests/amazon-cloudwatch-observability/validations/minikube/scenarios/otlp_logs_disabled_test.go

@@ -83,9 +83,9 @@ func TestOTLPLogsDisabled(t *testing.T) {
 
 	// Metrics pipeline present (node role); logs disabled.
 	minikube.AssertOtelContainerInsights(t, config, "node")
-	// Hybrid + logs off: otelConfig is absent, so no CI logs pipeline expected.
-	otelConfig, _ := spec["otelConfig"].(string)
-	minikube.AssertOtelCILogs(t, otelConfig, false)
+	// Hybrid + logs off: no CI logs otelConfig should be emitted.
+	_, hasOtelConfig := spec["otelConfig"].(string)
+	assert.False(t, hasOtelConfig, "otelConfig should be absent when CI logs are disabled")
 
 	// CWA DaemonSet must not have log-related host mounts.
 	assertNoLogMounts(t, k8sClient, "cloudwatch-agent")