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

feat(EnPRO): extend OTel-shop with MongoDB, add Ansible, Terraform and EDMM models #9

Merged
merged 49 commits into from
Oct 3, 2024
Merged

feat(EnPRO): extend OTel-shop with MongoDB, add Ansible, Terraform and EDMM models #9

merged 49 commits into from
Oct 3, 2024

Conversation

eliasmueller
Copy link

Changes

Please provide a brief description of the changes here.

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.

heidrifx and others added 30 commits June 22, 2024 19:13
@heidrifx
[productcatalogservice] Added MongoDB
4dd1845 
This adds a MongoDB to the demo instead of parsing the JSON before usage. The implementation is not yet perfect but it works for now. Thus far, only docker compose is supported.

Things that still need more work are:
- The Go application still uses static MongoDB username and password and the hostname and port are also static. This should be changed to use environmental variables instead.
- I wasn't able to check whether the healthcheck of the MongoDB works or not.
- Is the resource limit too generous?
- Should we fix the port inside the MongoDB container to its default value (i.e. change using a secret here to 27017)?
@heidrifx
[productcatalogservice] Changed to use env vars
85b53ec 
This changes the productcatalogservice to use environmental variables for the MongoDB username, password, hostname and port.
@heidrifx
[K8s] Added MongoDB
159e4d7 
*Disclaimer:* this is not working yet!
@dependabot @mviitane @eliasmueller
build(deps): bump docker/build-push-action from 6.0.1 to 6.1.0 (open-…
6b4247d 
…telemetry#1620)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.0.1 to 6.1.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.0.1...v6.1.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mikko Viitanen <[email protected]>
@rogercoll @puckpuck @eliasmueller
fix: emailservice docker compose image (open-telemetry#1630)
a2e1b1e 
Co-authored-by: Pierre Tessier <[email protected]>
@rogercoll @mviitane @eliasmueller
add collector configs as environment variable (open-telemetry#1632)
ca23a78 
Co-authored-by: Mikko Viitanen <[email protected]>
@SvenKirschbaum @puckpuck @eliasmueller
fix(frontend): Use port 443 as default to connect to flagd if https i…
51e485a 
…s in use (open-telemetry#1609)

* fix(frontend): Use port 443 as default to connect to flagd if https is in use

* chore: Update CHANGELOG.md

---------

Co-authored-by: Pierre Tessier <[email protected]>
@flands @eliasmueller
Update recommendation flag to match flagd configuration (open-telemet…
9c1153b 
…ry#1634)

Address open-telemetry#1626
@RassK @julianocosta89 @eliasmueller
Change AccountService from Go to DotNet (auto) (open-telemetry#1538)
31f2e1d 
* Change AccountService from go to dotnet (auto)

* fix path

* fix folder name

* dockerfile and other fixes

* add copyright

* fix encoding and cleanup

* Cleanup dockerfile

* Update OTel Auto

* fix kafka processing issues and otel export

* remove eof

* Update changelog

* Use default CancellationDelayMaxMs

* update packages

* fix merge failure

* Fix tracetest 'accountingservice' is not part of the trace anymore

---------

Co-authored-by: Juliano Costa <[email protected]>
Co-authored-by: Juliano Costa <[email protected]>
@dependabot @puckpuck @eliasmueller
build(deps): bump docker/build-push-action from 6.1.0 to 6.2.0 (open-…
56571ba 
…telemetry#1636)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.1.0...v6.2.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pierre Tessier <[email protected]>
@puckpuck @eliasmueller
[chore] clarify complete release process (open-telemetry#1638)
8bf3505 
* clarify complete release process

* clarify complete release process

* clarify complete release process

* clarify complete release process

* clarify complete release process
@puckpuck @eliasmueller
update to 1.11.0 release (open-telemetry#1639)
089804d
@puckpuck @eliasmueller
update to 1.11.0 release (open-telemetry#1640)
020a14b
@puckpuck @eliasmueller
[chore] update demo role memberships (open-telemetry#1649)
5e3c66b 
* update demo role membership

* update demo role membership
@julianocosta89 @rogercoll @eliasmueller
[otel-col] Add docker stats receiver (open-telemetry#1650)
96da6ca 
* Add docker stats receiver

* changelog

* Nit: prevent write access to the Docker socket

Co-authored-by: Roger Coll <[email protected]>

* Add compose minimal

---------

Co-authored-by: Roger Coll <[email protected]>
@rogercoll @puckpuck @eliasmueller
add Kafka Dockerfile env variable (open-telemetry#1652)
1ea7b68 
Co-authored-by: Pierre Tessier <[email protected]>
@dependabot @eliasmueller
build(deps): bump docker/build-push-action from 6.2.0 to 6.3.0 (open-…
c4fb5ef 
…telemetry#1656)

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@v6.2.0...v6.3.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@beeme1mr @eliasmueller
Simplify error scenario logic (open-telemetry#1657)
c921c1e 
* remove fractional config from rule definition

Signed-off-by: Michael Beemer <[email protected]>

* add random failure logic to ad service

Signed-off-by: Michael Beemer <[email protected]>

* add random failure logic to cart service

Signed-off-by: Michael Beemer <[email protected]>

---------

Signed-off-by: Michael Beemer <[email protected]>
@puckpuck @julianocosta89 @eliasmueller
[tests] - optimize trace testing (open-telemetry#1659)
c85f722 
* optimize trace testing

* run trace based tests concurrently

* fix lint failures

---------

Co-authored-by: Juliano Costa <[email protected]>
@puckpuck @eliasmueller
[chore] fix build-images workflow (open-telemetry#1661)
4a923bc 
* fix build-images workflow

* use consistent naming for workflows
@julianocosta89 @rogercoll @eliasmueller
Set OTLP receiver endpoint (open-telemetry#1662)
84a4826 
* Set OTelCol receiver endpoint

* changelog

* Apply suggestions from code review

Co-authored-by: Roger Coll <[email protected]>

* Add env vars to collector container

---------

Co-authored-by: Roger Coll <[email protected]>
@heidrifx @eliasmueller
feat: [K8s] Added MongoDB
169d02d 
*Disclaimer:* this is not working yet!
@eliasmueller
feat: ES-9 add EDMM Model (K8s) of otel-shop
998c55a
@eliasmueller
feat: ES-39 add Terrfaform Model of otel-shop
53de8ec
@eliasmueller
feat: ES-44 add Ansible Model of otel-shop
6776ead
@heidrifx
fixed MongoDB not working and removed duplicate MongoDB service
ad4fe4e
@eliasmueller
feat: ES-9 add some refinement and connects_to
1f63679
@eliasmueller
Merge pull request #4 from UST-DeMAF/ES-44
c4baf66 
feat: ES-44 add Ansible Model of otel-shop
@eliasmueller
Merge pull request #3 from UST-DeMAF/ES-39
f1c6ceb 
feat: ES-39 add Terrfaform Model of otel-shop
@Arikuma97
Update otel_store_k8s_translated.yaml
f968106 
YAML style adjusted to a uniform format.
Arikuma97 and others added 17 commits July 28, 2024 18:54
@Arikuma97
Update otel_store_k8s_translated.yaml
41eb5dd 
YAML style adjusted to a uniform format. Adjusted, of relation_types and components_types (underscore was missing) --> Inconsistency
@eliasmueller
Merge remote-tracking branch 'origin/demaf' into ES-47
1e1feb8
@eliasmueller
fix(ES-47): fix K8s mongo-db deployment
3bfff7d 
fix(ES-47): fix K8s mongo-db deployment
@eliasmueller
Merge remote-tracking branch 'origin/demaf' into ES-9-2
6d0c610
@schurpl
Terraform model: Deletetd testing services and fixed image declaratio…
9fd3ada 
…n of the email service
@eliasmueller
Merge branch 'refs/heads/demaf' into ES-9-2
26e747e
@eliasmueller
Merge pull request #2 from UST-DeMAF/ES-9-2
62fe516 
feat: ES-9 add EDMM Model (K8s) of otel-shop
@eliasmueller
feat: ES-32 minor fix and todo
64d6ed3
@365Bit
Adds missing component types and fixes relations
2062518
@eliasmueller
fix: ES-56 fix some missing stuff in EDMM
7b45b7c 
* fix: ES-56 fix some missing stuff in EDMM

* fix: ES-56 fix moore

* fix: ES-56 fix more

* fix: ES-56 lint

* fix: ES-56 add opensearch hosted on

* fix: ES-56 remove duplicate

* fix: ES-56 fix naming
@heidrifx
Added health checks where applicable
9296af8 
some health checks are rather dirty but they work
@heidrifx
fix: auto-formatted K8s file
9ee9c23 
this enables us to finally parse this example with our plugin!
@heidrifx
Merge pull request #7 from UST-DeMAF/ES-57
28b7ea0 
ES-57 Add healthy checks and proper depends_on
@eliasmueller
chore(ES-80): move and cleanup main.tf (#8)
c312ce5 
* chore: ES-80 move .env to k8s folder and cleanup main.tf

* chore: ES-80 remove .env
@schurpl
ES-59 Fixed main.tf and added linux support
d012b1d
@eliasmueller
Merge remote-tracking branch 'origin' into demaf
7faf00f
@eliasmueller
fix: fix merge issues
5fdbacd
@heidrifx heidrifx marked this pull request as draft September 28, 2024 11:22
@eliasmueller
chore(ES-86): keep models up-to-date and add target models for all te…
1ae3eef 
…chnologies (#10)

* chore: update versions and memory

* chore: some more adaptions

* chore: add target edmm models

* ci: test build job for productcatalogservice

* ci: try this tag

* ci: now try this tag

* ci: try enhance tagging

* chore: make use of pc-service build, readme, switch to concrete versioning in terraform

* chore: remove branch build

* docs: finalize readme

* chore: mr adaptions

* fix: fix typos from generator

* fix: remove submodules
@eliasmueller eliasmueller changed the title Draft: feat(EnPRO): extend OTel-shop with MongoDB, add Ansible, Terraform and EDMM models feat(EnPRO): extend OTel-shop with MongoDB, add Ansible, Terraform and EDMM models Sep 30, 2024
@eliasmueller eliasmueller marked this pull request as ready for review September 30, 2024 05:50
@eliasmueller eliasmueller merged commit a93fbb9 into main Oct 3, 2024
23 of 27 checks passed
@eliasmueller eliasmueller deleted the demaf branch October 3, 2024 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
helm-update-required
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.