fix for: logs pipeline in OpenTelemetryCollector references undefined…

… receiver and exporter if adotcontainerlogs.pattern.enabled is not defined in cdk.json
aws-observability · Jun 13, 2024 · 8631bfc · 8631bfc
1 parent be840c3
commit 8631bfc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/common/resources/otel-collector-config.yml b/lib/common/resources/otel-collector-config.yml
@@ -1879,10 +1879,12 @@ spec:
         metrics:
           receivers: [prometheus]
           exporters: [logging, prometheusremotewrite]
+        {{ start enableAdotContainerLogsPipeline }}
         logs:
           receivers: [filelog]
           processors: [batch,k8sattributes]
           exporters: [awscloudwatchlogs]
+        {{ stop enableAdotContainerLogsPipeline }}
       {{ start enableAdotMetricsCollectionTelemetry }}
       telemetry:
         metrics:

diff --git a/lib/single-new-eks-opensource-observability-pattern/index.ts b/lib/single-new-eks-opensource-observability-pattern/index.ts
@@ -92,6 +92,12 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
             "{{ stop enableAdotContainerLogsExporter }}",
             jsonStringnew.context["adotcontainerlogs.pattern.enabled"]
         );
+        doc = utils.changeTextBetweenTokens(
+            doc,
+            "{{ start enableAdotContainerLogsPipeline }}",
+            "{{ stop enableAdotContainerLogsPipeline }}",
+            jsonStringnew.context["adotcontainerlogs.pattern.enabled"]
+        );
         doc = utils.changeTextBetweenTokens(
             doc,
             "{{ start kubecostJob }}",