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

Update latest upstream patch #92

Merged
merged 134 commits into from
Nov 7, 2023

Conversation

YANG-DB
Copy link
Member

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

Changes

update upstream changes:

  • remove 'opensearch integration' service
  • update the opensearch dashboard
  • add opensearch+dashboard to the minimized docker-compose.yml
  • update opensearch to use a single node

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 June 21, 2023 15:26
update fluent-bit.conf parser to emmit a different field name
adding support for prometheus-opensearch exporter

Signed-off-by: YANGDB <[email protected]>
…-metrics' into opensearch-monitoring-prometheus-metrics
…-metrics' into opensearch-monitoring-prometheus-metrics
…-metrics' into opensearch-monitoring-prometheus-metrics

Signed-off-by: YANGDB <[email protected]>
…-metrics' into opensearch-monitoring-prometheus-metrics
…-metrics' into opensearch-monitoring-prometheus-metrics

Signed-off-by: YANGDB <[email protected]>
…nd expose /oltp-http/ endpoint to frontendproxy (open-telemetry#938)

Co-authored-by: Austin Parker <[email protected]>
* WIP splitting up services

- splits up services into multiple docker files
- experiment with changing service definition for checkout service when kafka is enabled

todo:

[ ] fix checkout service to work without kafka
[ ] fix services that error without feature flag service
[ ] provide noop config for collector when observability backends are
disabled

* send to kafka only if defined

Signed-off-by: Pierre Tessier <[email protected]>

* only check featureflag if env is defined

Signed-off-by: Pierre Tessier <[email protected]>

* split featureflag and kafka services

Signed-off-by: Pierre Tessier <[email protected]>

* remove feature flag env var

* remove extra definitions in test file

* split out observability

Signed-off-by: Pierre Tessier <[email protected]>

* set recommendation resources based on flag

Signed-off-by: Pierre Tessier <[email protected]>

* add start/stop scripts

Signed-off-by: Pierre Tessier <[email protected]>

* split modules

Signed-off-by: Pierre Tessier <[email protected]>

* split into modules

Signed-off-by: Pierre Tessier <[email protected]>

* allows `docker compose up` for full

* default full demo, optional minimal mode

Signed-off-by: Pierre Tessier <[email protected]>

* default full demo, optional minimal mode

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* Adding a user purchasing product trace-based test case

* Adding more tests

* Adding run script

* Fixed yaml lint issues

* Adding license header to the files

* Adding trace-based tests for more services

* Updating tests and adding them on the same format as the integration tests

* Fixed payment tests

* Fixing e2e web tests

* Fixing details found by yamllint

* Updating trace-based tests to refer a protobuf file instead of embedding it

* Fixed data types for email test and improved test time

* Structured tests per service

* Added tests for frontend service following endpoints used on loadgenerator

* fixing yaml lint issues

* Fixing small issues on tests
* [cartservice] Update OTel .NET to 1.5.1

* Update .NET docker images

* Update changelog

* Update alpine version

---------

Co-authored-by: Carter Socha <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* [chore] build images for PRs

* Add missing "on:"

* Fix input type

* Add license header

* Do not fail fast

* test: comment cache-from

* Revert: test: comment cache-from

* Comment featureflagservice build

* Revert "[cartservice] Update OTel .NET to 1.5.1 (open-telemetry#957)"

This reverts commit 814a4e9.

---------

Co-authored-by: Austin Parker <[email protected]>
…pen-telemetry#972)

* Update Rust deps and add TelemetryResourceDetector

* Changelog

* Update min versions

---------

Co-authored-by: Austin Parker <[email protected]>
…-metrics' into opensearch-monitoring-prometheus-metrics
* update dotnet builder version

* update docker version

* fix yaml lint

* change builder image

* try different qemu container

* disable static web assets entirely

* fix build issue

* split stages and increase loglevel

---------

Co-authored-by: Carter Socha <[email protected]>
* update dependencies

* Update log4j version

---------

Co-authored-by: Juliano Costa <[email protected]>
austinlparker and others added 11 commits October 3, 2023 15:58
* add opensearch

* fix env

* fix yamllint

* fix lint

* fix errors in datasource

* remove stdout export
* add httpcheck receiver example

This PR adds the httpcheck receiver to the demo to produce a synthetic
check against the frontendproxy endpoint.

Signed-off-by: Alex Boten <[email protected]>

* add changelog

Signed-off-by: Alex Boten <[email protected]>

---------

Signed-off-by: Alex Boten <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* update grafana dashboards

Signed-off-by: Pierre Tessier <[email protected]>

* update grafana dashboards

Signed-off-by: Pierre Tessier <[email protected]>

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Austin Parker <[email protected]>
* fix logic

* refactor logic

* remove extra fi
…1148)

* update collector configuration to use debug exporter

This replaces references to the logging exporter with
the debug exporter.

Signed-off-by: Alex Boten <[email protected]>

* revert changes to kubernetes/opentelemetry-demo.yaml

Signed-off-by: Alex Boten <[email protected]>

---------

Signed-off-by: Alex Boten <[email protected]>
Co-authored-by: Pierre Tessier <[email protected]>
* merge otel o11y config

Signed-off-by: Pierre Tessier <[email protected]>

* merge otel o11y config

Signed-off-by: Pierre Tessier <[email protected]>

* Update otelcol-config-extras.yml

Fixed lint

---------

Signed-off-by: Pierre Tessier <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
# Conflicts:
#	docker-compose.yml
#	src/otelcollector/otelcol-config.yml
 - 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

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]>
@YANG-DB YANG-DB merged commit 81f29d2 into opensearch-project:main Nov 7, 2023
22 of 29 checks passed
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.