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.

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

Data prepper pipelines #105

Merged
merged 186 commits into from
Nov 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
186 commits
Select commit Hold shift + click to select a range
acf1cdc
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB Apr 26, 2023
c842150
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB Apr 26, 2023
b83ea99
Merge remote-tracking branch 'origin/opensearch-observability-otel' i…
YANG-DB Apr 26, 2023
9850688
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB May 1, 2023
0db3223
Merge branch 'main' into opensearch-observability-otel
YANG-DB May 2, 2023
bf41276
add curl to the basic docker O/S
YANG-DB May 3, 2023
4292136
Merge pull request #1 from open-telemetry/main
YANG-DB May 3, 2023
f0600be
add monitoring & opinionated assets for this demo
YANG-DB May 4, 2023
418d196
Merge remote-tracking branch 'origin/opensearch-observability-otel' i…
YANG-DB May 4, 2023
b0db9fc
export F/E & Load-Generator port services
YANG-DB May 8, 2023
9629fb7
Merge pull request #2 from open-telemetry/main
YANG-DB May 8, 2023
ba709f1
fix jaeger service name
YANG-DB May 9, 2023
daedfab
adding nginx as frontend proxy, fluent-bit.conf as log emitter
YANG-DB May 10, 2023
d58ed46
adding nginx & fluent-bit docs
YANG-DB May 10, 2023
a8e3f5d
Merge pull request #3 from open-telemetry/main
YANG-DB May 15, 2023
b6a018a
adding integrationbs docker-compose service for assets loading into o…
YANG-DB May 15, 2023
6031c17
Merge remote-tracking branch 'origin/opensearch-observability-otel' i…
YANG-DB May 15, 2023
92240ba
adding datasource for query prometheus
YANG-DB May 15, 2023
12d52cb
adding architecture.md including images
YANG-DB May 15, 2023
85fefce
add images and service links
YANG-DB May 16, 2023
73e2680
add jaeger-agent container name
YANG-DB May 16, 2023
f6067c6
add data-prepper support for traces ingestion & serviceMap creation
YANG-DB May 16, 2023
24d278c
fix auth issues for data-prepper
YANG-DB May 16, 2023
7410478
add documentation for different ingestion capabilities
YANG-DB May 16, 2023
d8a2abf
Merge pull request #4 from YANG-DB/otel-opensearch-data-prep
YANG-DB May 16, 2023
fe655cc
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB Apr 26, 2023
0be11cd
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB May 1, 2023
f54a011
add curl to the basic docker O/S
YANG-DB May 3, 2023
90c9a61
add monitoring & opinionated assets for this demo
YANG-DB May 4, 2023
379372a
[shippingservice] update rust version and dependencies (#865)
julianocosta89 May 3, 2023
6ae5c80
[load generator] Bump loagen dependencies (#869)
julianocosta89 May 3, 2023
a69595a
[grafana] fix demo dashboard to be compatible with spanmetrics connec…
fatsheep9146 May 3, 2023
1c28220
export F/E & Load-Generator port services
YANG-DB May 8, 2023
42537be
[kafka] remove KRaft mode support workarounds (#880)
styblope May 8, 2023
8bd25ad
enabling batch span processor metrics for quoteservice (#878)
brettmc May 8, 2023
2cc7484
Generate random errors in cartservice (#824)
alanwest May 8, 2023
54e3b6f
fix jaeger service name
YANG-DB May 9, 2023
daf0d08
adding nginx as frontend proxy, fluent-bit.conf as log emitter
YANG-DB May 10, 2023
88e0171
adding nginx & fluent-bit docs
YANG-DB May 10, 2023
d292741
adding integrationbs docker-compose service for assets loading into o…
YANG-DB May 15, 2023
6f55bd8
[currencyservice] Fix OTel C++ build and update OTel version (#886)
julianocosta89 May 12, 2023
193552f
adding datasource for query prometheus
YANG-DB May 15, 2023
febdfe1
adding architecture.md including images
YANG-DB May 15, 2023
904ed80
add images and service links
YANG-DB May 16, 2023
9cf4326
add jaeger-agent container name
YANG-DB May 16, 2023
c14aa11
add data-prepper support for traces ingestion & serviceMap creation
YANG-DB May 16, 2023
a55d74f
fix auth issues for data-prepper
YANG-DB May 16, 2023
6032e3e
add documentation for different ingestion capabilities
YANG-DB May 16, 2023
5954bdf
Merge remote-tracking branch 'origin/opensearch-observability-otel' i…
YANG-DB May 18, 2023
4d1d72e
add assets manager flast app for loading the integration assets
YANG-DB May 18, 2023
91f7a0e
remove experimental assets mgr app
YANG-DB May 18, 2023
78b38e6
Opensearch otel demo observability tutorial (#5)
YANG-DB May 23, 2023
20e05bb
Add .whitesource configuration file
mend-for-github-com[bot] May 26, 2023
fe8a551
Merge pull request #2 from open-telemetry/main
YANG-DB May 26, 2023
b422bc7
Update local-config.md
YANG-DB May 26, 2023
4431d7b
Update README.md
YANG-DB May 26, 2023
ddfd510
Merge pull request #3 from opensearch-project/opensearch-observabilit…
YANG-DB May 26, 2023
206744d
Merge pull request #1 from opensearch-project/whitesource/configure
YANG-DB May 26, 2023
ca117ba
chore(deps): update dependency com.fasterxml.jackson.core:jackson-dat…
mend-for-github-com[bot] May 30, 2023
79478c6
chore(deps): update dependency io.grpc:grpc-protobuf to v1.45.2 (#5)
mend-for-github-com[bot] May 30, 2023
d7ec3cb
chore(deps): update dependency org.apache.kafka:kafka-clients to v3.4…
mend-for-github-com[bot] May 30, 2023
4fc639a
chore(deps): update dependency requests to v2.31.0 (#7)
mend-for-github-com[bot] May 30, 2023
2bcfb4d
update url for the new opensearch otel demo repo
YANG-DB May 30, 2023
bf52b6b
update url for the new opensearch otel demo repo
YANG-DB May 30, 2023
86fcbf9
Merge remote-tracking branch 'opensearch-otel-demo/minor-fixes-docker…
YANG-DB May 31, 2023
7c1d497
update max retry
YANG-DB May 31, 2023
bf967ec
Merge remote-tracking branch 'opensearch-otel-demo/minor-fixes-docker…
YANG-DB May 31, 2023
3b47294
Merge remote-tracking branch 'opensearch-otel-demo/minor-fixes-docker…
YANG-DB May 31, 2023
84ff7cf
Merge remote-tracking branch 'opensearch-otel-demo/minor-fixes-docker…
YANG-DB May 31, 2023
8021ae6
Merge pull request #9 from opensearch-project/minor-fixes-docker
anirudha May 31, 2023
7f2f17c
Update docker-compose.yml
anirudha May 31, 2023
8c9834c
fix integrations script connections retry
YANG-DB May 31, 2023
0d1eede
Merge pull request #10 from opensearch-project/fix_integration_connec…
anirudha May 31, 2023
0797504
update bytes map to long and status to int (#11)
ps48 Jun 1, 2023
1f90bf8
Update README.md
YANG-DB Jun 1, 2023
b2f6496
Integration config parser support (#12)
YANG-DB Jun 2, 2023
3ade28c
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB Apr 26, 2023
d7a8157
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB May 1, 2023
b857ff8
add curl to the basic docker O/S
YANG-DB May 3, 2023
ed0c29c
add monitoring & opinionated assets for this demo
YANG-DB May 4, 2023
d23d9e6
export F/E & Load-Generator port services
YANG-DB May 8, 2023
5b6fff1
fix jaeger service name
YANG-DB May 9, 2023
2631a34
adding nginx as frontend proxy, fluent-bit.conf as log emitter
YANG-DB May 10, 2023
dabfdec
adding nginx & fluent-bit docs
YANG-DB May 10, 2023
bd8c1bf
adding integrationbs docker-compose service for assets loading into o…
YANG-DB May 15, 2023
5569094
adding datasource for query prometheus
YANG-DB May 15, 2023
0fc93f6
adding architecture.md including images
YANG-DB May 15, 2023
bc06c45
add images and service links
YANG-DB May 16, 2023
c1e4661
add jaeger-agent container name
YANG-DB May 16, 2023
dcb2455
add data-prepper support for traces ingestion & serviceMap creation
YANG-DB May 16, 2023
7df4285
fix auth issues for data-prepper
YANG-DB May 16, 2023
dd0154b
add documentation for different ingestion capabilities
YANG-DB May 16, 2023
10ecd54
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB Apr 26, 2023
9aa3934
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB Apr 26, 2023
5e57e1d
Initial setup of Observability OTEL demo using Opensearch as store
YANG-DB May 1, 2023
04a9900
add monitoring & opinionated assets for this demo
YANG-DB May 4, 2023
fd9ef85
export F/E & Load-Generator port services
YANG-DB May 8, 2023
72e4aef
fix jaeger service name
YANG-DB May 9, 2023
9924223
adding nginx as frontend proxy, fluent-bit.conf as log emitter
YANG-DB May 10, 2023
ae25d49
adding nginx & fluent-bit docs
YANG-DB May 10, 2023
0148bb3
adding integrationbs docker-compose service for assets loading into o…
YANG-DB May 15, 2023
a4e1d2f
adding datasource for query prometheus
YANG-DB May 15, 2023
d8fbcd1
adding architecture.md including images
YANG-DB May 15, 2023
6e49f5f
add images and service links
YANG-DB May 16, 2023
128aaae
add jaeger-agent container name
YANG-DB May 16, 2023
c260dee
add data-prepper support for traces ingestion & serviceMap creation
YANG-DB May 16, 2023
15f1280
fix auth issues for data-prepper
YANG-DB May 16, 2023
0a318aa
add documentation for different ingestion capabilities
YANG-DB May 16, 2023
0f37545
add assets manager flast app for loading the integration assets
YANG-DB May 18, 2023
9d1b3ea
remove experimental assets mgr app
YANG-DB May 18, 2023
ec75650
Opensearch otel demo observability tutorial (#5)
YANG-DB May 23, 2023
cc5e580
Update local-config.md
YANG-DB May 26, 2023
e2359d5
Update README.md
YANG-DB May 26, 2023
cc089a6
Add .whitesource configuration file
mend-for-github-com[bot] May 26, 2023
0a41f77
chore(deps): update dependency com.fasterxml.jackson.core:jackson-dat…
mend-for-github-com[bot] May 30, 2023
c243fcc
chore(deps): update dependency io.grpc:grpc-protobuf to v1.45.2 (#5)
mend-for-github-com[bot] May 30, 2023
cc19616
chore(deps): update dependency org.apache.kafka:kafka-clients to v3.4…
mend-for-github-com[bot] May 30, 2023
17399e9
chore(deps): update dependency requests to v2.31.0 (#7)
mend-for-github-com[bot] May 30, 2023
c4c4329
update url for the new opensearch otel demo repo
YANG-DB May 30, 2023
43ed458
Update docker-compose.yml
anirudha May 31, 2023
2dbc0a7
fix integrations script connections retry
YANG-DB May 31, 2023
903d966
update bytes map to long and status to int (#11)
ps48 Jun 1, 2023
5deeb78
Update README.md
YANG-DB Jun 1, 2023
db5fb52
Integration config parser support (#12)
YANG-DB Jun 2, 2023
597be40
upstream updates
YANG-DB Jun 2, 2023
650653f
upstream updates
YANG-DB Jun 2, 2023
d7d1bca
update http.template mapping (#15)
YANG-DB Jun 2, 2023
bafa47b
adding standard opensearch github dev / maintenance spec: (#16)
YANG-DB Jun 4, 2023
ddc5b46
fixing opensearch demo link for OpenTelemetry (#14)
MitchellGale Jun 6, 2023
f6c32ed
upstream updates (#17)
YANG-DB Jun 9, 2023
cc587f7
Merge branch 'open-telemetry:main' into main
YANG-DB Jun 9, 2023
83bb74c
add untriaged gh workflow (#18)
YANG-DB Jun 10, 2023
c496676
[cartservice] Update .NET OTel to 1.5.0 (#935) (#23)
YANG-DB Jun 15, 2023
de73c8b
Merge branch 'open-telemetry:main' into main
YANG-DB Jun 15, 2023
1f3e8f7
add red metrics from spans (#21)
YANG-DB Jun 15, 2023
b7cdb84
Merge branch 'open-telemetry:main' into main
YANG-DB Jun 21, 2023
0b90026
add integration dependency on the catalog repository for getting all …
YANG-DB Jun 21, 2023
9c867b5
fix data-prepper image to a stable version
YANG-DB Jun 21, 2023
d9f0bae
add error wrapping for integration script
YANG-DB Jun 21, 2023
04d9489
Merge remote-tracking branch 'origin/opensearch-monitoring-prometheus…
YANG-DB Jun 21, 2023
0aeef46
update opensearch version configuration as an env var
YANG-DB Jun 21, 2023
ffd3aeb
Merge remote-tracking branch 'origin/opensearch-monitoring-prometheus…
YANG-DB Jun 27, 2023
f70840a
Merge remote-tracking branch 'origin/opensearch-monitoring-prometheus…
YANG-DB Jun 27, 2023
3c7045c
Merge remote-tracking branch 'origin/opensearch-monitoring-prometheus…
YANG-DB Jun 27, 2023
2ce8f34
Merge remote-tracking branch 'origin/opensearch-monitoring-prometheus…
YANG-DB Jul 7, 2023
36c1388
update opensearch to 2.8
YANG-DB Jul 7, 2023
51a4d85
Merge remote-tracking branch 'origin/main'
YANG-DB Jul 8, 2023
33de211
Upstream changes needed merge (#41)
YANG-DB Jul 8, 2023
3cb95e6
Merge branch 'open-telemetry:main' into main
YANG-DB Jul 8, 2023
f05c408
Merge branch 'opensearch-project:main' into main
YANG-DB Jul 8, 2023
baa1841
Update dependency io.grpc:grpc-netty to v1.50.3 (#47)
mend-for-github-com[bot] Jul 15, 2023
bd4fdde
Merge branch 'opensearch-project:main' into main
YANG-DB Jul 15, 2023
9a91c19
upstream updates (#52)
YANG-DB Jul 18, 2023
90d63ec
Merge branch 'opensearch-project:main' into main
YANG-DB Jul 18, 2023
73a2e0f
Merge branch 'main' into opensearch-monitoring-prometheus-metrics
YANG-DB Jul 18, 2023
0e8fec0
update locust to use nginx proxy
YANG-DB Jul 18, 2023
2fb8bb1
Merge remote-tracking branch 'origin/opensearch-monitoring-prometheus…
YANG-DB Jul 18, 2023
8264d5f
Merge remote-tracking branch 'upstream/main' into opensearch-monitori…
YANG-DB Aug 2, 2023
d35d89e
Update frauddetectionservice (#55)
mend-for-github-com[bot] Aug 2, 2023
745cc06
Update adservice (#48)
mend-for-github-com[bot] Aug 2, 2023
7ca92bc
update upstream changes
YANG-DB Aug 2, 2023
1b025d3
update upstream changes
YANG-DB Aug 2, 2023
b130d5e
update opensearch for 2.9
YANG-DB Aug 2, 2023
4336309
fix: Fixing tracetest configuration (#65)
xoscar Sep 19, 2023
dbe873a
chore(deps): update loadgenerator (#67)
mend-for-github-com[bot] Oct 6, 2023
50b6772
Merge remote-tracking branch 'upstream/main'
YANG-DB Oct 20, 2023
ade5c3b
update upstream changes
YANG-DB Nov 6, 2023
e2e6770
update upstream changes
YANG-DB Nov 6, 2023
8816e1d
update upstream changes
YANG-DB Nov 6, 2023
1774665
update upstream changes
YANG-DB Nov 6, 2023
a61bd83
update upstream changes
YANG-DB Nov 6, 2023
db1aef7
update upstream changes
YANG-DB Nov 6, 2023
61c3918
update upstream changes
YANG-DB Nov 6, 2023
c347720
remove https in favor of http
YANG-DB Nov 6, 2023
3c07b02
restore https
YANG-DB Nov 6, 2023
3a26e77
update data-prepper config files
YANG-DB Nov 6, 2023
f704c7e
Merge branch 'main' into update-latest-upstream-patch
YANG-DB Nov 7, 2023
4810682
Merge remote-tracking branch 'origin/update-latest-upstream-patch'
YANG-DB Nov 7, 2023
60889ad
fix opensearch service name for jaeger-query
YANG-DB Nov 7, 2023
f823ced
remove jaeger-query
YANG-DB Nov 7, 2023
81cc672
update data-prepper pipelines
YANG-DB Nov 7, 2023
dcd7f3f
Merge remote-tracking branch 'origin/data-prepper-pipelines' into dat…
YANG-DB Nov 7, 2023
1be0e03
update data-prepper pipelines
YANG-DB Nov 7, 2023
d9992df
update data-prepper pipelines
YANG-DB Nov 7, 2023
29385c1
update data-prepper pipelines
YANG-DB Nov 20, 2023
6c37467
Merge branch 'main' into data-prepper-pipelines
YANG-DB Nov 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
environment:
- CURRENCY_SERVICE_PORT
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME

Check warning on line 178 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

178:91 [comments] too few spaces before comment
depends_on:
otelcol:
condition: service_started
Expand Down Expand Up @@ -222,8 +222,8 @@
memory: 175M
restart: unless-stopped
ports:
- "${FEATURE_FLAG_SERVICE_PORT}:${FEATURE_FLAG_SERVICE_PORT}" # Feature Flag Service UI

Check warning on line 225 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

225:69 [comments] too few spaces before comment
- "${FEATURE_FLAG_GRPC_SERVICE_PORT}" # Feature Flag Service gRPC API

Check warning on line 226 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

226:45 [comments] too few spaces before comment
environment:
- FEATURE_FLAG_SERVICE_PORT
- FEATURE_FLAG_GRPC_SERVICE_PORT
Expand All @@ -232,15 +232,7 @@
- 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
Expand Down Expand Up @@ -455,7 +447,7 @@
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}"
Expand Down Expand Up @@ -622,8 +614,8 @@
memory: 300M
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI

Check warning on line 617 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

617:34 [comments] too few spaces before comment
- "4317" # OTLP gRPC default port

Check warning on line 618 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

618:16 [comments] too few spaces before comment
- "14269:14269"
- "14268:14268"
- "14267:14267"
Expand Down Expand Up @@ -693,11 +685,11 @@
- ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml
- ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml
ports:
- "4317" # OTLP over gRPC receiver

Check warning on line 688 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

688:16 [comments] too few spaces before comment
- "4318:4318" # OTLP over HTTP receiver

Check warning on line 689 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

689:21 [comments] too few spaces before comment
- "13133:13133" # health check port

Check warning on line 690 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

690:23 [comments] too few spaces before comment
- "9464" # Prometheus exporter

Check warning on line 691 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

691:16 [comments] too few spaces before comment
- "8888" # metrics endpoint

Check warning on line 692 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint

692:16 [comments] too few spaces before comment
depends_on:
- jaeger-agent
- data-prepper
Expand Down Expand Up @@ -773,7 +765,6 @@
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:
Expand Down
38 changes: 38 additions & 0 deletions src/dataprepper/pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,41 @@
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

Check failure on line 38 in src/dataprepper/pipelines.yaml

View workflow job for this annotation

GitHub Actions / yamllint

38:23 [trailing-spaces] trailing spaces
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
Loading