From 344ecfb4c91f9d4254da1c8c332ea14f471d378f Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy Date: Tue, 30 Jul 2024 12:24:31 -0700 Subject: [PATCH 1/2] Update config to contain processors array --- terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl | 1 + terraform/testcases/prometheus_static_adot_operator/otconfig.tpl | 1 + 2 files changed, 2 insertions(+) diff --git a/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl b/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl index 093f32685..93f541ec6 100644 --- a/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl +++ b/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl @@ -26,6 +26,7 @@ extensions: pipelines: metrics: receivers: [prometheus] + processors: [] exporters: [prometheusremotewrite] extensions: [sigv4auth] telemetry: diff --git a/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl b/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl index 327258afa..3665a1c1b 100644 --- a/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl +++ b/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl @@ -21,6 +21,7 @@ extensions: pipelines: metrics: receivers: [prometheus] + processors: [] exporters: [prometheusremotewrite] extensions: [sigv4auth] telemetry: From 395627a08385ecd205d1f6c5069dc87058002261 Mon Sep 17 00:00:00 2001 From: Vasi Vasireddy Date: Tue, 30 Jul 2024 13:40:24 -0700 Subject: [PATCH 2/2] Move the otel crd back to v1alpha1 as its suppported --- .../eks/adot-operator/adot_collector_deployment.tpl | 11 ----------- terraform/eks/otlp.tf | 4 ++-- .../testcases/otlp_metric_adot_operator/otconfig.tpl | 2 +- .../otconfig.tpl | 2 +- .../testcases/otlp_trace_adot_operator/otconfig.tpl | 2 +- .../otconfig.tpl | 2 +- .../prometheus_sd_adot_operator/otconfig.tpl | 1 - .../prometheus_static_adot_operator/otconfig.tpl | 1 - 8 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 terraform/eks/adot-operator/adot_collector_deployment.tpl diff --git a/terraform/eks/adot-operator/adot_collector_deployment.tpl b/terraform/eks/adot-operator/adot_collector_deployment.tpl deleted file mode 100644 index 9d18c19d1..000000000 --- a/terraform/eks/adot-operator/adot_collector_deployment.tpl +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: opentelemetry.io/v1alpha1 -kind: OpenTelemetryCollector -metadata: - name: aoc - namespace: ${AOC_NAMESPACE} -spec: - image: ${AOC_IMAGE} - mode: ${AOC_DEPLOY_MODE} - serviceAccount: ${AOC_SERVICEACCOUNT} - config: | - ${AOC_CONFIG} diff --git a/terraform/eks/otlp.tf b/terraform/eks/otlp.tf index c36b5ff6a..4e0439e24 100644 --- a/terraform/eks/otlp.tf +++ b/terraform/eks/otlp.tf @@ -271,7 +271,7 @@ resource "kubectl_manifest" "aoc_deployment_adot_operator" { count = local.is_otlp_base_scenario && local.is_operator_testcase ? 1 : 0 yaml_body = <<-EOF - apiVersion: opentelemetry.io/v1beta1 + apiVersion: opentelemetry.io/v1alpha1 kind: OpenTelemetryCollector metadata: name: aoc @@ -280,7 +280,7 @@ resource "kubectl_manifest" "aoc_deployment_adot_operator" { image: ${module.common.aoc_image} mode: ${var.aoc_deploy_mode} serviceAccount: aoc-role-${module.common.testing_id} - config: + config: | ${module.basic_components.0.otconfig_content} EOF depends_on = [module.adot_operator] diff --git a/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl b/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl index 1c04470dd..7717a5fac 100644 --- a/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl +++ b/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl @@ -8,7 +8,7 @@ extensions: endpoint: 0.0.0.0:${grpc_port} processors: - batch: {} + batch: exporters: awsemf: diff --git a/terraform/testcases/otlp_metric_auto_instrumentation_adot_operator/otconfig.tpl b/terraform/testcases/otlp_metric_auto_instrumentation_adot_operator/otconfig.tpl index 344fff848..e382e851f 100644 --- a/terraform/testcases/otlp_metric_auto_instrumentation_adot_operator/otconfig.tpl +++ b/terraform/testcases/otlp_metric_auto_instrumentation_adot_operator/otconfig.tpl @@ -5,7 +5,7 @@ receivers: endpoint: 0.0.0.0:${grpc_port} processors: - batch: {} + batch: exporters: awsemf: diff --git a/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl b/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl index 3f986219f..18fafdcad 100644 --- a/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl +++ b/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl @@ -8,7 +8,7 @@ extensions: endpoint: 0.0.0.0:${grpc_port} processors: - batch: {} + batch: exporters: awsxray: diff --git a/terraform/testcases/otlp_trace_auto_instrumentation_adot_operator/otconfig.tpl b/terraform/testcases/otlp_trace_auto_instrumentation_adot_operator/otconfig.tpl index eb30d635e..f9b805cf9 100644 --- a/terraform/testcases/otlp_trace_auto_instrumentation_adot_operator/otconfig.tpl +++ b/terraform/testcases/otlp_trace_auto_instrumentation_adot_operator/otconfig.tpl @@ -5,7 +5,7 @@ receivers: endpoint: 0.0.0.0:${grpc_port} processors: - batch:{} + batch: exporters: awsxray: diff --git a/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl b/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl index 93f541ec6..093f32685 100644 --- a/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl +++ b/terraform/testcases/prometheus_sd_adot_operator/otconfig.tpl @@ -26,7 +26,6 @@ extensions: pipelines: metrics: receivers: [prometheus] - processors: [] exporters: [prometheusremotewrite] extensions: [sigv4auth] telemetry: diff --git a/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl b/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl index 3665a1c1b..327258afa 100644 --- a/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl +++ b/terraform/testcases/prometheus_static_adot_operator/otconfig.tpl @@ -21,7 +21,6 @@ extensions: pipelines: metrics: receivers: [prometheus] - processors: [] exporters: [prometheusremotewrite] extensions: [sigv4auth] telemetry: