Skip to content

Conversation

@YANG-DB
Copy link
Member

@YANG-DB YANG-DB commented Nov 20, 2023

Changes

fix data-prepper pipeline

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://node-0.example.com:9200" ]
        cert: "/usr/share/data-prepper/root-ca.pem"
        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://node-0.example.com:9200"]
        cert: "/usr/share/data-prepper/root-ca.pem"
        username: "admin"
        password: "admin"
        index_type: trace-analytics-service-map

Merge Requirements

For new features contributions please make sure you have completed the following
essential items:

  • CHANGELOG.md updated to document new feature additions
  • Appropriate documentation updates in the docs
  • Appropriate Helm chart updates in the helm-charts

Maintainers will not merge until the above have been completed. If you're unsure
which docs need to be changed ping the
@open-telemetry/demo-approvers.

YANG-DB and others added 30 commits April 26, 2023 11:49
…nto opensearch-observability-otel

# Conflicts:
#	docker-compose.yml
[currencyservice] Fix OTel C++ build and update OTel version (open-telemetry#886)
…y#865)

* update rust version and dependencies

* Changelog

---------

Co-authored-by: Carter Socha <[email protected]>
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml

Signed-off-by: YANGDB <[email protected]>
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml
 - update opensearch to use a single node

Signed-off-by: YANGDB <[email protected]>
Signed-off-by: YANGDB <[email protected]>
# Conflicts:
#	docker-compose.minimal.yml
#	docker-compose.yml
#	src/adservice/build.gradle
#	src/frauddetectionservice/build.gradle.kts
#	src/loadgenerator/requirements.txt
#	src/prometheus/prometheus-config.yaml
Signed-off-by: YANGDB <[email protected]>
…a-prepper-pipelines

# Conflicts:
#	docker-compose.yml
#	src/dataprepper/trace_analytics_no_ssl_2x.yml
#	src/otelcollector/README.md
# Conflicts:
#	docker-compose.yml
#	src/dataprepper/trace_analytics_no_ssl_2x.yml
#	src/otelcollector/otelcol-config.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants