Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Data prepper pipelines #101

Merged
merged 184 commits into from
Nov 7, 2023
Merged

Data prepper pipelines #101

merged 184 commits into from
Nov 7, 2023

Conversation

YANG-DB
Copy link
Member

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

Changes

update data-prepper pipelines to reflect both traces / services collection

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
@YANG-DB
Initial setup of Observability OTEL demo using Opensearch as store
acf1cdc
@YANG-DB
Initial setup of Observability OTEL demo using Opensearch as store
c842150 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge remote-tracking branch 'origin/opensearch-observability-otel' i…
b83ea99 
…nto opensearch-observability-otel

# Conflicts:
#	docker-compose.yml
@YANG-DB
Initial setup of Observability OTEL demo using Opensearch as store
9850688 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge branch 'main' into opensearch-observability-otel
0db3223 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
add curl to the basic docker O/S
bf41276 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge pull request opensearch-project#1 from open-telemetry/main
4292136 
merge external changes
@YANG-DB
add monitoring & opinionated assets for this demo
f0600be 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge remote-tracking branch 'origin/opensearch-observability-otel' i…
418d196 
…nto opensearch-observability-otel
@YANG-DB
export F/E & Load-Generator port services
b0db9fc 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge pull request opensearch-project#2 from open-telemetry/main
9629fb7 
update from main
@YANG-DB
fix jaeger service name
ba709f1 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
adding nginx as frontend proxy, fluent-bit.conf as log emitter
daedfab 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
adding nginx & fluent-bit docs
d58ed46 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge pull request opensearch-project#3 from open-telemetry/main
a8e3f5d 
[currencyservice] Fix OTel C++ build and update OTel version (open-telemetry#886)
@YANG-DB
adding integrationbs docker-compose service for assets loading into o…
b6a018a 
…pensearch / dashboards

Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge remote-tracking branch 'origin/opensearch-observability-otel' i…
6031c17 
…nto opensearch-observability-otel
@YANG-DB
adding datasource for query prometheus
92240ba 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
adding architecture.md including images
12d52cb 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
add images and service links
85fefce 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
add jaeger-agent container name
73e2680 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
add data-prepper support for traces ingestion & serviceMap creation
f6067c6 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
fix auth issues for data-prepper
24d278c 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
add documentation for different ingestion capabilities
7410478 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge pull request opensearch-project#4 from YANG-DB/otel-opensearch-…
d8a2abf 
…data-prep

Otel Opensearch data prep
@YANG-DB
Initial setup of Observability OTEL demo using Opensearch as store
fe655cc 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Initial setup of Observability OTEL demo using Opensearch as store
0be11cd 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
add curl to the basic docker O/S
f54a011 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
add monitoring & opinionated assets for this demo
90c9a61 
Signed-off-by: YANGDB <[email protected]>
@julianocosta89 @cartersocha @YANG-DB
[shippingservice] update rust version and dependencies (open-telemetr…
379372a 
…y#865)

* update rust version and dependencies

* Changelog

---------

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

Signed-off-by: YANGDB <[email protected]>
@YANG-DB
update upstream changes
e2e6770 
 - remove 'opensearch integration' service
 - update the opensearch dashboard
 - add opensearch+dashboard to the minimized docker-compose.yml

Signed-off-by: YANGDB <[email protected]>
@YANG-DB
update upstream changes
8816e1d 
 - 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]>
@YANG-DB
update upstream changes
1774665 
 - 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]>
@YANG-DB
update upstream changes
a61bd83 
 - 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]>
@YANG-DB
update upstream changes
db1aef7 
 - 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]>
@YANG-DB
update upstream changes
61c3918 
 - 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]>
@YANG-DB
remove https in favor of http
c347720 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
restore https
3c07b02 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
update data-prepper config files
3a26e77 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge branch 'main' into update-latest-upstream-patch
f704c7e 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge remote-tracking branch 'origin/update-latest-upstream-patch'
4810682 
# 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
@YANG-DB
fix opensearch service name for jaeger-query
60889ad 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
remove jaeger-query
f823ced 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
update data-prepper pipelines
81cc672 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
Merge remote-tracking branch 'origin/data-prepper-pipelines' into dat…
dcd7f3f 
…a-prepper-pipelines

# Conflicts:
#	docker-compose.yml
#	src/dataprepper/trace_analytics_no_ssl_2x.yml
#	src/otelcollector/README.md
@YANG-DB
update data-prepper pipelines
1be0e03 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB
update data-prepper pipelines
d9992df 
Signed-off-by: YANGDB <[email protected]>
@YANG-DB YANG-DB merged commit 59ec0e9 into opensearch-project:main Nov 7, 2023
23 of 28 checks passed
@YANG-DB YANG-DB deleted the data-prepper-pipelines branch November 7, 2023 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@ps48 ps48 Awaiting requested review from ps48 ps48 is a code owner

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@dai-chen dai-chen Awaiting requested review from dai-chen dai-chen is a code owner

@rupal-bq rupal-bq Awaiting requested review from rupal-bq

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@vamsi-amazon vamsi-amazon Awaiting requested review from vamsi-amazon vamsi-amazon is a code owner

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@YANG-DB @julianocosta89 @fatsheep9146 @styblope @brettmc @alanwest @anirudha @ps48 @MitchellGale @xoscar