diff --git a/docker-compose.yml b/docker-compose.yml index 1a27a9ea09..3bae621ea4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -232,15 +232,7 @@ services: - OTEL_SERVICE_NAME=featureflagservice - DATABASE_URL=ecto://ffs:ffs@ffs_postgres:5432/ffs healthcheck: - test: - [ - "CMD", - "curl", - "-H", - "baggage: synthetic_request=true", - "-f", - "http://localhost:${FEATURE_FLAG_SERVICE_PORT}", - ] + test: ["CMD", "curl", "-H", "baggage: synthetic_request=true", "-f", "http://localhost:${FEATURE_FLAG_SERVICE_PORT}"] depends_on: ffs_postgres: condition: service_healthy @@ -455,7 +447,7 @@ services: deploy: resources: limits: - memory: 500M # This is high to enable supporting the recommendationCache feature flag use case + memory: 500M # This is high to enable supporting the recommendationCache feature flag use case restart: unless-stopped ports: - "${RECOMMENDATION_SERVICE_PORT}" @@ -773,7 +765,6 @@ services: container_name: dataprepper volumes: - /data/service-map/ - - ./src/dataprepper/trace_analytics_no_ssl_2x.yml:/usr/share/data-prepper/pipelines/trace_analytics_no_ssl_2x.yml - ./src/dataprepper/pipelines.yaml:/usr/share/data-prepper/pipelines/pipelines.yaml - ./src/dataprepper/data-prepper-config.yaml:/usr/share/data-prepper/config/data-prepper-config.yaml ports: diff --git a/src/dataprepper/pipelines.yaml b/src/dataprepper/pipelines.yaml index 2fd72c66e3..ff9431d9b8 100644 --- a/src/dataprepper/pipelines.yaml +++ b/src/dataprepper/pipelines.yaml @@ -15,3 +15,41 @@ demo-pipeline: username: admin password: admin index: otel + +entry-pipeline: + delay: "100" + source: + otel_trace_source: + ssl: false + sink: + - pipeline: + name: "raw-pipeline" + - pipeline: + name: "service-map-pipeline" +raw-pipeline: + source: + pipeline: + name: "entry-pipeline" + processor: + - otel_trace_raw: + sink: + - opensearch: + hosts: [ "https://opensearch:9200" ] + insecure: true + username: "admin" + password: "admin" + index_type: trace-analytics-raw +service-map-pipeline: + delay: "100" + source: + pipeline: + name: "entry-pipeline" + processor: + - service_map_stateful: + sink: + - opensearch: + hosts: ["https://opensearch:9200"] + insecure: true + username: "admin" + password: "admin" + index_type: trace-analytics-service-map