From e7ac86febd948bdd4438647685524eb45dc3dc6d Mon Sep 17 00:00:00 2001 From: albertteoh Date: Mon, 28 Aug 2023 21:03:23 +1000 Subject: [PATCH] Add connector config as defaults Signed-off-by: albertteoh --- docker-compose/monitor/Makefile | 4 +--- docker-compose/monitor/docker-compose.yml | 7 ++++--- docker-compose/monitor/otel-collector-config-connector.yml | 6 +++--- docker-compose/monitor/otel-collector-config-processor.yml | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/docker-compose/monitor/Makefile b/docker-compose/monitor/Makefile index c6948ec1f8c..6ca32cb6ce9 100644 --- a/docker-compose/monitor/Makefile +++ b/docker-compose/monitor/Makefile @@ -18,9 +18,6 @@ run-dev: _run-connector # _run-connector is the base target to bring up the system required for SPM using the new OTEL spanmetrics connector. .PHONY: _run-connector -_run-connector: export OTEL_IMAGE_TAG = 0.80.0 -_run-connector: export OTEL_CONFIG_SRC = ./otel-collector-config-connector.yml -_run-connector: export PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR = true _run-connector: docker compose -f docker-compose.yml up @@ -31,6 +28,7 @@ run-dev-processor: export JAEGER_IMAGE_TAG = dev # Fix to a version before the breaking changes were introduced. run-dev-processor: export OTEL_IMAGE_TAG = 0.70.0 run-dev-processor: export OTEL_CONFIG_SRC = ./otel-collector-config-processor.yml +run-dev-processor: export PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR = false run-dev-processor: docker compose -f docker-compose.yml up diff --git a/docker-compose/monitor/docker-compose.yml b/docker-compose/monitor/docker-compose.yml index 8196ef0cd31..b3775fd4b56 100644 --- a/docker-compose/monitor/docker-compose.yml +++ b/docker-compose/monitor/docker-compose.yml @@ -10,10 +10,11 @@ services: environment: - METRICS_STORAGE_TYPE=prometheus - PROMETHEUS_SERVER_URL=http://prometheus:9090 - - LOG_LEVEL=debug - PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR=${PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR} - - PROMETHEUS_QUERY_NAMESPACE=${PROMETHEUS_QUERY_NAMESPACE} - - PROMETHEUS_QUERY_DURATION_UNIT=${PROMETHEUS_QUERY_DURATION_UNIT} + - PROMETHEUS_QUERY_NAMESPACE=${PROMETHEUS_QUERY_NAMESPACE:-} + - PROMETHEUS_QUERY_DURATION_UNIT=${PROMETHEUS_QUERY_DURATION_UNIT:-} + - OTEL_IMAGE_TAG=${OTEL_IMAGE_TAG:-0.80.0} + - OTEL_CONFIG_SRC=${OTEL_CONFIG_SRC:-./otel-collector-config-connector.yml} ports: - "16686:16686" otel_collector: diff --git a/docker-compose/monitor/otel-collector-config-connector.yml b/docker-compose/monitor/otel-collector-config-connector.yml index 3cdda4080e8..038f5f86c29 100644 --- a/docker-compose/monitor/otel-collector-config-connector.yml +++ b/docker-compose/monitor/otel-collector-config-connector.yml @@ -13,8 +13,8 @@ exporters: prometheus: endpoint: "0.0.0.0:8889" - jaeger: - endpoint: "jaeger:14250" + otlp: + endpoint: jaeger:4317 tls: insecure: true @@ -29,7 +29,7 @@ service: traces: receivers: [otlp, jaeger] processors: [batch] - exporters: [spanmetrics, jaeger] + exporters: [spanmetrics, otlp] # The exporter name in this pipeline must match the spanmetrics.metrics_exporter name. # The receiver is just a dummy and never used; added to pass validation requiring at least one receiver in a pipeline. metrics/spanmetrics: diff --git a/docker-compose/monitor/otel-collector-config-processor.yml b/docker-compose/monitor/otel-collector-config-processor.yml index 8d185728168..5ca7d7b1b44 100644 --- a/docker-compose/monitor/otel-collector-config-processor.yml +++ b/docker-compose/monitor/otel-collector-config-processor.yml @@ -19,8 +19,8 @@ exporters: prometheus: endpoint: "0.0.0.0:8889" - jaeger: - endpoint: "jaeger:14250" + otlp: + endpoint: jaeger:4317 tls: insecure: true @@ -34,7 +34,7 @@ service: traces: receivers: [otlp, jaeger] processors: [spanmetrics, batch] - exporters: [jaeger] + exporters: [otlp] # The exporter name in this pipeline must match the spanmetrics.metrics_exporter name. # The receiver is just a dummy and never used; added to pass validation requiring at least one receiver in a pipeline. metrics/spanmetrics: