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

[chore] - memory for collector and jaeger #1396

Merged
merged 6 commits into from
Feb 21, 2024
Merged

[chore] - memory for collector and jaeger #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c3fbfe
increase collector memory
puckpuck Feb 21, 2024
3199a31
increase collector memory
puckpuck Feb 21, 2024
9682a87
increase collector memory
puckpuck Feb 21, 2024
df01bc7
increase collector memory
puckpuck Feb 21, 2024
efcba15
Merge branch 'main' into otelcol.increase-memory
austinlparker Feb 21, 2024
38ae6f0
Merge branch 'main' into otelcol.increase-memory
puckpuck Feb 21, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ the release.

## Unreleased

* [chore] increase memory for Collector and Jaeger
([#1396](https://github.com/open-telemetry/opentelemetry-demo/pull/1396))
* [chore] fix Make targets for restart and redeploy
([#1397](https://github.com/open-telemetry/opentelemetry-demo/pull/1397))

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.minimal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ services:
deploy:
resources:
limits:
memory: 300M
memory: 400M
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
Expand Down Expand Up @@ -508,7 +508,7 @@ services:
deploy:
resources:
limits:
memory: 125M
memory: 200M
restart: unless-stopped
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
volumes:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ services:
deploy:
resources:
limits:
memory: 300M
memory: 400M
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
Expand Down Expand Up @@ -660,7 +660,7 @@ services:
deploy:
resources:
limits:
memory: 125M
memory: 200M
restart: unless-stopped
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
volumes:
Expand Down
Loading